diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 549f69217..7a887267d 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -5,6 +5,7 @@ set(SRCS
             debugger/ramview.cpp
             debugger/registers.cpp
             hotkeys.cpp
+            key_bindings.cpp
             main.cpp
             config/controller_config.cpp
             config/controller_config_util.cpp)
@@ -15,11 +16,13 @@ set (HEADERS
             debugger/ramview.hxx
             debugger/registers.hxx
             hotkeys.hxx
+            key_bindings.hxx
             main.hxx
             ui_callstack.h
             ui_controller_config.h
             ui_disassembler.h
             ui_hotkeys.h
+            ui_key_bindings.h
             ui_main.h
             ui_registers.h
             version.h
@@ -31,6 +34,7 @@ qt4_wrap_ui(UI_HDRS
                     debugger/disassembler.ui
                     debugger/registers.ui
                     hotkeys.ui
+                    key_bindings.ui
                     main.ui
                     config/controller_config.ui)
 
@@ -41,6 +45,7 @@ qt4_wrap_cpp(MOC_SRCS
                         debugger/registers.hxx
                         debugger/ramview.hxx
                         hotkeys.hxx
+                        key_bindings.hxx
                         main.hxx
                         config/controller_config.hxx
                         config/controller_config_util.hxx)
diff --git a/src/citra_qt/key_bindings.cpp b/src/citra_qt/key_bindings.cpp
index 6ea62125b..b49ead464 100644
--- a/src/citra_qt/key_bindings.cpp
+++ b/src/citra_qt/key_bindings.cpp
@@ -99,7 +99,7 @@ public:
 };
 
 void GKeyBindingsDialog::updateItem(QTreeWidgetItem * item, int column) {
-    bindings[item->text(1)] = reverseNames[item->text(0)]; //sanitise
+    bindings[item->text(1)] = reverseNames[item->text(0)]; //TODO: sanitise
     reverseBindings[reverseNames[item->text(0)]] = item->text(1);
     return;
 }
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 4086b415b..d29183899 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -44,7 +44,8 @@ set(SRCS    core.cpp
             hle/service/srv.cpp
             hw/hw.cpp
             hw/lcd.cpp
-            hw/ndma.cpp)
+            hw/ndma.cpp
+            hw/hid.cpp)
 
 set(HEADERS core.h
             core_timing.h
@@ -90,6 +91,7 @@ set(HEADERS core.h
             hle/service/srv.h
             hw/hw.h
             hw/lcd.h
-            hw/ndma.h)
+            hw/ndma.h
+            hw/hid.h)
 
 add_library(core STATIC ${SRCS} ${HEADERS})