change #define Guard according to new code structure