Fix header files so that any one can be included first.

Submitted by:
Reviewed by:
PR:
7 files changed