renamed include guards
more #define fix