updated defines in header files to safer name formats to prevent re-declarations