Added missing #define guards in headers