diff --git a/include/GLFW/glfw3.h b/include/gearlib/GLFW/glfw3.h
similarity index 99%
rename from include/GLFW/glfw3.h
rename to include/gearlib/GLFW/glfw3.h
index 79b0628..9c55ac9 100644
--- a/include/GLFW/glfw3.h
+++ b/include/gearlib/GLFW/glfw3.h
@@ -1,5 +1,5 @@
 /*************************************************************************
- * GLFW 3.5 - www.glfw.org
+ * GLFW 3.4 - www.glfw.org
  * A library for OpenGL, window and input
  *------------------------------------------------------------------------
  * Copyright (c) 2002-2006 Marcus Geelnard
@@ -291,7 +291,7 @@ extern "C" {
  *  features are added to the API but it remains backward-compatible.
  *  @ingroup init
  */
-#define GLFW_VERSION_MINOR          5
+#define GLFW_VERSION_MINOR          4
 /*! @brief The revision number of the GLFW header.
  *
  *  The revision number of the GLFW header.  This is incremented when a bug fix
@@ -1149,12 +1149,11 @@ extern "C" {
 #define GLFW_OPENGL_CORE_PROFILE    0x00032001
 #define GLFW_OPENGL_COMPAT_PROFILE  0x00032002
 
-#define GLFW_CURSOR                  0x00033001
-#define GLFW_STICKY_KEYS             0x00033002
-#define GLFW_STICKY_MOUSE_BUTTONS    0x00033003
-#define GLFW_LOCK_KEY_MODS           0x00033004
-#define GLFW_RAW_MOUSE_MOTION        0x00033005
-#define GLFW_UNLIMITED_MOUSE_BUTTONS 0x00033006
+#define GLFW_CURSOR                 0x00033001
+#define GLFW_STICKY_KEYS            0x00033002
+#define GLFW_STICKY_MOUSE_BUTTONS   0x00033003
+#define GLFW_LOCK_KEY_MODS          0x00033004
+#define GLFW_RAW_MOUSE_MOTION       0x00033005
 
 #define GLFW_CURSOR_NORMAL          0x00034001
 #define GLFW_CURSOR_HIDDEN          0x00034002
@@ -3183,8 +3182,8 @@ GLFWAPI void glfwWindowHintString(int hint, const char* value);
  *
  *  [bundle-guide]: https://developer.apple.com/library/mac/documentation/CoreFoundation/Conceptual/CFBundles/
  *
- *  @remark @macos The window frame will not be rendered at full resolution on
- *  Retina displays unless the
+ *  @remark @macos On OS X 10.10 and later the window frame will not be rendered
+ *  at full resolution on Retina displays unless the
  *  [GLFW_SCALE_FRAMEBUFFER](@ref GLFW_SCALE_FRAMEBUFFER_hint)
  *  hint is `GLFW_TRUE` and the `NSHighResolutionCapable` key is enabled in the
  *  application bundle's `Info.plist`.  For more information, see
@@ -4677,8 +4676,8 @@ GLFWAPI int glfwGetInputMode(GLFWwindow* window, int mode);
  *
  *  This function sets an input mode option for the specified window.  The mode
  *  must be one of @ref GLFW_CURSOR, @ref GLFW_STICKY_KEYS,
- *  @ref GLFW_STICKY_MOUSE_BUTTONS, @ref GLFW_LOCK_KEY_MODS
- *  @ref GLFW_RAW_MOUSE_MOTION, or @ref GLFW_UNLIMITED_MOUSE_BUTTONS.
+ *  @ref GLFW_STICKY_MOUSE_BUTTONS, @ref GLFW_LOCK_KEY_MODS or
+ *  @ref GLFW_RAW_MOUSE_MOTION.
  *
  *  If the mode is `GLFW_CURSOR`, the value must be one of the following cursor
  *  modes:
@@ -4718,11 +4717,6 @@ GLFWAPI int glfwGetInputMode(GLFWwindow* window, int mode);
  *  attempting to set this will emit @ref GLFW_FEATURE_UNAVAILABLE.  Call @ref
  *  glfwRawMouseMotionSupported to check for support.
  *
- *  If the mode is `GLFW_UNLIMITED_MOUSE_BUTTONS`, the value must be either
- *  `GLFW_TRUE` to disable the mouse button limit when calling the mouse button
- *  callback, or `GLFW_FALSE` to limit the mouse buttons sent to the callback
- *  to the mouse button token values up to `GLFW_MOUSE_BUTTON_LAST`.
- *
  *  @param[in] window The window whose input mode to set.
  *  @param[in] mode One of `GLFW_CURSOR`, `GLFW_STICKY_KEYS`,
  *  `GLFW_STICKY_MOUSE_BUTTONS`, `GLFW_LOCK_KEY_MODS` or
@@ -4917,11 +4911,8 @@ GLFWAPI int glfwGetKey(GLFWwindow* window, int key);
  *  returns `GLFW_PRESS` the first time you call it for a mouse button that was
  *  pressed, even if that mouse button has already been released.
  *
- *  The @ref GLFW_UNLIMITED_MOUSE_BUTTONS input mode does not effect the
- *  limit on buttons which can be polled with this function.
- *
  *  @param[in] window The desired window.
- *  @param[in] button The desired [mouse button token](@ref buttons).
+ *  @param[in] button The desired [mouse button](@ref buttons).
  *  @return One of `GLFW_PRESS` or `GLFW_RELEASE`.
  *
  *  @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
@@ -5297,15 +5288,10 @@ GLFWAPI GLFWcharmodsfun glfwSetCharModsCallback(GLFWwindow* window, GLFWcharmods
  *  is called when a mouse button is pressed or released.
  *
  *  When a window loses input focus, it will generate synthetic mouse button
- *  release events for all pressed mouse buttons with associated button tokens.
- *  You can tell these events from user-generated events by the fact that the
- *  synthetic ones are generated after the focus loss event has been processed,
- *  i.e. after the [window focus callback](@ref glfwSetWindowFocusCallback) has
- *  been called.
- *
- *  The reported `button` value can be higher than `GLFW_MOUSE_BUTTON_LAST` if
- *  the button does not have an associated [button token](@ref buttons) and the
- *  @ref GLFW_UNLIMITED_MOUSE_BUTTONS input mode is set.
+ *  release events for all pressed mouse buttons.  You can tell these events
+ *  from user-generated events by the fact that the synthetic ones are generated
+ *  after the focus loss event has been processed, i.e. after the
+ *  [window focus callback](@ref glfwSetWindowFocusCallback) has been called.
  *
  *  @param[in] window The window whose callback to set.
  *  @param[in] callback The new callback, or `NULL` to remove the currently set
diff --git a/include/GLFW/glfw3native.h b/include/gearlib/GLFW/glfw3native.h
similarity index 99%
rename from include/GLFW/glfw3native.h
rename to include/gearlib/GLFW/glfw3native.h
index 011b239..92f0d32 100644
--- a/include/GLFW/glfw3native.h
+++ b/include/gearlib/GLFW/glfw3native.h
@@ -1,5 +1,5 @@
 /*************************************************************************
- * GLFW 3.5 - www.glfw.org
+ * GLFW 3.4 - www.glfw.org
  * A library for OpenGL, window and input
  *------------------------------------------------------------------------
  * Copyright (c) 2002-2006 Marcus Geelnard
diff --git a/include/gearlib/opengl.h b/include/gearlib/opengl.h
index aa31212..087d699 100644
--- a/include/gearlib/opengl.h
+++ b/include/gearlib/opengl.h
@@ -2,6 +2,6 @@
 #define __OPENGL_H__
 
 #include <gearlib/glad/gl.h>
-#include <GLFW/glfw3.h>
+#include <gearlib/GLFW/glfw3.h>
 
 #endif
diff --git a/premake5.lua b/premake5.lua
index 44c1b0c..7ae6860 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -1,3 +1,5 @@
+local includes = { "include", "include/gearlib" }
+
 workspace "gearlib"
     configurations { "Debug", "Release" }
     location "build"
@@ -7,7 +9,8 @@ project "glfw"
     language "C"
     targetdir "bin/%{cfg.buildcfg}/glfw"
 
-    files { "vendor/glfw/**.h", "vendor/glfw/src/**.c" }
+    files { "include/gearlib/GLFW/**.h", "vendor/glfw/src/**.c" }
+    includedirs(includes)
 
     filter "configurations:Debug"
         defines { "DEBUG" }
@@ -29,8 +32,8 @@ project "gearlib"
     targetdir "bin/%{cfg.buildcfg}/gearlib"
 
     files { "include/**.h", "src/**.c" }
-    includedirs { "include", "include/gearlib", "vendor/glfw/include" }
-    links { "glfw-static", "m" }
+    includedirs(includes)
+    links { "glfw", "m" }
 
     filter "configurations:Debug"
         defines { "DEBUG" }
@@ -46,7 +49,7 @@ project "test"
     targetdir "bin/%{cfg.buildcfg}/test"
 
     files { "examples/test.c" }
-    includedirs { "include", "include/gearlib" }
+    includedirs(includes)
     links { "glfw", "gearlib", "m" }
 
     debugdir "examples"
diff --git a/vendor/glfw b/vendor/glfw
new file mode 160000
index 0000000..43c9fb3
--- /dev/null
+++ b/vendor/glfw
@@ -0,0 +1 @@
+Subproject commit 43c9fb329116fcd57e94c8edc9ce2c1619a370a8