diff --git a/debugutil.c b/debugutil.c
index 1f1e898..ca6dba1 100644
--- a/debugutil.c
+++ b/debugutil.c
@@ -1,10 +1,10 @@
 #include <GL/gl.h>
-#include <assimp/scene.h>
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "assimp_types.h"
+
 char* getGlInfoString() {
 	const char* glVersion = (const char*) glGetString(GL_VERSION);
 	const char* glslVersion = (const char*) glGetString(GL_SHADING_LANGUAGE_VERSION);
@@ -25,7 +25,7 @@ char* getGlInfoString() {
 	return glInfoString;
 }
 
-void dumpScene(FILE* stream, const struct aiScene* scene) {
+void dumpScene(FILE* stream, const AiScene* scene) {
 	if (scene == NULL) {
 		fprintf(stream, "NULL");
 		return;
@@ -45,7 +45,7 @@ void dumpScene(FILE* stream, const struct aiScene* scene) {
 			(void*) (*scene).mLights);
 }
 
-void dumpNode(FILE* stream, const struct aiNode* node) {
+void dumpNode(FILE* stream, const AiNode* node) {
 	if (node == NULL) {
 		fprintf(stream, "NULL");
 		return;
diff --git a/debugutil.h b/debugutil.h
index cb82be9..bc5d346 100644
--- a/debugutil.h
+++ b/debugutil.h
@@ -1,12 +1,12 @@
 #ifndef DEBUGUTIL_H_
 #define DEBUGUTIL_H_
 
-#include <assimp/scene.h>
-
 #include <stdio.h>
 
+#include "assimp_types.h"
+
 char* getGlInfoString();
-void dumpScene(FILE* stream, const struct aiScene* scene);
-void dumpNode(FILE* stream, const struct aiNode* node);
+void dumpScene(FILE* stream, const AiScene* scene);
+void dumpNode(FILE* stream, const AiNode* node);
 
 #endif
diff --git a/level.c b/level.c
index cec2d04..5e1cd6f 100644
--- a/level.c
+++ b/level.c
@@ -24,7 +24,7 @@ void setImage(TgaImage* image) {
 }
 
 const AiScene* importScene(const char* path) {
-	const struct aiScene* scene = aiImportFile(path, 0u);
+	const AiScene* scene = aiImportFile(path, 0u);
 	if (scene == NULL) {
 		fprintf(stderr, "Asset import failed at file %s\n", path); // TODO factor logging the heck outta here
 	}
diff --git a/render.c b/render.c
index bceaec3..63578df 100644
--- a/render.c
+++ b/render.c
@@ -1,11 +1,9 @@
 #include <GL/glut.h>
 
-#include "assimp_types.h"
-
 #include "level.h"
-#include "render.h"
 #include "typedefs.h"
 #include "performance.h"
+#include "render.h"
 
 const float AXIS_RADIUS = 5.0f;
 
diff --git a/tga.c b/tga.c
index 11c8b5e..7ca9ef6 100644
--- a/tga.c
+++ b/tga.c
@@ -1,5 +1,3 @@
-#include <GL/gl.h>
-
 #include <stdlib.h>
 #include <stdio.h>