fix in macros defined in color.h to not collide with bison's generated
New header files