diff --git a/src/cocoa/platform.h b/src/cocoa/platform.h
index 2de2b52c..26f773d5 100644
--- a/src/cocoa/platform.h
+++ b/src/cocoa/platform.h
@@ -43,15 +43,6 @@
 typedef void* id;
 #endif
 
-#include "../../include/GL/glfw3.h"
-
-
-#ifndef GL_VERSION_3_0
-
-typedef const GLubyte* (APIENTRY *PFNGLGETSTRINGIPROC)(GLenum, GLuint);
-
-#endif /*GL_VERSION_3_0*/
-
 
 #define _GLFW_PLATFORM_WINDOW_STATE  _GLFWwindowNS NS
 #define _GLFW_PLATFORM_LIBRARY_STATE _GLFWlibraryNS NS
diff --git a/src/glext.c b/src/glext.c
index c192078d..50369274 100644
--- a/src/glext.c
+++ b/src/glext.c
@@ -33,11 +33,6 @@
 #include <string.h>
 
 
-#ifndef GL_VERSION_3_0
-#define GL_NUM_EXTENSIONS 0x821D
-#endif
-
-
 //////////////////////////////////////////////////////////////////////////
 //////                       GLFW internal API                      //////
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/internal.h b/src/internal.h
index bcd7408f..b85748d2 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -57,6 +57,10 @@
 //------------------------------------------------------------------------
 
 #include "config.h"
+
+#include "../../include/GL/glfw3.h"
+#include "../../include/GL/glext.h"
+
 #include "platform.h"
 
 
diff --git a/src/win32/platform.h b/src/win32/platform.h
index 144ff75a..865bc2df 100644
--- a/src/win32/platform.h
+++ b/src/win32/platform.h
@@ -43,7 +43,6 @@
 #include <windows.h>
 #include <mmsystem.h>
 
-#include "../../include/GL/glfw3.h"
 #include "../../include/GL/wglext.h"
 
 
@@ -138,13 +137,6 @@ typedef struct tagKBDLLHOOKSTRUCT {
 #endif
 
 
-#ifndef GL_VERSION_3_0
-
-typedef const GLubyte*  (APIENTRY *PFNGLGETSTRINGIPROC) (GLenum, GLuint);
-
-#endif /*GL_VERSION_3_0*/
-
-
 //========================================================================
 // DLLs that are loaded at glfwInit()
 //========================================================================
diff --git a/src/x11/platform.h b/src/x11/platform.h
index 05bc2544..ebd8ec99 100644
--- a/src/x11/platform.h
+++ b/src/x11/platform.h
@@ -43,8 +43,6 @@
 
 #include <GL/glx.h>
 
-#include "../../include/GL/glfw3.h"
-
 
 // We need declarations for GLX version 1.3 or above even if the server doesn't
 // support version 1.3
@@ -67,13 +65,6 @@
 #endif
 
 
-#ifndef GL_VERSION_3_0
-
-typedef const GLubyte* (APIENTRY *PFNGLGETSTRINGIPROC)(GLenum, GLuint);
-
-#endif /*GL_VERSION_3_0*/
-
-
 #define _GLFW_PLATFORM_WINDOW_STATE  _GLFWwindowX11 X11
 #define _GLFW_PLATFORM_LIBRARY_STATE _GLFWlibraryX11 X11
 #define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextGLX GLX