Cleanup for the latest clang-format version.

src/xenia/apu/xaudio2/xaudio2_audio_driver.cc

@@ -10,10 +10,9 @@
 #include "xenia/apu/xaudio2/xaudio2_audio_driver.h"
 
 // Must be included before xaudio2.h so we get the right windows.h include.
-// clang-format off
 #include "xenia/base/platform_win.h"
+
 #include <xaudio2.h>  // NOLINT(build/include_order)
-// clang-format on
 
 #include "xenia/apu/apu_flags.h"
 #include "xenia/base/clock.h"

src/xenia/base/socket_win.cc

@@ -13,14 +13,12 @@
 #include <thread>
 
 #include "xenia/base/logging.h"
+#include "xenia/base/platform_win.h"
 
 // winsock includes must come after platform_win.h:
-// clang-format off
-#include "xenia/base/platform_win.h"
 #include <mstcpip.h>   // NOLINT(build/include_order)
 #include <winsock2.h>  // NOLINT(build/include_order)
 #include <ws2tcpip.h>  // NOLINT(build/include_order)
-// clang-format on
 
 namespace xe {
 

src/xenia/hid/xinput/xinput_input_driver.cc

@@ -10,10 +10,9 @@
 #include "xenia/hid/xinput/xinput_input_driver.h"
 
 // Must be included before xinput.h to avoid windows.h conflicts:
-// clang-format off
 #include "xenia/base/platform_win.h"
+
 #include <xinput.h>  // NOLINT(build/include_order)
-// clang-format on
 
 #include "xenia/hid/hid_flags.h"