diff --git a/CMakeLists.txt b/CMakeLists.txt
index bce4f21a9..207c27996 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ file(GLOB GBA_RR_SRC ${CMAKE_SOURCE_DIR}/src/gba/rr/*.c)
 file(GLOB GBA_SV_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/*.c)
 file(GLOB GBA_CTX_SRC ${CMAKE_SOURCE_DIR}/src/gba/context/*.c)
 file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cSs])
-file(GLOB GUI_SRC ${CMAKE_SOURCE_DIR}/src/util/gui/*.c)
+file(GLOB GUI_SRC ${CMAKE_SOURCE_DIR}/src/util/gui/*.c ${CMAKE_SOURCE_DIR}/src/gba/gui/*.c)
 file(GLOB RENDERER_SRC ${CMAKE_SOURCE_DIR}/src/gba/renderers/*.c)
 file(GLOB SIO_SRC ${CMAKE_SOURCE_DIR}/src/gba/sio/lockstep.c)
 file(GLOB THIRD_PARTY_SRC ${CMAKE_SOURCE_DIR}/src/third-party/inih/*.c)
diff --git a/src/gba/context/gui-runner.c b/src/gba/gui/gui-runner.c
similarity index 100%
rename from src/gba/context/gui-runner.c
rename to src/gba/gui/gui-runner.c
diff --git a/src/gba/context/gui-runner.h b/src/gba/gui/gui-runner.h
similarity index 100%
rename from src/gba/context/gui-runner.h
rename to src/gba/gui/gui-runner.h
diff --git a/src/platform/3ds/main.c b/src/platform/3ds/main.c
index 6ae3f55ab..855bf6615 100644
--- a/src/platform/3ds/main.c
+++ b/src/platform/3ds/main.c
@@ -6,7 +6,7 @@
 
 #include "gba/renderers/video-software.h"
 #include "gba/context/context.h"
-#include "gba/context/gui-runner.h"
+#include "gba/gui/gui-runner.h"
 #include "gba/video.h"
 #include "util/gui.h"
 #include "util/gui/file-select.h"
diff --git a/src/platform/psp2/main.c b/src/platform/psp2/main.c
index a8a387668..bb99b51a7 100644
--- a/src/platform/psp2/main.c
+++ b/src/platform/psp2/main.c
@@ -6,7 +6,7 @@
 #include "psp2-context.h"
 
 #include "gba/gba.h"
-#include "gba/context/gui-runner.h"
+#include "gba/gui/gui-runner.h"
 #include "util/gui.h"
 #include "util/gui/font.h"
 #include "util/gui/file-select.h"
diff --git a/src/platform/psp2/psp2-context.c b/src/platform/psp2/psp2-context.c
index dd704831c..1dc3f3d3a 100644
--- a/src/platform/psp2/psp2-context.c
+++ b/src/platform/psp2/psp2-context.c
@@ -8,7 +8,7 @@
 #include "gba/gba.h"
 #include "gba/audio.h"
 #include "gba/context/context.h"
-#include "gba/context/gui-runner.h"
+#include "gba/gui/gui-runner.h"
 #include "gba/input.h"
 
 #include "gba/renderers/video-software.h"
diff --git a/src/platform/wii/main.c b/src/platform/wii/main.c
index 894546318..7f8041751 100644
--- a/src/platform/wii/main.c
+++ b/src/platform/wii/main.c
@@ -14,7 +14,7 @@
 
 #include "gba/renderers/video-software.h"
 #include "gba/context/context.h"
-#include "gba/context/gui-runner.h"
+#include "gba/gui/gui-runner.h"
 #include "util/gui.h"
 #include "util/gui/file-select.h"
 #include "util/gui/font.h"