diff --git a/src/Graphics.h b/src/Graphics.h
index d3f891c0e..f404d40cc 100644
--- a/src/Graphics.h
+++ b/src/Graphics.h
@@ -4,18 +4,7 @@
 #include "SDL.h"
 #include <string>
 #if defined(OGLR)
-#ifdef MACOSX
-#include <OpenGL/gl3.h>
-#include <OpenGL/glu.h>
-#elif defined(WIN32)
-#include <GL/glew.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
-#else
-//#include <GL/glew.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
-#endif
+#include "OpenGLHeaders.h"
 #endif
 #include "Config.h"
 //#include "powder.h"
diff --git a/src/OpenGLHeaders.h b/src/OpenGLHeaders.h
new file mode 100644
index 000000000..3f925acde
--- /dev/null
+++ b/src/OpenGLHeaders.h
@@ -0,0 +1,24 @@
+#ifdef MACOSX
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+#include <OpenGL/gl3.h>
+#include <OpenGL/glu.h>
+#else
+//#include <GL/glew.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#define GL_RGBA32F 0x8814
+#endif
+
+#elif defined(WIN32)
+
+#include <GL/glew.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
+
+#else
+
+//#include <GL/glew.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
+#endif
\ No newline at end of file
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
index 8ec1abdce..0229103f9 100644
--- a/src/PowderToySDL.cpp
+++ b/src/PowderToySDL.cpp
@@ -1,3 +1,4 @@
+#ifdef USE_SDL
 
 #include <time.h>
 #include "SDL.h"
@@ -62,8 +63,8 @@ void blit(pixel * vid)
 			SDL_UnlockSurface(sdl_scrn);
 		SDL_UpdateRect(sdl_scrn,0,0,0,0);
 	}
-#endif
 }
+#endif
 
 SDL_Surface * SDLOpen()
 {
@@ -228,4 +229,7 @@ int main(int argc, char * argv[])
 	ui::Engine::Ref().CloseWindow();
 	delete gameController;
 	delete ui::Engine::Ref().g;
+	return 0;
 }
+
+#endif
diff --git a/src/Renderer.h b/src/Renderer.h
index bc9190367..08befa632 100644
--- a/src/Renderer.h
+++ b/src/Renderer.h
@@ -3,18 +3,7 @@
 
 #include <vector>
 #if defined(OGLR)
-#ifdef MACOSX
-#include <OpenGL/gl3.h>
-#include <OpenGL/glu.h>
-#elif defined(WIN32)
-#include <GL/glew.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
-#else
-//#include <GL/glew.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
-#endif
+#include "OpenGLHeaders.h"
 #endif
 
 #include "Config.h"