core: Move emu_window and key_map into core

* Removes circular dependences (common should not depend on core)

2 files changed, 2 insertions, 2 deletions

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index bb75633b6..57fde6caa 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -9,11 +9,11 @@
 #endif
 
 #include "citra_qt/bootmanager.h"
-#include "common/key_map.h"
 #include "common/microprofile.h"
 #include "common/scm_rev.h"
 #include "common/string_util.h"
 #include "core/core.h"
+#include "core/frontend/key_map.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/video_core.h"
 
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h
index af52f369b..43015390b 100644
--- a/src/citra_qt/bootmanager.h
+++ b/src/citra_qt/bootmanager.h
@@ -9,8 +9,8 @@
 #include <mutex>
 #include <QGLWidget>
 #include <QThread>
-#include "common/emu_window.h"
 #include "common/thread.h"
+#include "core/frontend/emu_window.h"
 
 class QKeyEvent;
 class QScreen;