diff --git a/include/mgba/internal/gb/extra/cli.h b/include/mgba/internal/gb/debugger/cli.h
similarity index 100%
rename from include/mgba/internal/gb/extra/cli.h
rename to include/mgba/internal/gb/debugger/cli.h
diff --git a/include/mgba/internal/gba/extra/cli.h b/include/mgba/internal/gba/debugger/cli.h
similarity index 100%
rename from include/mgba/internal/gba/extra/cli.h
rename to include/mgba/internal/gba/debugger/cli.h
diff --git a/src/gb/core.c b/src/gb/core.c
index 968f47da8..9154221d6 100644
--- a/src/gb/core.c
+++ b/src/gb/core.c
@@ -8,9 +8,9 @@
 #include <mgba/core/core.h>
 #include <mgba/internal/debugger/symbols.h>
 #include <mgba/internal/gb/cheats.h>
+#include <mgba/internal/gb/debugger/cli.h>
 #include <mgba/internal/gb/debugger/debugger.h>
 #include <mgba/internal/gb/debugger/symbols.h>
-#include <mgba/internal/gb/extra/cli.h>
 #include <mgba/internal/gb/io.h>
 #include <mgba/internal/gb/gb.h>
 #include <mgba/internal/gb/mbc.h>
diff --git a/src/gb/debugger/cli.c b/src/gb/debugger/cli.c
index 03aa2a992..f32f299a3 100644
--- a/src/gb/debugger/cli.c
+++ b/src/gb/debugger/cli.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 <mgba/internal/gb/extra/cli.h>
+#include <mgba/internal/gb/debugger/cli.h>
 
 #include <mgba/core/core.h>
 #include <mgba/core/serialize.h>
diff --git a/src/gba/core.c b/src/gba/core.c
index 8cea52c7f..20bfdeafe 100644
--- a/src/gba/core.c
+++ b/src/gba/core.c
@@ -13,8 +13,8 @@
 #include <mgba/internal/gba/cheats.h>
 #include <mgba/internal/gba/gba.h>
 #include <mgba/internal/gba/io.h>
+#include <mgba/internal/gba/debugger/cli.h>
 #include <mgba/internal/gba/extra/audio-mixer.h>
-#include <mgba/internal/gba/extra/cli.h>
 #include <mgba/internal/gba/overrides.h>
 #ifndef DISABLE_THREADING
 #include <mgba/feature/thread-proxy.h>
diff --git a/src/gba/debugger/cli.c b/src/gba/debugger/cli.c
index 8d47aca8a..8538f4515 100644
--- a/src/gba/debugger/cli.c
+++ b/src/gba/debugger/cli.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 <mgba/internal/gba/extra/cli.h>
+#include <mgba/internal/gba/debugger/cli.h>
 
 #include <mgba/core/core.h>
 #include <mgba/core/serialize.h>