diff --git a/support/EGL/eglext.h b/deps/EGL/eglext.h
similarity index 100%
rename from support/EGL/eglext.h
rename to deps/EGL/eglext.h
diff --git a/support/GL/glext.h b/deps/GL/glext.h
similarity index 100%
rename from support/GL/glext.h
rename to deps/GL/glext.h
diff --git a/support/GL/glxext.h b/deps/GL/glxext.h
similarity index 100%
rename from support/GL/glxext.h
rename to deps/GL/glxext.h
diff --git a/support/GL/wglext.h b/deps/GL/wglext.h
similarity index 100%
rename from support/GL/wglext.h
rename to deps/GL/wglext.h
diff --git a/support/getopt.c b/deps/getopt.c
similarity index 100%
rename from support/getopt.c
rename to deps/getopt.c
diff --git a/support/getopt.h b/deps/getopt.h
similarity index 100%
rename from support/getopt.h
rename to deps/getopt.h
diff --git a/support/tinycthread.c b/deps/tinycthread.c
similarity index 100%
rename from support/tinycthread.c
rename to deps/tinycthread.c
diff --git a/support/tinycthread.h b/deps/tinycthread.h
similarity index 100%
rename from support/tinycthread.h
rename to deps/tinycthread.h
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 68b7ec9..aab3a2e 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -9,7 +9,7 @@
 endif()
 
 include_directories(${GLFW_SOURCE_DIR}/include
-                    ${GLFW_SOURCE_DIR}/support)
+                    ${GLFW_SOURCE_DIR}/deps)
 
 if (MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
@@ -20,8 +20,8 @@
     include_directories(${OPENGL_INCLUDE_DIR})
 endif()
 
-set(GETOPT ${GLFW_SOURCE_DIR}/support/getopt.h
-           ${GLFW_SOURCE_DIR}/support/getopt.c)
+set(GETOPT ${GLFW_SOURCE_DIR}/deps/getopt.h
+           ${GLFW_SOURCE_DIR}/deps/getopt.c)
 
 if (APPLE)
     # Set fancy names for bundles
diff --git a/src/egl_platform.h b/src/egl_platform.h
index 065b49f..53917b7 100644
--- a/src/egl_platform.h
+++ b/src/egl_platform.h
@@ -36,7 +36,7 @@
 // This path may need to be changed if you build GLFW using your own setup
 // We ship and use our own copy of eglext.h since GLFW uses fairly new
 // extensions and not all operating systems come with an up-to-date version
-#include "../support/EGL/eglext.h"
+#include "../deps/EGL/eglext.h"
 
 // Do we have support for dlopen/dlsym?
 #if defined(_GLFW_HAS_DLOPEN)
diff --git a/src/glx_platform.h b/src/glx_platform.h
index 8cd9f22..500a445 100644
--- a/src/glx_platform.h
+++ b/src/glx_platform.h
@@ -37,7 +37,7 @@
 // This path may need to be changed if you build GLFW using your own setup
 // We ship and use our own copy of glxext.h since GLFW uses fairly new
 // extensions and not all operating systems come with an up-to-date version
-#include "../support/GL/glxext.h"
+#include "../deps/GL/glxext.h"
 
 // Do we have support for dlopen/dlsym?
 #if defined(_GLFW_HAS_DLOPEN)
diff --git a/src/internal.h b/src/internal.h
index 915d11b..7cebf01 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -54,7 +54,7 @@
  // This path may need to be changed if you build GLFW using your own setup
  // GLFW comes with its own copy of glext.h since it uses fairly new extensions
  // and not all development environments come with an up-to-date version
- #include "../support/GL/glext.h"
+ #include "../deps/GL/glext.h"
 #endif
 
 typedef struct _GLFWhints       _GLFWhints;
diff --git a/src/wgl_platform.h b/src/wgl_platform.h
index b978128..71f757a 100644
--- a/src/wgl_platform.h
+++ b/src/wgl_platform.h
@@ -34,7 +34,7 @@
 // This path may need to be changed if you build GLFW using your own setup
 // We ship and use our own copy of wglext.h since GLFW uses fairly new
 // extensions and not all operating systems come with an up-to-date version
-#include "../support/GL/wglext.h"
+#include "../deps/GL/wglext.h"
 
 
 #define _GLFW_PLATFORM_CONTEXT_STATE        _GLFWcontextWGL wgl
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 49cc1dc..b37049f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -14,7 +14,7 @@
 endif()
 
 include_directories(${GLFW_SOURCE_DIR}/include
-                    ${GLFW_SOURCE_DIR}/support)
+                    ${GLFW_SOURCE_DIR}/deps)
 
 if (MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
@@ -25,10 +25,10 @@
     include_directories(${OPENGL_INCLUDE_DIR})
 endif()
 
-set(GETOPT ${GLFW_SOURCE_DIR}/support/getopt.h
-           ${GLFW_SOURCE_DIR}/support/getopt.c)
-set(TINYCTHREAD ${GLFW_SOURCE_DIR}/support/tinycthread.h
-                ${GLFW_SOURCE_DIR}/support/tinycthread.c)
+set(GETOPT ${GLFW_SOURCE_DIR}/deps/getopt.h
+           ${GLFW_SOURCE_DIR}/deps/getopt.c)
+set(TINYCTHREAD ${GLFW_SOURCE_DIR}/deps/tinycthread.h
+                ${GLFW_SOURCE_DIR}/deps/tinycthread.c)
 
 add_executable(clipboard clipboard.c ${GETOPT})
 add_executable(defaults defaults.c)