diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index ee7f78659..c4a28524b 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -138,11 +138,9 @@ set(MBGL_CORE_FILES
     src/mbgl/platform/log.cpp
 
     # platform/default
-    include/mbgl/platform/default/glfw_view.hpp
     include/mbgl/platform/default/headless_backend.hpp
     include/mbgl/platform/default/headless_display.hpp
     include/mbgl/platform/default/offscreen_view.hpp
-    include/mbgl/platform/default/settings_json.hpp
     include/mbgl/platform/default/thread_pool.hpp
 
     # programs
diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake
index 5d810d319..d63bdbc1c 100644
--- a/cmake/glfw.cmake
+++ b/cmake/glfw.cmake
@@ -1,12 +1,12 @@
 add_executable(mbgl-glfw
-    bin/glfw.cpp
+    platform/glfw/main.cpp
 )
 
 target_sources(mbgl-glfw
-    PRIVATE include/mbgl/platform/default/glfw_view.hpp
-    PRIVATE platform/default/glfw_view.cpp
-    PRIVATE include/mbgl/platform/default/settings_json.hpp
-    PRIVATE platform/default/settings_json.cpp
+    PRIVATE platform/glfw/glfw_view.hpp
+    PRIVATE platform/glfw/glfw_view.cpp
+    PRIVATE platform/glfw/settings_json.hpp
+    PRIVATE platform/glfw/settings_json.cpp
     PRIVATE platform/default/mbgl/util/default_styles.hpp
     PRIVATE platform/default/mbgl/util/default_styles.cpp
 )
diff --git a/platform/default/glfw_view.cpp b/platform/glfw/glfw_view.cpp
similarity index 99%
rename from platform/default/glfw_view.cpp
rename to platform/glfw/glfw_view.cpp
index 07959b200..ecc5e73da 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/glfw/glfw_view.cpp
@@ -1,4 +1,5 @@
-#include <mbgl/platform/default/glfw_view.hpp>
+#include "glfw_view.hpp"
+
 #include <mbgl/annotation/annotation.hpp>
 #include <mbgl/sprite/sprite_image.hpp>
 #include <mbgl/style/transition_options.hpp>
diff --git a/include/mbgl/platform/default/glfw_view.hpp b/platform/glfw/glfw_view.hpp
similarity index 100%
rename from include/mbgl/platform/default/glfw_view.hpp
rename to platform/glfw/glfw_view.hpp
diff --git a/bin/glfw.cpp b/platform/glfw/main.cpp
similarity index 97%
rename from bin/glfw.cpp
rename to platform/glfw/main.cpp
index b51846b4e..6e4b324c4 100644
--- a/bin/glfw.cpp
+++ b/platform/glfw/main.cpp
@@ -1,9 +1,9 @@
-#include <mbgl/mbgl.hpp>
+#include "glfw_view.hpp"
+#include "settings_json.hpp"
+
 #include <mbgl/util/default_styles.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
-#include <mbgl/platform/default/settings_json.hpp>
-#include <mbgl/platform/default/glfw_view.hpp>
 #include <mbgl/platform/default/thread_pool.hpp>
 #include <mbgl/storage/default_file_source.hpp>
 
diff --git a/platform/default/settings_json.cpp b/platform/glfw/settings_json.cpp
similarity index 94%
rename from platform/default/settings_json.cpp
rename to platform/glfw/settings_json.cpp
index ef53aa83e..2ba1038dc 100644
--- a/platform/default/settings_json.cpp
+++ b/platform/glfw/settings_json.cpp
@@ -1,4 +1,4 @@
-#include <mbgl/platform/default/settings_json.hpp>
+#include "settings_json.hpp"
 #include <fstream>
 
 namespace mbgl {
diff --git a/include/mbgl/platform/default/settings_json.hpp b/platform/glfw/settings_json.hpp
similarity index 100%
rename from include/mbgl/platform/default/settings_json.hpp
rename to platform/glfw/settings_json.hpp