diff --git a/src/bmp.cpp b/src/bmp.cpp
index 75e8bcb..a29cd76 100644
--- a/src/bmp.cpp
+++ b/src/bmp.cpp
@@ -19,7 +19,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cstdio>
+#ifdef WIN32
+#include <windows.h>
+#endif
+#include <GL/gl.h>
 #include "bmp.h"
+#include "datatypes.h"
 #ifdef WIN32
 #pragma warning(disable:4996)
 #endif
diff --git a/src/bmp.h b/src/bmp.h
index a2885fc..e555c39 100644
--- a/src/bmp.h
+++ b/src/bmp.h
@@ -1,8 +1,6 @@
 #ifndef __bmp_h__
 #define __bmp_h__
 
-#include "mygl.h"
-#include "datatypes.h"
 #include "texture.h"
 
 namespace OpenArena{
diff --git a/src/tga.h b/src/tga.h
index 083bb1e..8fa0805 100644
--- a/src/tga.h
+++ b/src/tga.h
@@ -4,14 +4,8 @@
 #pragma comment(lib, "OpenGL32.lib")
 #ifdef WIN32
 #include <windows.h> //I think this was only needed because gl.h uses it
-#include <GL/gl.h>
 #endif
-#ifdef __linux
 #include <GL/gl.h>
-#endif
-#ifdef __APPLE__
-#include <GL/gl.h>
-#endif
 #include <cstdio>
 #include <string>
 #include "texture.h"