diff --git a/src/projectM-test/projectM-test-memleak.cpp b/src/projectM-test/projectM-test-memleak.cpp
index 3b11ea4e8..c498197b2 100644
--- a/src/projectM-test/projectM-test-memleak.cpp
+++ b/src/projectM-test/projectM-test-memleak.cpp
@@ -25,9 +25,13 @@
 #include "ConfigFile.h"
 #include "getConfigFilename.h"
 
-// FIXME: portable includes?
-// i just added what works for me -fatray
+#ifdef __linux__
 #include <GL/gl.h>
+#endif
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#endif
+
 #include <assert.h>
 
 projectM *globalPM= NULL;
diff --git a/src/projectM-test/projectM-test-texture.cpp b/src/projectM-test/projectM-test-texture.cpp
index 1fba8c4b1..a5953c142 100644
--- a/src/projectM-test/projectM-test-texture.cpp
+++ b/src/projectM-test/projectM-test-texture.cpp
@@ -25,9 +25,13 @@
 #include "ConfigFile.h"
 #include "getConfigFilename.h"
 
-// FIXME: portable includes?
-// i just added what works for me -fatray
+#ifdef __linux__
 #include <GL/gl.h>
+#endif
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#endif
+
 #include <assert.h>
 
 projectM *globalPM= NULL;
diff --git a/src/projectM-test/projectM-test.cpp b/src/projectM-test/projectM-test.cpp
index efb623e87..64e211404 100644
--- a/src/projectM-test/projectM-test.cpp
+++ b/src/projectM-test/projectM-test.cpp
@@ -29,7 +29,6 @@
 #ifdef __linux__
 #include <GL/gl.h>
 #endif
-
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #endif