Reverted OpenGL header location.  The headers reappeared after a restart.
Mostly compiles now, but still linking errors