change structure of header files
forgot include guard
tiny fix for an include path