diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp
index 5bc688bbe1..8ec01eb8f4 100644
--- a/Source/Core/Core/Src/HW/GCPad.cpp
+++ b/Source/Core/Core/Src/HW/GCPad.cpp
@@ -1,6 +1,6 @@
 #include <ControllerInterface/ControllerInterface.h>
 #include "GCPadEmu.h"
-#include <ConfigInput.h>
+#include <InputConfig.h>
 #include "../ConfigManager.h"
 
 /*staticTODOSHUFFLE*/ Plugin g_GCPad( "GCPad", "Pad", "GCPad" );
diff --git a/Source/Core/InputCommon/InputCommon.vcproj b/Source/Core/InputCommon/InputCommon.vcproj
index cf176d76e7..692a50b37b 100644
--- a/Source/Core/InputCommon/InputCommon.vcproj
+++ b/Source/Core/InputCommon/InputCommon.vcproj
@@ -504,14 +504,6 @@
 				>
 			</File>
 		</Filter>
-		<File
-			RelativePath=".\Src\Config.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\Config.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\ControllerEmu.cpp"
 			>
@@ -520,6 +512,18 @@
 			RelativePath=".\Src\ControllerEmu.h"
 			>
 		</File>
+		<File
+			RelativePath=".\Src\InputConfig.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\InputConfig.h"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SConscript"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/Source/Core/InputCommon/Src/Config.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp
similarity index 94%
rename from Source/Core/InputCommon/Src/Config.cpp
rename to Source/Core/InputCommon/Src/InputConfig.cpp
index 2b1b330e12..f01a723360 100644
--- a/Source/Core/InputCommon/Src/Config.cpp
+++ b/Source/Core/InputCommon/Src/InputConfig.cpp
@@ -1,5 +1,5 @@
 
-#include "ConfigInput.h"
+#include "InputConfig.h"
 
 Plugin::Plugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name  )
 	: ini_name(_ini_name)
diff --git a/Source/Core/InputCommon/Src/ConfigInput.h b/Source/Core/InputCommon/Src/InputConfig.h
similarity index 100%
rename from Source/Core/InputCommon/Src/ConfigInput.h
rename to Source/Core/InputCommon/Src/InputConfig.h
diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript
index d116c0f49c..59796940d7 100644
--- a/Source/Core/InputCommon/Src/SConscript
+++ b/Source/Core/InputCommon/Src/SConscript
@@ -5,7 +5,7 @@ icenv = env.Clone()
 
 files = [
 	'Configuration.cpp',
-	'Config.cpp',
+	'InputConfig.cpp',
 	'ControllerEmu.cpp',
 	'SDL_Util.cpp',
 	'ControllerInterface/ControllerInterface.cpp',
diff --git a/Source/Plugins/InputUICommon/InputUICommon.vcproj b/Source/Plugins/InputUICommon/InputUICommon.vcproj
index 0c950def32..b64cb4c9b1 100644
--- a/Source/Plugins/InputUICommon/InputUICommon.vcproj
+++ b/Source/Plugins/InputUICommon/InputUICommon.vcproj
@@ -411,14 +411,14 @@
 		<Filter
 			Name="old"
 			>
-		<File
+			<File
 				RelativePath=".\Src\WXInputBase.cpp"
-			>
-		</File>
-		<File
+				>
+			</File>
+			<File
 				RelativePath=".\Src\WXInputBase.h"
-			>
-		</File>
+				>
+			</File>
 		</Filter>
 		<File
 			RelativePath=".\Src\ConfigDiag.cpp"
@@ -432,6 +432,10 @@
 			RelativePath=".\Src\ConfigDiagBitmaps.cpp"
 			>
 		</File>
+		<File
+			RelativePath=".\Src\SConscript"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/Source/Plugins/InputUICommon/Src/ConfigDiag.h b/Source/Plugins/InputUICommon/Src/ConfigDiag.h
index e5a4b71a3e..b5f7f2e072 100644
--- a/Source/Plugins/InputUICommon/Src/ConfigDiag.h
+++ b/Source/Plugins/InputUICommon/Src/ConfigDiag.h
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include <ControllerInterface/ControllerInterface.h>
-#include <ConfigInput.h>
+#include <InputConfig.h>
 #include "FileSearch.h"
 
 class PadSetting
diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp
index b2dd793f8c..72d7eca661 100644
--- a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp
+++ b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp
@@ -8,7 +8,7 @@
 #if defined(HAVE_WX) && HAVE_WX
 #include "ConfigDiag.h"
 #endif
-#include <Config.h>
+#include <InputConfig.h>
 
 #if defined(HAVE_X11) && HAVE_X11
 #include <X11/Xlib.h>