diff --git a/Source/Core/Core/Src/HW/GCPad.cpp b/Source/Core/Core/Src/HW/GCPad.cpp
index ecb1d49d54..5bc688bbe1 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 <Config.h>
+#include <ConfigInput.h>
 #include "../ConfigManager.h"
 
 /*staticTODOSHUFFLE*/ Plugin g_GCPad( "GCPad", "Pad", "GCPad" );
diff --git a/Source/Core/Core/Src/HW/GCPadEmu.cpp b/Source/Core/Core/Src/HW/GCPadEmu.cpp
index b7db04daf5..ea818d2a1d 100644
--- a/Source/Core/Core/Src/HW/GCPadEmu.cpp
+++ b/Source/Core/Core/Src/HW/GCPadEmu.cpp
@@ -1,4 +1,4 @@
-#include "..\Host.h"
+#include "../Host.h"
 #include "GCPadEmu.h"
 
 const u16 button_bitmasks[] =
diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
index d90a40efc7..2cee7e70a3 100644
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@@ -41,6 +41,8 @@ files = ["ActionReplay.cpp",
          "HW/EXI_DeviceMemoryCard.cpp",
          "HW/EXI_DeviceMic.cpp",
          "HW/EXI_DeviceEthernet.cpp",
+         "HW/GCPad.cpp",
+         "HW/GCPadEmu.cpp",
          "HW/GPFifo.cpp",
          "HW/HW.cpp",
          "HW/Memmap.cpp",
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 663575114f..a4605c6886 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -13,7 +13,7 @@ files = [
 
 libs = [
 	'core', 'lzo2', 'discio', 'bdisasm', 'videocommon', 
-	'inputcommon', 'inputuicommon', 'common', 'lua', 'z', 'sfml-network'
+	'inputuicommon', 'inputcommon', 'common', 'lua', 'z', 'sfml-network'
 	]
 
 if wxenv['HAVE_WX']: