header relocation

Original commit message from CVS:
header relocation
7 files changed