Fix accidental naked inclusion of Windows header
Fix class referred to as struct
Move sampler uniforms out of uniform structs

This is necessary for strict conformance to the GLSL standard. Should improve
compatibility and portability.
Fix class referred to as struct
Document mysterious makefile actions