diff --git a/src/feature/commandline.h b/include/mgba/feature/commandline.h
similarity index 100%
rename from src/feature/commandline.h
rename to include/mgba/feature/commandline.h
diff --git a/src/feature/thread-proxy.h b/include/mgba/feature/thread-proxy.h
similarity index 100%
rename from src/feature/thread-proxy.h
rename to include/mgba/feature/thread-proxy.h
diff --git a/src/feature/video-logger.h b/include/mgba/feature/video-logger.h
similarity index 100%
rename from src/feature/video-logger.h
rename to include/mgba/feature/video-logger.h
diff --git a/include/mgba/internal/gb/renderers/proxy.h b/include/mgba/internal/gb/renderers/proxy.h
index 59b0aed72..244c5e39b 100644
--- a/include/mgba/internal/gb/renderers/proxy.h
+++ b/include/mgba/internal/gb/renderers/proxy.h
@@ -11,7 +11,7 @@
 CXX_GUARD_START
 
 #include <mgba/internal/gb/video.h>
-#include "feature/video-logger.h"
+#include <mgba/feature/video-logger.h>
 
 struct GBVideoProxyRenderer {
 	struct GBVideoRenderer d;
diff --git a/include/mgba/internal/gba/renderers/proxy.h b/include/mgba/internal/gba/renderers/proxy.h
index 5dbe03f74..c1044c77e 100644
--- a/include/mgba/internal/gba/renderers/proxy.h
+++ b/include/mgba/internal/gba/renderers/proxy.h
@@ -11,7 +11,7 @@
 CXX_GUARD_START
 
 #include <mgba/internal/gba/video.h>
-#include "feature/video-logger.h"
+#include <mgba/feature/video-logger.h>
 
 struct GBAVideoProxyRenderer {
 	struct GBAVideoRenderer d;
diff --git a/src/core/core.c b/src/core/core.c
index c07198366..b82bab950 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -19,7 +19,7 @@
 #include <mgba/internal/gba/gba.h>
 #endif
 #ifndef MINIMAL_CORE
-#include "feature/video-logger.h"
+#include <mgba/feature/video-logger.h>
 #endif
 
 const static struct mCoreFilter {
diff --git a/src/feature/commandline.c b/src/feature/commandline.c
index 07da69760..ccb44f105 100644
--- a/src/feature/commandline.c
+++ b/src/feature/commandline.c
@@ -3,7 +3,7 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "commandline.h"
+#include <mgba/feature/commandline.h>
 
 #include <mgba/core/config.h>
 #include <mgba/core/version.h>
diff --git a/src/feature/thread-proxy.c b/src/feature/thread-proxy.c
index 51e807565..16b3db70c 100644
--- a/src/feature/thread-proxy.c
+++ b/src/feature/thread-proxy.c
@@ -3,7 +3,7 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "thread-proxy.h"
+#include <mgba/feature/thread-proxy.h>
 
 #include <mgba/core/tile-cache.h>
 #include <mgba/internal/gba/gba.h>
diff --git a/src/feature/video-logger.c b/src/feature/video-logger.c
index 10cb5200c..865bd24ea 100644
--- a/src/feature/video-logger.c
+++ b/src/feature/video-logger.c
@@ -3,7 +3,7 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "video-logger.h"
+#include <mgba/feature/video-logger.h>
 
 #include <mgba/core/core.h>
 #include <mgba-util/memory.h>
diff --git a/src/gba/core.c b/src/gba/core.c
index dc764d6e7..6888594ba 100644
--- a/src/gba/core.c
+++ b/src/gba/core.c
@@ -14,7 +14,7 @@
 #include <mgba/internal/gba/extra/cli.h>
 #include <mgba/internal/gba/overrides.h>
 #ifndef DISABLE_THREADING
-#include "feature/thread-proxy.h"
+#include <mgba/feature/thread-proxy.h>
 #endif
 #include <mgba/internal/gba/renderers/proxy.h>
 #include <mgba/internal/gba/renderers/video-software.h>
diff --git a/src/platform/example/client-server/server.c b/src/platform/example/client-server/server.c
index 75af4edb1..fce25888c 100644
--- a/src/platform/example/client-server/server.c
+++ b/src/platform/example/client-server/server.c
@@ -1,6 +1,6 @@
 // This source file is placed into the public domain.
 #include <mgba/core/core.h>
-#include "feature/commandline.h"
+#include <mgba/feature/commandline.h>
 #include <mgba-util/socket.h>
 
 #define DEFAULT_PORT 13721
diff --git a/src/platform/qt/ConfigController.cpp b/src/platform/qt/ConfigController.cpp
index 862cb3d06..f8c168167 100644
--- a/src/platform/qt/ConfigController.cpp
+++ b/src/platform/qt/ConfigController.cpp
@@ -11,7 +11,7 @@
 #include <QDir>
 #include <QMenu>
 
-#include "feature/commandline.h"
+#include <mgba/feature/commandline.h>
 
 using namespace QGBA;
 
diff --git a/src/platform/qt/ConfigController.h b/src/platform/qt/ConfigController.h
index 2c8512c5e..c3a2e7759 100644
--- a/src/platform/qt/ConfigController.h
+++ b/src/platform/qt/ConfigController.h
@@ -17,7 +17,7 @@
 
 #include <mgba/core/config.h>
 #include <mgba-util/configuration.h>
-#include "feature/commandline.h"
+#include <mgba/feature/commandline.h>
 
 class QAction;
 class QMenu;
diff --git a/src/platform/qt/GameController.cpp b/src/platform/qt/GameController.cpp
index 3c86f96a5..f0364512e 100644
--- a/src/platform/qt/GameController.cpp
+++ b/src/platform/qt/GameController.cpp
@@ -32,7 +32,7 @@
 #include <mgba/internal/gb/renderers/tile-cache.h>
 #endif
 #include <mgba-util/vfs.h>
-#include "feature/video-logger.h"
+#include <mgba/feature/video-logger.h>
 
 using namespace QGBA;
 using namespace std;
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 04872eb99..98bfa13b1 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -53,7 +53,7 @@
 #include <mgba/internal/gba/gba.h>
 #include <mgba/internal/gba/video.h>
 #endif
-#include "feature/commandline.h"
+#include <mgba/feature/commandline.h>
 #include "feature/sqlite3/no-intro.h"
 #include <mgba-util/vfs.h>
 
diff --git a/src/platform/sdl/main.c b/src/platform/sdl/main.c
index f5ec5fe53..386689695 100644
--- a/src/platform/sdl/main.c
+++ b/src/platform/sdl/main.c
@@ -20,7 +20,7 @@
 #include <mgba/core/thread.h>
 #include <mgba/internal/gba/input.h>
 
-#include "feature/commandline.h"
+#include <mgba/feature/commandline.h>
 #include <mgba-util/vfs.h>
 
 #include <SDL.h>
diff --git a/src/platform/test/fuzz-main.c b/src/platform/test/fuzz-main.c
index 533866155..fb27bce57 100644
--- a/src/platform/test/fuzz-main.c
+++ b/src/platform/test/fuzz-main.c
@@ -12,7 +12,7 @@
 #include <mgba/gba/core.h>
 #include <mgba/internal/gba/gba.h>
 
-#include "feature/commandline.h"
+#include <mgba/feature/commandline.h>
 #include <mgba-util/memory.h>
 #include <mgba-util/string.h>
 #include <mgba-util/vfs.h>
diff --git a/src/platform/test/perf-main.c b/src/platform/test/perf-main.c
index 03fe093ce..aff3c30d8 100644
--- a/src/platform/test/perf-main.c
+++ b/src/platform/test/perf-main.c
@@ -11,7 +11,7 @@
 #include <mgba/gb/core.h>
 #include <mgba/gba/core.h>
 
-#include "feature/commandline.h"
+#include <mgba/feature/commandline.h>
 #include <mgba-util/socket.h>
 #include <mgba-util/string.h>
 #include <mgba-util/vfs.h>