Get rid of superfluous files
Resolve glx.h errors related to include order or w/e
Place includes in cpp files as much as possible