diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index 33bf755235..9c197e64d6 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -47,7 +47,6 @@ extern const char *netplay_dolphin_ver;
 #include "Log.h"
 #include "CommonTypes.h"
 #include "MsgHandler.h"
-#include "CommonPaths.h"
 #include "CommonFuncs.h"
 
 #ifdef __APPLE__
diff --git a/Source/Core/Common/Src/FileSearch.cpp b/Source/Core/Common/Src/FileSearch.cpp
index 36eb3d0536..63f5f82771 100644
--- a/Source/Core/Common/Src/FileSearch.cpp
+++ b/Source/Core/Common/Src/FileSearch.cpp
@@ -16,6 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
+#include "CommonPaths.h"
 #ifndef _WIN32
 #include <sys/types.h>
 #include <dirent.h>
diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp
index 8e6006bb58..dc630923e6 100644
--- a/Source/Core/Common/Src/FileUtil.cpp
+++ b/Source/Core/Common/Src/FileUtil.cpp
@@ -16,6 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
+#include "CommonPaths.h"
 #include "FileUtil.h"
 #include "StringUtil.h"
 
diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp
index 438fa492a0..7926939f2f 100644
--- a/Source/Core/Common/Src/StringUtil.cpp
+++ b/Source/Core/Common/Src/StringUtil.cpp
@@ -18,6 +18,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "Common.h"
+#include "CommonPaths.h"
 #include "StringUtil.h"
 
 // faster than sscanf
diff --git a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
index 4b917b5a80..c2db844f13 100644
--- a/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
+++ b/Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
@@ -16,6 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
+#include "CommonPaths.h"
 #include "FileUtil.h"
 
 #include "../PowerPC/PowerPC.h"
diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index f63b0aad1a..343d5d84d1 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -18,6 +18,7 @@
 #include <string>
 
 #include "Common.h"
+#include "CommonPaths.h"
 #include "IniFile.h"
 #include "ConfigManager.h"
 #include "PluginManager.h"
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index cc06d09f9e..bacb630574 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -29,6 +29,7 @@
 #include "Thread.h"
 #include "Timer.h"
 #include "Common.h"
+#include "CommonPaths.h"
 #include "StringUtil.h"
 #include "MathUtil.h"
 #include "MemoryUtil.h"
diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp
index 2df2b69dbc..70634a6259 100644
--- a/Source/Core/Core/Src/CoreParameter.cpp
+++ b/Source/Core/Core/Src/CoreParameter.cpp
@@ -15,7 +15,8 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Common.h" // Common
+#include "Common.h"
+#include "CommonPaths.h"
 #include "FileUtil.h"
 #include "StringUtil.h"
 #include "CDUtils.h"
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
index 4d1b3f2765..7217cca819 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
@@ -15,6 +15,8 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#include "Common.h"
+#include "CommonPaths.h"
 #include "Timer.h"
 
 #include "EXI_DeviceIPL.h"
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
index cb4f472d73..8a541bc201 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
@@ -38,6 +38,7 @@ They will also generate a true or false return for UpdateInterrupts() in WII_IPC
 #include <list>
 
 #include "Common.h"
+#include "CommonPaths.h"
 #include "WII_IPC_HLE.h"
 #include "WII_IPC_HLE_Device.h"
 #include "WII_IPC_HLE_Device_Error.h"
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
index 023fd29cd4..8a0e1dc619 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
@@ -16,6 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
+#include "CommonPaths.h"
 
 #include "WII_IPC_HLE_Device_fs.h"
 
diff --git a/Source/Core/Core/Src/PluginManager.cpp b/Source/Core/Core/Src/PluginManager.cpp
index 1ad1370659..068e77a47d 100644
--- a/Source/Core/Core/Src/PluginManager.cpp
+++ b/Source/Core/Core/Src/PluginManager.cpp
@@ -28,6 +28,7 @@
 #include <vector>
 
 #include "Common.h"
+#include "CommonPaths.h"
 #include "PluginManager.h"
 #include "ConfigManager.h"
 #include "LogManager.h"
diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp
index 7fdc37705f..ed043e7cf5 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp
@@ -16,6 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "Common.h"
+#include "CommonPaths.h"
 
 #include <wx/button.h>
 #include <wx/textctrl.h>
diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.cpp b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
index f13b3dc11c..d06f4efbd8 100644
--- a/Source/Core/DiscIO/Src/VolumeDirectory.cpp
+++ b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
@@ -16,6 +16,8 @@
 // http://code.google.com/p/dolphin-emu/
 #include "stdafx.h"
 
+#include "Common.h"
+#include "CommonPaths.h"
 #include "VolumeDirectory.h"
 #include "FileBlob.h"
 
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 060bc5c81b..e0c5862dbc 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -18,6 +18,9 @@
 #include <string> // System
 #include <vector>
 
+#include "Common.h"
+#include "CommonPaths.h"
+
 #include "Core.h" // Core
 #include "HW/EXI.h"
 #include "HW/SI.h"
diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp
index e774ea9906..ad18e697c5 100644
--- a/Source/Core/DolphinWX/Src/ISOFile.cpp
+++ b/Source/Core/DolphinWX/Src/ISOFile.cpp
@@ -19,6 +19,9 @@
 #include <vector>
 #include <wx/mstream.h>
 
+#include "Common.h"
+#include "CommonPaths.h"
+
 #include "Globals.h"
 #include "FileUtil.h"
 #include "ISOFile.h"
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index 1b38ebaef0..b0ac8ea0e9 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -15,6 +15,8 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#include "Common.h"
+#include "CommonPaths.h"
 #include "Globals.h"
 
 #include "VolumeCreator.h"
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index eb7827c38c..7bffd25ba3 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -18,7 +18,8 @@
 #include <vector>
 #include <string>
 
-#include "Common.h" // Common
+#include "Common.h"
+#include "CommonPaths.h"
 
 #if defined HAVE_X11 && HAVE_X11
 #include <X11/Xlib.h>
diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
index cc16c803ef..df2272aed0 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
@@ -16,7 +16,8 @@
 // http://code.google.com/p/dolphin-emu/
 
 
-#include "Common.h" // Common
+#include "Common.h"
+#include "CommonPaths.h"
 #include "Atomic.h"
 #include "CommonTypes.h"
 #include "LogManager.h"