diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index aaa71efd..345631cc 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -3,7 +3,9 @@
 # the main CMakeLists.txt 
 link_libraries(libglfwStatic ${GLFW_LIBRARIES} ${OPENGL_glu_LIBRARY})
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include ${OPENGL_INCLUDE_DIR})
+include_directories(${GLFW_SOURCE_DIR}/include
+                    ${GLFW_SOURCE_DIR}/support
+                    ${OPENGL_INCLUDE_DIR})
 
 if(APPLE)
   # Set fancy names for bundles
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd844fc1..0d7061dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,8 @@ endif(UNIX)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} 
                     ${GLFW_SOURCE_DIR}/src
                     ${GLFW_BINARY_DIR}/src
-                    ${GLFW_INCLUDE_DIR})
+                    ${GLFW_INCLUDE_DIR}
+                    ${GLFW_SOURCE_DIR}/support)
 
 set(common_SOURCES enable.c error.c fullscreen.c gamma.c init.c input.c
                    joystick.c opengl.c time.c window.c)
diff --git a/include/GL/glext.h b/support/GL/glext.h
similarity index 100%
rename from include/GL/glext.h
rename to support/GL/glext.h
diff --git a/include/GL/glxext.h b/support/GL/glxext.h
similarity index 100%
rename from include/GL/glxext.h
rename to support/GL/glxext.h
diff --git a/include/GL/wglext.h b/support/GL/wglext.h
similarity index 100%
rename from include/GL/wglext.h
rename to support/GL/wglext.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index dbb20116..9ef07acc 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,9 @@
 
 link_libraries(libglfwStatic ${GLFW_LIBRARIES} ${OPENGL_glu_LIBRARY})
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include ${OPENGL_INCLUDE_DIR})
+include_directories(${GLFW_SOURCE_DIR}/include
+                    ${GLFW_SOURCE_DIR}/support
+                    ${OPENGL_INCLUDE_DIR})
 
 add_executable(defaults defaults.c)
 add_executable(events events.c)