Fixing error message; wrong filename used
Using system gl.h, not local copy

This fixes build breakage on Mavericks.

Local copy of header also deleted.
Whitespace fixes