rationalizing header files
6 files changed