From 0bc40cacda333910d7ebfc403122c2b914cd8778 Mon Sep 17 00:00:00 2001
From: Michael Maltese <michaeljosephmaltese@gmail.com>
Date: Mon, 23 Jan 2017 00:53:51 -0800
Subject: [PATCH] No longer need to //clang-format off for Windows headers

---
 Source/Core/Core/HW/WiimoteReal/IOWin.cpp            | 12 ++++++------
 .../ControllerInterface/DInput/XInputFilter.cpp      |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
index 603eec42ed..6cfea743bb 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
@@ -9,17 +9,17 @@
 #include <unordered_map>
 #include <unordered_set>
 
-// clang-format off
 #include <windows.h>
-// The following Windows headers must be included AFTER windows.h.
 #include <BluetoothAPIs.h>
 #include <Cfgmgr32.h>
-#include <hidsdi.h>
-#include <initguid.h>
-// initguid.h must be included before Devpkey.h
-#include <Devpkey.h>
 #include <dbt.h>
+#include <hidsdi.h>
 #include <setupapi.h>
+
+// initguid.h must be included before Devpkey.h
+// clang-format off
+#include <initguid.h>
+#include <Devpkey.h>
 // clang-format on
 
 #include "Common/CommonFuncs.h"
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp
index 246501dd70..c873a304d5 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/XInputFilter.cpp
@@ -6,10 +6,8 @@
 #include <unordered_set>
 #include <vector>
 
-// clang-format off
 #include <Windows.h>
 #include <SetupAPI.h>
-// clang-format on
 
 namespace ciface
 {