Cleanup rwcore headers

rwcore/data/Clump.hpp

@@ -1,13 +1,11 @@
 #ifndef _LIBRW_CLUMP_HPP_
 #define _LIBRW_CLUMP_HPP_
+
 #include <cstddef>
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include <glm/glm.hpp>
-
-#include <gl/gl_core_3_3.h>
 #include <gl/DrawBuffer.hpp>
 #include <gl/GeometryBuffer.hpp>
 #include <gl/TextureData.hpp>

rwcore/gl/DrawBuffer.hpp

@@ -1,5 +1,6 @@
 #ifndef _LIBRW_DRAWBUFFER_HPP_
 #define _LIBRW_DRAWBUFFER_HPP_
+
 #include <gl/gl_core_3_3.h>
 
 class GeometryBuffer;
@@ -9,7 +10,6 @@ class GeometryBuffer;
  */
 class DrawBuffer {
     GLuint vao;
-
     GLenum facetype;
 
 public:

rwcore/gl/GeometryBuffer.hpp

@@ -1,6 +1,8 @@
 #ifndef _LIBRW_GEOMETRYBUFFER_HPP_
 #define _LIBRW_GEOMETRYBUFFER_HPP_
+
 #include <gl/gl_core_3_3.h>
+
 #include <vector>
 
 /**

rwcore/gl/TextureData.hpp

@@ -1,7 +1,8 @@
 #ifndef _LIBRW_TEXTUREDATA_HPP_
 #define _LIBRW_TEXTUREDATA_HPP_
+
 #include <gl/gl_core_3_3.h>
-#include <glm/glm.hpp>
+#include <glm/vec2.hpp>
 
 #include <map>
 #include <memory>

rwcore/loaders/LoaderDFF.hpp

@@ -2,7 +2,6 @@
 #define _LIBRW_LOADERDFF_HPP_
 
 #include <data/Clump.hpp>
-#include <gl/TextureData.hpp>
 #include <rw/forward.hpp>
 
 #include <functional>

rwcore/loaders/RWBinaryStream.hpp

@@ -1,14 +1,17 @@
 #ifndef _LIBRW_RWBINARYSTREAM_HPP_
 #define _LIBRW_RWBINARYSTREAM_HPP_
-#include <cstdint>
-#include <glm/glm.hpp>
-#include <cstring>
 
-#include <cstddef>
+#include <glm/gtc/type_precision.hpp>
+#include <glm/mat3x3.hpp>
+#include <glm/vec3.hpp>
 
 #include "rw/debug.hpp"
 #include "rw/casts.hpp"
 
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+
 /**
  * @brief Class for working with RenderWare binary streams.
  *