7 files changed, 10 insertions, 6 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index ccbe7a9ce..3621449b3 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -29,6 +29,8 @@ set(SRCS
             file_sys/ivfc_archive.cpp
             file_sys/path_parser.cpp
             file_sys/savedata_archive.cpp
+            frontend/emu_window.cpp
+            frontend/key_map.cpp
             gdbstub/gdbstub.cpp
             hle/config_mem.cpp
             hle/applets/applet.cpp
@@ -198,6 +200,8 @@ set(HEADERS
             file_sys/ivfc_archive.h
             file_sys/path_parser.h
             file_sys/savedata_archive.h
+            frontend/emu_window.h
+            frontend/key_map.h
             gdbstub/gdbstub.h
             hle/config_mem.h
             hle/function_wrappers.h
diff --git a/src/common/emu_window.cpp b/src/core/frontend/emu_window.cpp
index e3a9e08e6..f6f90f9e1 100644
--- a/src/common/emu_window.cpp
+++ b/src/core/frontend/emu_window.cpp
@@ -5,8 +5,8 @@
 #include <algorithm>
 #include <cmath>
 #include "common/assert.h"
-#include "common/key_map.h"
-#include "emu_window.h"
+#include "core/frontend/emu_window.h"
+#include "core/frontend/key_map.h"
 #include "video_core/video_core.h"
 
 void EmuWindow::ButtonPressed(Service::HID::PadState pad) {
diff --git a/src/common/emu_window.h b/src/core/frontend/emu_window.h
index 835c4d500..835c4d500 100644
--- a/src/common/emu_window.h
+++ b/src/core/frontend/emu_window.h
diff --git a/src/common/key_map.cpp b/src/core/frontend/key_map.cpp
index 97cafe9c9..15f0e079c 100644
--- a/src/common/key_map.cpp
+++ b/src/core/frontend/key_map.cpp
@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <map>
-#include "common/emu_window.h"
-#include "common/key_map.h"
+#include "core/frontend/emu_window.h"
+#include "core/frontend/key_map.h"
 
 namespace KeyMap {
 
diff --git a/src/common/key_map.h b/src/core/frontend/key_map.h
index 040794578..040794578 100644
--- a/src/common/key_map.h
+++ b/src/core/frontend/key_map.h
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 18a1b6a16..676154bd4 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -3,9 +3,9 @@
 // Refer to the license.txt file included.
 
 #include <cmath>
-#include "common/emu_window.h"
 #include "common/logging/log.h"
 #include "core/core_timing.h"
+#include "core/frontend/emu_window.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/service/hid/hid.h"
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index 626e06cd9..5d23c52f9 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -7,7 +7,7 @@
 #include "settings.h"
 #include "video_core/video_core.h"
 
-#include "common/emu_window.h"
+#include "core/frontend/emu_window.h"
 
 namespace Settings {