Reintegrated an OpenGL application and tried (unsuccessfully) to reduce the number of imports needed