Trying to get everything to compile properly between OpenGL and
non-OpenGL so they can be merged.