fixed invalid #define guards in some header files