diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
index 71b2c03d3a..affabafc9b 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@@ -10,11 +10,10 @@
 #include <string>
 #include <vector>
 
-
 #include "Common/Common.h"
 #include "Common/Thread.h"
-#include "InputCommon/ControllerInterface/ExpressionParser.h"
 #include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/ExpressionParser.h"
 
 // enable disable sources
 #ifdef _WIN32
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
index f7e7c98776..b4f1b27199 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.h
@@ -4,17 +4,16 @@
 
 #pragma once
 
-#include "InputCommon/ControllerInterface/Device.h"
-
 #define DINPUT_SOURCE_NAME "DInput"
 
 #define DIRECTINPUT_VERSION 0x0800
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#include <Windows.h>
 #include <dinput.h>
-
 #include <list>
+#include <windows.h>
+
+#include "InputCommon/ControllerInterface/Device.h"
 
 namespace ciface
 {
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
index de922b2f57..b524f1f0f4 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
@@ -2,15 +2,14 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "InputCommon/ControllerInterface/DInput/DInput.h"
-#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h"
-
 #include <algorithm>
 #include <map>
-#include <sstream>
-
-#include <wbemidl.h>
 #include <oleauto.h>
+#include <sstream>
+#include <wbemidl.h>
+
+#include "InputCommon/ControllerInterface/DInput/DInput.h"
+#include "InputCommon/ControllerInterface/DInput/DInputJoystick.h"
 
 namespace ciface
 {
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
index fa036ced79..c9dd9034fe 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -3,8 +3,9 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
-#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h"
+
 #include "InputCommon/ControllerInterface/DInput/DInput.h"
+#include "InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h"
 
 	// (lower would be more sensitive) user can lower sensitivity by setting range
 	// seems decent here ( at 8 ), I don't think anyone would need more sensitive than this
@@ -26,7 +27,7 @@ static const struct
 	const char* const name;
 } named_keys[] =
 {
-#include "InputCommon/ControllerInterface/DInput/NamedKeys.h"
+#include "InputCommon/ControllerInterface/DInput/NamedKeys.h" // NOLINT
 };
 
 static const struct
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
index 49f6a402d4..558917e9cc 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "InputCommon/ControllerInterface/Device.h"
-
 #define DIRECTINPUT_VERSION 0x0800
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#include <Windows.h>
 #include <dinput.h>
+#include <windows.h>
+
+#include "InputCommon/ControllerInterface/Device.h"
 
 namespace ciface
 {
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
index 1f4629a4d5..f3dc398904 100644
--- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
+++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h
@@ -5,12 +5,12 @@
 
 #pragma once
 
-#include "InputCommon/ControllerInterface/Device.h"
-
 #define NOMINMAX
-#include <Windows.h>
+#include <windows.h>
 #include <XInput.h>
 
+#include "InputCommon/ControllerInterface/Device.h"
+
 #ifndef XINPUT_DEVSUBTYPE_FLIGHT_STICK
 #error You are building this module against the wrong version of DirectX. You probably need to remove DXSDK_DIR from your include path and/or _WIN32_WINNT is wrong.
 #endif
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
index de2ea1a06a..2714b70221 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h
@@ -6,14 +6,14 @@
 
 #pragma once
 
-#include "InputCommon/ControllerInterface/Device.h"
-
 extern "C" {
+#include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
-#include <X11/keysym.h>
 }
 
+#include "InputCommon/ControllerInterface/Device.h"
+
 namespace ciface
 {
 namespace XInput2
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
index 8484b9116d..0d2bdab8f8 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp
@@ -1,7 +1,7 @@
-#include "InputCommon/ControllerInterface/Xlib/Xlib.h"
-
 #include <X11/XKBlib.h>
 
+#include "InputCommon/ControllerInterface/Xlib/Xlib.h"
+
 namespace ciface
 {
 namespace Xlib
diff --git a/Source/Core/InputCommon/UDPWrapper.cpp b/Source/Core/InputCommon/UDPWrapper.cpp
index b83c7f4301..19eb619679 100644
--- a/Source/Core/InputCommon/UDPWrapper.cpp
+++ b/Source/Core/InputCommon/UDPWrapper.cpp
@@ -2,11 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "InputCommon/UDPWrapper.h"
-
 #include <cstdio>
 #include <cstdlib>
-#include <string.h>
+#include <cstring>
+
+#include "InputCommon/UDPWrapper.h"
 
 const std::string DefaultPort(const int index)
 {
diff --git a/Source/Core/InputCommon/UDPWrapper.h b/Source/Core/InputCommon/UDPWrapper.h
index 4a6c243441..11a5ddb464 100644
--- a/Source/Core/InputCommon/UDPWrapper.h
+++ b/Source/Core/InputCommon/UDPWrapper.h
@@ -6,11 +6,10 @@
 
 #include <string>
 
-#include "InputCommon/ControllerEmu.h"
-#include "InputCommon/UDPWiimote.h"
-
 #include "Common/Common.h"
 #include "Common/IniFile.h"
+#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/UDPWiimote.h"
 
 class UDPWrapper : public ControllerEmu::ControlGroup
 {
diff --git a/Source/Core/InputCommon/X11InputBase.cpp b/Source/Core/InputCommon/X11InputBase.cpp
index e3df6e8848..c6dce96a7b 100644
--- a/Source/Core/InputCommon/X11InputBase.cpp
+++ b/Source/Core/InputCommon/X11InputBase.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <string.h>
-#include <stdio.h>
+#include <cstdio>
+#include <cstring>
 #include <ctype.h>
 
 #include "InputCommon/X11InputBase.h"
diff --git a/Source/Core/InputCommon/X11InputBase.h b/Source/Core/InputCommon/X11InputBase.h
index c05ba4a0f8..dce3469d9d 100644
--- a/Source/Core/InputCommon/X11InputBase.h
+++ b/Source/Core/InputCommon/X11InputBase.h
@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include "Common/Common.h"
-
-#include <X11/X.h>
 #include <X11/keysym.h>
+#include <X11/X.h>
 #if defined(HAVE_WX) && HAVE_WX
 #include <wx/wx.h>
 #endif
 
+#include "Common/Common.h"
+
 namespace InputCommon
 {
 #if defined(HAVE_WX) && HAVE_WX