moved some #import <OpenGL/CGLMacro.h> out of headers