diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h
index dba3a63bcb..ab683221b3 100644
--- a/Source/Core/Common/CommonFuncs.h
+++ b/Source/Core/Common/CommonFuncs.h
@@ -11,9 +11,10 @@
 #define SLEEP(x) usleep(x*1000)
 #endif
 
+#include <clocale>
 #include <cstddef>
 #include <type_traits>
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 // Will fail to compile on a non-array:
 // TODO: make this a function when constexpr is available
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
index b524f1f0f4..e98c13df88 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
@@ -4,7 +4,6 @@
 
 #include <algorithm>
 #include <map>
-#include <oleauto.h>
 #include <sstream>
 #include <wbemidl.h>