diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index 009522181..6663b6cb2 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -186,6 +186,7 @@
     <ClInclude Include="FixedSizeQueue.h" />
     <ClInclude Include="FixedSizeUnorderedSet.h" />
     <ClInclude Include="Hash.h" />
+    <ClInclude Include="KeyMap.h" />
     <ClInclude Include="LinearDiskCache.h" />
     <ClInclude Include="Log.h" />
     <ClInclude Include="LogManager.h" />
@@ -225,6 +226,7 @@
     <ClCompile Include="FileSearch.cpp" />
     <ClCompile Include="FileUtil.cpp" />
     <ClCompile Include="Hash.cpp" />
+    <ClCompile Include="KeyMap.cpp" />
     <ClCompile Include="LogManager.cpp" />
     <ClCompile Include="MathUtil.cpp" />
     <ClCompile Include="MemArena.cpp" />
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index 177eccf73..044653e78 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -46,6 +46,7 @@
     <ClInclude Include="Crypto\md5.h">
       <Filter>Crypto</Filter>
     </ClInclude>
+    <ClInclude Include="KeyMap.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp" />
@@ -76,6 +77,7 @@
     <ClCompile Include="Crypto\md5.cpp">
       <Filter>Crypto</Filter>
     </ClCompile>
+    <ClCompile Include="KeyMap.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />
diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index 55956ac61..4ea005343 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -16,7 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "input/input_state.h"
-#include "Core/Config.h"
+#include "../Core/Config.h"
 #include "KeyMap.h"
 
 using namespace KeyMap;
diff --git a/Common/KeyMap.h b/Common/KeyMap.h
index c72c2d45f..4b959f365 100644
--- a/Common/KeyMap.h
+++ b/Common/KeyMap.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <map>
 #include "input/keycodes.h"     // keyboard keys
-#include "Core/HLE/sceCtrl.h"   // psp keys
+#include "../Core/HLE/sceCtrl.h"   // psp keys
 
 #define KEYMAP_ERROR_KEY_ALREADY_USED -1
 #define KEYMAP_ERROR_UNKNOWN_KEY 0
diff --git a/Core/HLE/sceCtrl.h b/Core/HLE/sceCtrl.h
index dd3eabffa..b25464b98 100644
--- a/Core/HLE/sceCtrl.h
+++ b/Core/HLE/sceCtrl.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "Common/CommonTypes.h"
+#include "../Common/CommonTypes.h"
 
 class PointerWrap;
 
diff --git a/Qt/Common.pro b/Qt/Common.pro
index ed69d9c4c..93578b5ec 100755
--- a/Qt/Common.pro
+++ b/Qt/Common.pro
@@ -37,6 +37,7 @@ SOURCES += ../Common/ColorUtil.cpp \
 	../Common/FileUtil.cpp \
 	../Common/Hash.cpp \
 	../Common/LogManager.cpp \
+	../Common/KeyMap.cpp \
 	../Common/MathUtil.cpp \
 	../Common/MemArena.cpp \
 	../Common/MemoryUtil.cpp \
@@ -56,6 +57,7 @@ HEADERS += ../Common/ChunkFile.h \
 	../Common/FileUtil.h \
 	../Common/Hash.h \
 	../Common/LogManager.h \
+	../Common/KeyMap.cpp \
 	../Common/MathUtil.h \
 	../Common/MemArena.h \
 	../Common/MemoryUtil.h \
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index a5599f8c3..17ab5c663 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -152,6 +152,7 @@ LOCAL_SRC_FILES := \
   $(SRC)/ext/snappy/snappy.cpp \
   $(SRC)/ext/xbrz/xbrz.cpp \
   $(SRC)/Common/Crypto/md5.cpp \
+  $(SRC)/Common/KeyMap.cpp \
   $(SRC)/Common/LogManager.cpp \
   $(SRC)/Common/MemArena.cpp \
   $(SRC)/Common/MemoryUtil.cpp \