From c7618257530a810a220176b16a538d4950dc731f Mon Sep 17 00:00:00 2001
From: Anon <Anon>
Date: Sat, 24 Dec 2016 17:48:00 -0600
Subject: [PATCH] Fix rebase issues

---
 src/citra_qt/bootmanager.cpp     | 1 -
 src/core/CMakeLists.txt          | 2 --
 src/core/core.cpp                | 3 +++
 src/core/hle/service/hid/hid.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 2693d9cf2..67dd31a62 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -14,7 +14,6 @@
 #include "common/string_util.h"
 #include "core/core.h"
 #include "core/settings.h"
-#include "core/system.h"
 
 #include "input_core/devices/keyboard.h"
 #include "input_core/input_core.h"
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 3621449b3..6fd4fc339 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -30,7 +30,6 @@ set(SRCS
             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
@@ -201,7 +200,6 @@ set(HEADERS
             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/core/core.cpp b/src/core/core.cpp
index ee5237096..b316b038f 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -19,6 +19,7 @@
 #include "core/hw/hw.h"
 #include "core/loader/loader.h"
 #include "core/settings.h"
+#include "input_core/input_core.h"
 #include "video_core/video_core.h"
 
 namespace Core {
@@ -140,6 +141,7 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
     Kernel::Init(system_mode);
     Service::Init();
     AudioCore::Init();
+    InputCore::Init();
     GDBStub::Init();
 
     if (!VideoCore::Init(emu_window)) {
@@ -153,6 +155,7 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
 
 void System::Shutdown() {
     GDBStub::Shutdown();
+    InputCore::Shutdown();
     AudioCore::Shutdown();
     VideoCore::Shutdown();
     Service::Shutdown();
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index ae5cc16e0..3d82063d1 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <cmath>
-#include "common/emu_window.h"
 
+#include "core/frontend/emu_window.h"
 #include "core/hle/service/hid/hid.h"
 #include "core/hle/service/hid/hid_spvr.h"
 #include "core/hle/service/hid/hid_user.h"