diff --git a/legacy/include.xml b/legacy/include.xml
index 6d043004c..906d9640f 100644
--- a/legacy/include.xml
+++ b/legacy/include.xml
@@ -3,7 +3,7 @@
 	
 	<section unless="display">
 
-		<haxelib name="hxcpp" if="cpp" />
+		<haxelib name="hxcpp" if="cpp" unless="rebuild" />
 		<ndll name="std" haxelib="hxcpp" if="cpp" />
 		<ndll name="regexp" haxelib="hxcpp" if="cpp" />
 		<ndll name="zlib" haxelib="hxcpp" if="cpp" unless="ios" />
diff --git a/legacy/project/src/opengl/OGL.h b/legacy/project/src/opengl/OGL.h
index d224f4fb2..26e348e40 100644
--- a/legacy/project/src/opengl/OGL.h
+++ b/legacy/project/src/opengl/OGL.h
@@ -33,12 +33,14 @@
 
   #define GL_GLEXT_PROTOTYPES
   #include <SDL_opengl.h>
+  #include <SDL_opengl_glext.h>
   #define FORCE_NON_PO2
 
 #elif defined(HX_MACOS)
 
   #define GL_GLEXT_PROTOTYPES
   #include <SDL_opengl.h>
+  #include <SDL_opengl_glext.h>
   #define FORCE_NON_PO2
 
   #define glBindFramebuffer glBindFramebufferEXT
@@ -67,6 +69,7 @@
 typedef ptrdiff_t GLsizeiptrARB;
 #define NEED_EXTENSIONS
 #include <SDL_opengl.h>
+#include <SDL_opengl_glext.h>
 
 #endif
 
diff --git a/project/src/graphics/opengl/OpenGL.h b/project/src/graphics/opengl/OpenGL.h
index 9bcb48199..95a830f95 100644
--- a/project/src/graphics/opengl/OpenGL.h
+++ b/project/src/graphics/opengl/OpenGL.h
@@ -28,12 +28,14 @@
 #define DYNAMIC_OGL
 #define GL_GLEXT_PROTOTYPES
 #include <SDL_opengl.h>
+#include <SDL_opengl_glext.h>
 #define FORCE_NON_PO2
 
 #elif defined (HX_MACOS)
 
 #define GL_GLEXT_PROTOTYPES
 #include <SDL_opengl.h>
+#include <SDL_opengl_glext.h>
 #define FORCE_NON_PO2
 #define glBindFramebuffer glBindFramebufferEXT
 #define glBindRenderbuffer glBindRenderbufferEXT
@@ -59,6 +61,7 @@
 typedef ptrdiff_t GLsizeiptrARB;
 #define NEED_EXTENSIONS
 #include <SDL_opengl.h>
+#include <SDL_opengl_glext.h>
 
 #endif