slight header file reorganization