Fixup some ifdef and include/gl madness