added some #undef statements to prevent compiler warnings