diff --git a/GL/matrix.c b/GL/matrix.c
index 36f1455..2de3e38 100644
--- a/GL/matrix.c
+++ b/GL/matrix.c
@@ -1,7 +1,10 @@
 #include <string.h>
 
-#include <dc/matrix.h>
 #include <stdio.h>
+#include <dc/fmath.h>
+#include <dc/matrix.h>
+#include <dc/matrix3d.h>
+#include <dc/vec3f.h>
 
 #include "../include/gl.h"
 #include "../containers/stack.h"
diff --git a/GL/private.h b/GL/private.h
index 7fef33f..ee78b3d 100644
--- a/GL/private.h
+++ b/GL/private.h
@@ -2,6 +2,11 @@
 #define PRIVATE_H
 
 #include <stdint.h>
+#include <dc/matrix.h>
+#include <dc/pvr.h>
+#include <dc/vec3f.h>
+#include <dc/fmath.h>
+#include <dc/matrix3d.h>
 
 #include "../include/gl.h"
 #include "../containers/aligned_vector.h"
diff --git a/include/gl.h b/include/gl.h
index 3908833..52740dc 100644
--- a/include/gl.h
+++ b/include/gl.h
@@ -19,13 +19,6 @@ __BEGIN_DECLS
 
 #include <math.h>
 
-#include <dc/fmath.h>
-#include <dc/matrix.h>
-#include <dc/matrix3d.h>
-#include <dc/pvr.h>
-#include <dc/vec3f.h>
-#include <dc/video.h>
-
 /* Primitive Types taken from GL for compatability */
 /* Not all types are implemented in Open GL DC V.1.0 */
 #define GL_POINTS           0x01