diff --git a/CMakeLists.txt b/CMakeLists.txt
index c96f87ceb4..09e2535e6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -472,6 +472,9 @@ endif()
 ########################################
 # Setup include directories (and make sure they are preferred over the Externals)
 #
+include_directories(Source/Core)
+
+# TODO(delroth): Remove when relative-includes is done.
 include_directories(Source/Core/AudioCommon)
 include_directories(Source/Core/Common)
 include_directories(Source/Core/Core)
diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp
index fff29ad802..fa569618d2 100644
--- a/Source/Core/Core/HW/Memmap.cpp
+++ b/Source/Core/Core/HW/Memmap.cpp
@@ -22,7 +22,7 @@
 #include "Core/HW/DSP.h"
 #include "Core/HW/DVDInterface.h"
 #include "Core/HW/EXI.h"
-#include "core/HW/GPFifo.h"
+#include "Core/HW/GPFifo.h"
 #include "Core/HW/MemoryInterface.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/MMIO.h"
diff --git a/Source/Core/DolphinWX/ConfigMain.h b/Source/Core/DolphinWX/ConfigMain.h
index 8d2c96ddce..2dde08470c 100644
--- a/Source/Core/DolphinWX/ConfigMain.h
+++ b/Source/Core/DolphinWX/ConfigMain.h
@@ -7,8 +7,10 @@
 #include <wx/wx.h>
 #include <wx/gbsizer.h>
 #include <wx/spinbutt.h>
+#include <wx/spinctrl.h>
 #include <wx/notebook.h>
 #include <wx/filepicker.h>
+
 #include "Core/ConfigManager.h"
 #if defined(HAVE_XRANDR) && HAVE_XRANDR
 #include "DolphinWX/X11Utils.h"
diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp
index ceada3c8a6..169dc6926f 100644
--- a/Source/Core/DolphinWX/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/GameListCtrl.cpp
@@ -25,7 +25,7 @@
 #include "DolphinWX/ISOProperties.h"
 #include "DolphinWX/Main.h"
 #include "DolphinWX/WxUtils.h"
-#include "DolphinWx/resources/Flag_Europe.xpm"
+#include "DolphinWX/resources/Flag_Europe.xpm"
 #include "DolphinWX/resources/Flag_Germany.xpm"
 #include "DolphinWX/resources/Flag_France.xpm"
 #include "DolphinWX/resources/Flag_Italy.xpm"
diff --git a/Source/Core/DolphinWX/HotkeyDlg.h b/Source/Core/DolphinWX/HotkeyDlg.h
index 19385a2d68..34e9f6088e 100644
--- a/Source/Core/DolphinWX/HotkeyDlg.h
+++ b/Source/Core/DolphinWX/HotkeyDlg.h
@@ -17,7 +17,7 @@
 #include "DolphinWX/WXInputBase.h"
 
 #if defined(HAVE_X11) && HAVE_X11
-#include "DolphinWX/X11InputBase.h"
+#include "InputCommon/X11InputBase.h"
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #endif
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp
index 868181a752..02c5febd5e 100644
--- a/Source/Core/DolphinWX/Main.cpp
+++ b/Source/Core/DolphinWX/Main.cpp
@@ -12,10 +12,6 @@
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
 
-#if defined HAVE_X11 && HAVE_X11
-#include <X11/Xlib.h>
-#endif
-
 #include "Core/BootManager.h"
 #include "Core/ConfigManager.h"
 #include "Core/Host.h"
@@ -32,6 +28,10 @@
 
 #include <wx/intl.h>
 
+#if defined HAVE_X11 && HAVE_X11
+#include <X11/Xlib.h>
+#endif
+
 #ifdef _WIN32
 #include <shellapi.h>
 
diff --git a/Source/Core/DolphinWX/X11Utils.h b/Source/Core/DolphinWX/X11Utils.h
index 66f04bb7ec..c5c84e902c 100644
--- a/Source/Core/DolphinWX/X11Utils.h
+++ b/Source/Core/DolphinWX/X11Utils.h
@@ -9,6 +9,14 @@
 #include "Core/Core.h"
 #include "Core/ConfigManager.h"
 
+// HACK: Xlib.h (included from gtk/gdk headers and directly) uses #defines on
+// common names such as "Status", "BadRequest" or "Response", causing SFML
+// headers to be completely broken.
+//
+// We work around that issue by including SFML first before X11 headers. This
+// is terrible, but such is the life with Xlib.
+#include <SFML/Network.hpp>
+
 #if defined(HAVE_WX) && HAVE_WX
 #include <wx/wx.h>
 #include <gtk/gtk.h>
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp
index 94ec1a2b46..859036c69e 100644
--- a/Source/Core/InputCommon/InputConfig.cpp
+++ b/Source/Core/InputCommon/InputConfig.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "CommonPaths.h"
+#include "Common/CommonPaths.h"
 #include "Core/ConfigManager.h"
 #include "Core/HW/Wiimote.h"
 #include "InputCommon/InputConfig.h"
diff --git a/Source/pch.h b/Source/pch.h
index 2851adefca..a8d687d9c6 100644
--- a/Source/pch.h
+++ b/Source/pch.h
@@ -1,5 +1,3 @@
-#include "Common.h"
-#include "Thread.h"
 #include <algorithm>
 #include <array>
 #include <assert.h>
@@ -56,3 +54,6 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
+
+#include "Common/Common.h"
+#include "Common/Thread.h"