format windows headers using new config.
Test new config:
https://chromium-review.googlesource.com/c/chromium/src/+/5197064
by applying clang-format on every problematic windows headers.
This CL is cloned from https://crrev.com/c/5366045.
Script:
-------
```
function replace {
echo "Replacing $1 by $2"
git grep -l "$1" \
| cut -f1 -d: \
| grep \
-e "\.h" \
-e "\.cc" \
| grep -v "third_party/[^b]" \
| sort \
| uniq \
| xargs sed -i "s/$1/$2/gi"
}
git checkout origin/main
git branch -D change-5197064 || true
git new-branch change-5197064
replace "#include <\(initguid|mmdeviceapi\|windows\|winsock2\|ws2tcpip\|shobjidl\|atlbase\|ole2\|unknwn\|objbase\|tchar\).h>" ""
replace "#include \"base\\/win\\/atl.h\"" ""
replace "#include <uiautomation.*>" ""
git add -u
git commit -m "remove problematic windows headers"
git revert HEAD --no-commit
git add -u
git commit -m "add problematic windows headers"
git cl format --upstream=HEAD~
git add -u
git commit -m "format"
git cl issue 5367127
git cl upload -df --bypass-hook
```
Also removed some unnecessary comments.
Bug: 329138753
Change-Id: I161c28ea2d27c569825e0c789a4c143530937f58
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5367127
Commit-Queue: Peter Kasting <[email protected]>
Owners-Override: Peter Kasting <[email protected]>
Commit-Queue: Takuto Ikuta <[email protected]>
Reviewed-by: Peter Kasting <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1287420}
diff --git a/.clang-format b/.clang-format
index d1b8149..87ff088 100644
--- a/.clang-format
+++ b/.clang-format
@@ -46,7 +46,7 @@
Priority: 5
# ref: https://clang.llvm.org/docs/ClangFormatStyleOptions.html#includeismainregex
IncludeIsMainRegex: "\
-(_(android|apple|chromeos|freebsd|fuchsia|fuzzer|ios|linux|mac|nacl|openbsd|posix|stubs?|win))?\
+(_(32|64|android|apple|chromeos|freebsd|fuchsia|fuzzer|ios|linux|mac|nacl|openbsd|posix|stubs?|win))?\
(_(unit|browser|perf)?tests?)?$"
# Make sure code like:
diff --git a/base/allocator/partition_allocator/src/partition_alloc/address_space_randomization_unittest.cc b/base/allocator/partition_allocator/src/partition_alloc/address_space_randomization_unittest.cc
index cb920da..9b9edd95 100644
--- a/base/allocator/partition_allocator/src/partition_alloc/address_space_randomization_unittest.cc
+++ b/base/allocator/partition_allocator/src/partition_alloc/address_space_randomization_unittest.cc
@@ -16,6 +16,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/win/windows_version.h"
#endif
diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_win.cc b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_win.cc
index 624b1c6f..d75f83ed 100644
--- a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_win.cc
+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_win.cc
@@ -4,15 +4,16 @@
#include "partition_alloc/partition_alloc_base/debug/stack_trace.h"
+#include <windows.h>
+
+#include <psapi.h>
+
+#include <algorithm>
+
#include "partition_alloc/partition_alloc_base/logging.h"
#include "partition_alloc/partition_alloc_base/process/process_handle.h"
#include "partition_alloc/partition_alloc_base/strings/safe_sprintf.h"
-#include <windows.h>
-#include <algorithm>
-
-#include <psapi.h> // Depends on "windows.h"
-
namespace partition_alloc::internal::base::debug {
namespace {
diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.cc b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.cc
index c9aa6822..32e1478b 100644
--- a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.cc
+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/log_message.cc
@@ -25,10 +25,9 @@
#include "partition_alloc/partition_alloc_base/strings/stringprintf.h"
#if BUILDFLAG(IS_WIN)
-
-#include <io.h>
#include <windows.h>
+#include <io.h>
#endif
#if BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.cc b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.cc
index b561f8a..239de2b 100644
--- a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.cc
+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/logging.cc
@@ -22,10 +22,9 @@
#include <algorithm>
#if BUILDFLAG(IS_WIN)
-
-#include <io.h>
#include <windows.h>
+#include <io.h>
#endif
#if BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc b/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
index 6703861..b7aa365 100644
--- a/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
@@ -44,6 +44,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "wow64apiset.h"
#endif
diff --git a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc
index c47d5df..f707e465 100644
--- a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc
+++ b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc
@@ -23,8 +23,9 @@
#include "testing/gtest/include/gtest/gtest.h"
#if BUILDFLAG(IS_WIN)
-#include <malloc.h>
#include <windows.h>
+
+#include <malloc.h>
#elif BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
diff --git a/base/allocator/partition_allocator/src/partition_alloc/shim/winheap_stubs_win.cc b/base/allocator/partition_allocator/src/partition_alloc/shim/winheap_stubs_win.cc
index e84c895..3318cf9 100644
--- a/base/allocator/partition_allocator/src/partition_alloc/shim/winheap_stubs_win.cc
+++ b/base/allocator/partition_allocator/src/partition_alloc/shim/winheap_stubs_win.cc
@@ -8,9 +8,10 @@
#include "partition_alloc/shim/winheap_stubs_win.h"
+#include <windows.h>
+
#include <malloc.h>
#include <new.h>
-#include <windows.h>
#include <algorithm>
#include <bit>
diff --git a/base/base_paths_win.cc b/base/base_paths_win.cc
index 5fe5b72..f9ef3c7 100644
--- a/base/base_paths_win.cc
+++ b/base/base_paths_win.cc
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/base_paths.h"
+
#include <windows.h>
#include <KnownFolders.h>
#include <shlobj.h>
-#include "base/base_paths.h"
#include "base/environment.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
diff --git a/base/debug/debugger_win.cc b/base/debug/debugger_win.cc
index 66472b45..c62c3bea 100644
--- a/base/debug/debugger_win.cc
+++ b/base/debug/debugger_win.cc
@@ -4,9 +4,10 @@
#include "base/debug/debugger.h"
-#include <stdlib.h>
#include <windows.h>
+#include <stdlib.h>
+
namespace base {
namespace debug {
diff --git a/base/debug/gdi_debug_util_win.cc b/base/debug/gdi_debug_util_win.cc
index 8f11713..66c28f3e 100644
--- a/base/debug/gdi_debug_util_win.cc
+++ b/base/debug/gdi_debug_util_win.cc
@@ -3,10 +3,11 @@
// found in the LICENSE file.
#include "base/debug/gdi_debug_util_win.h"
+#include <windows.h>
+
#include <TlHelp32.h>
#include <psapi.h>
#include <stddef.h>
-#include <windows.h>
#include <winternl.h>
#include <algorithm>
diff --git a/base/debug/gdi_debug_util_win_unittest.cc b/base/debug/gdi_debug_util_win_unittest.cc
index 952a379..7d77358c 100644
--- a/base/debug/gdi_debug_util_win_unittest.cc
+++ b/base/debug/gdi_debug_util_win_unittest.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/debug/gdi_debug_util_win.h"
+
#include <windows.h>
-#include "base/debug/gdi_debug_util_win.h"
#include "base/win/scoped_hdc.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/debug/invalid_access_win.cc b/base/debug/invalid_access_win.cc
index dc0d54b..b67db7f 100644
--- a/base/debug/invalid_access_win.cc
+++ b/base/debug/invalid_access_win.cc
@@ -4,9 +4,10 @@
#include "base/debug/invalid_access_win.h"
+#include <windows.h>
+
#include <intrin.h>
#include <stdlib.h>
-#include <windows.h>
#include "base/check.h"
#include "build/build_config.h"
diff --git a/base/files/file_path.cc b/base/files/file_path.cc
index ef8100c..8f8c351 100644
--- a/base/files/file_path.cc
+++ b/base/files/file_path.cc
@@ -28,6 +28,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/win/win_util.h"
#elif BUILDFLAG(IS_APPLE)
#include <CoreFoundation/CoreFoundation.h>
diff --git a/base/files/file_util_unittest.cc b/base/files/file_util_unittest.cc
index d5caaf6..1421794a 100644
--- a/base/files/file_util_unittest.cc
+++ b/base/files/file_util_unittest.cc
@@ -52,10 +52,12 @@
#include "testing/platform_test.h"
#if BUILDFLAG(IS_WIN)
-#include <shellapi.h>
-#include <shlobj.h>
#include <tchar.h>
#include <windows.h>
+
+#include <shellapi.h>
+#include <shlobj.h>
+
#include "base/scoped_native_library.h"
#include "base/strings/string_number_conversions.h"
#include "base/test/file_path_reparse_point_win.h"
diff --git a/base/files/file_util_win.cc b/base/files/file_util_win.cc
index 4b54819..60df40b 100644
--- a/base/files/file_util_win.cc
+++ b/base/files/file_util_win.cc
@@ -5,6 +5,7 @@
#include "base/files/file_util.h"
#include <windows.h>
+#include <winsock2.h>
#include <io.h>
#include <psapi.h>
@@ -13,7 +14,6 @@
#include <stddef.h>
#include <stdint.h>
#include <time.h>
-#include <winsock2.h>
#include <algorithm>
#include <limits>
diff --git a/base/files/file_win.cc b/base/files/file_win.cc
index 678a6e0..6375ce07 100644
--- a/base/files/file_win.cc
+++ b/base/files/file_win.cc
@@ -4,6 +4,8 @@
#include "base/files/file.h"
+#include <windows.h>
+
#include <io.h>
#include <stdint.h>
@@ -17,8 +19,6 @@
#include "base/strings/string_util.h"
#include "base/threading/scoped_blocking_call.h"
-#include <windows.h>
-
namespace base {
// Make sure our Whence mappings match the system headers.
diff --git a/base/logging.cc b/base/logging.cc
index 1f400937..504e9da 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -65,9 +65,10 @@
#endif // defined(LEAK_SANITIZER) && !BUILDFLAG(IS_NACL)
#if BUILDFLAG(IS_WIN)
-#include <io.h>
#include <windows.h>
+#include <io.h>
+
#include "base/win/win_util.h"
typedef HANDLE FileHandle;
diff --git a/base/memory/discardable_shared_memory.cc b/base/memory/discardable_shared_memory.cc
index 584d7b6a..ad513558 100644
--- a/base/memory/discardable_shared_memory.cc
+++ b/base/memory/discardable_shared_memory.cc
@@ -32,6 +32,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/win/windows_version.h"
#endif
diff --git a/base/memory/platform_shared_memory_region_unittest.cc b/base/memory/platform_shared_memory_region_unittest.cc
index c18b43f..71123604 100644
--- a/base/memory/platform_shared_memory_region_unittest.cc
+++ b/base/memory/platform_shared_memory_region_unittest.cc
@@ -24,6 +24,7 @@
#include "base/debug/proc_maps_linux.h"
#elif BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/logging.h"
#elif BUILDFLAG(IS_FUCHSIA)
#include <lib/zx/object.h>
diff --git a/base/process/kill_win.cc b/base/process/kill_win.cc
index 0048fa2..cc0902e 100644
--- a/base/process/kill_win.cc
+++ b/base/process/kill_win.cc
@@ -4,13 +4,13 @@
#include "base/process/kill.h"
-#include <algorithm>
-
#include <windows.h>
#include <io.h>
#include <stdint.h>
+#include <algorithm>
+
#include "base/logging.h"
#include "base/notreached.h"
#include "base/process/memory.h"
diff --git a/base/process/process_handle_win.cc b/base/process/process_handle_win.cc
index dbb8961..6e2c134 100644
--- a/base/process/process_handle_win.cc
+++ b/base/process/process_handle_win.cc
@@ -5,7 +5,9 @@
#include "base/process/process_handle.h"
#include <windows.h>
+
#include <winternl.h>
+
#include <ostream>
#include "base/check.h"
diff --git a/base/process/process_unittest.cc b/base/process/process_unittest.cc
index 17c92b6a..09c0eeb 100644
--- a/base/process/process_unittest.cc
+++ b/base/process/process_unittest.cc
@@ -40,9 +40,9 @@
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN)
-#include "base/win/base_win_buildflags.h"
-
#include <windows.h>
+
+#include "base/win/base_win_buildflags.h"
#endif
namespace {
diff --git a/base/process/process_win.cc b/base/process/process_win.cc
index 9a414d8..57943b2 100644
--- a/base/process/process_win.cc
+++ b/base/process/process_win.cc
@@ -4,6 +4,8 @@
#include "base/process/process.h"
+#include <windows.h>
+
#include "base/clang_profiling_buildflags.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
@@ -12,8 +14,6 @@
#include "base/trace_event/base_tracing.h"
#include "base/win/windows_version.h"
-#include <windows.h>
-
#if BUILDFLAG(CLANG_PROFILING)
#include "base/test/clang_profiling.h"
#endif
diff --git a/base/profiler/module_cache_win.cc b/base/profiler/module_cache_win.cc
index 73a7d2e..b8164b9 100644
--- a/base/profiler/module_cache_win.cc
+++ b/base/profiler/module_cache_win.cc
@@ -5,6 +5,7 @@
#include "base/profiler/module_cache.h"
#include <objbase.h>
+
#include <psapi.h>
#include <string>
diff --git a/base/profiler/stack_sampling_profiler_unittest.cc b/base/profiler/stack_sampling_profiler_unittest.cc
index 4f9ebe9..e2a32352 100644
--- a/base/profiler/stack_sampling_profiler_unittest.cc
+++ b/base/profiler/stack_sampling_profiler_unittest.cc
@@ -39,9 +39,10 @@
#include "testing/gtest/include/gtest/gtest.h"
#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+
#include <intrin.h>
#include <malloc.h>
-#include <windows.h>
#else
#include <alloca.h>
#endif
diff --git a/base/profiler/suspendable_thread_delegate_win.cc b/base/profiler/suspendable_thread_delegate_win.cc
index db470d9c..f4363b08 100644
--- a/base/profiler/suspendable_thread_delegate_win.cc
+++ b/base/profiler/suspendable_thread_delegate_win.cc
@@ -5,6 +5,7 @@
#include "base/profiler/suspendable_thread_delegate_win.h"
#include <windows.h>
+
#include <winternl.h>
#include <vector>
diff --git a/base/profiler/suspendable_thread_delegate_win.h b/base/profiler/suspendable_thread_delegate_win.h
index b50baebd..bca0426 100644
--- a/base/profiler/suspendable_thread_delegate_win.h
+++ b/base/profiler/suspendable_thread_delegate_win.h
@@ -6,6 +6,7 @@
#define BASE_PROFILER_SUSPENDABLE_THREAD_DELEGATE_WIN_H_
#include <windows.h>
+
#include <memory>
#include <vector>
diff --git a/base/synchronization/waitable_event_watcher_win.cc b/base/synchronization/waitable_event_watcher_win.cc
index 6474ed3..e4cbc19 100644
--- a/base/synchronization/waitable_event_watcher_win.cc
+++ b/base/synchronization/waitable_event_watcher_win.cc
@@ -4,12 +4,12 @@
#include "base/synchronization/waitable_event_watcher.h"
+#include <windows.h>
+
#include "base/compiler_specific.h"
#include "base/synchronization/waitable_event.h"
#include "base/win/object_watcher.h"
-#include <windows.h>
-
namespace base {
WaitableEventWatcher::WaitableEventWatcher() = default;
diff --git a/base/synchronization/waitable_event_win.cc b/base/synchronization/waitable_event_win.cc
index 75e42e9..a3d403dc 100644
--- a/base/synchronization/waitable_event_win.cc
+++ b/base/synchronization/waitable_event_win.cc
@@ -4,9 +4,10 @@
#include "base/synchronization/waitable_event.h"
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include <algorithm>
#include <optional>
#include <utility>
diff --git a/base/system/sys_info_win.cc b/base/system/sys_info_win.cc
index 6862696..0ceb85a 100644
--- a/base/system/sys_info_win.cc
+++ b/base/system/sys_info_win.cc
@@ -4,9 +4,10 @@
#include "base/system/sys_info.h"
+#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
-#include <windows.h>
#include <algorithm>
#include <bit>
diff --git a/base/task/single_thread_task_executor_unittest.cc b/base/task/single_thread_task_executor_unittest.cc
index 03b19683..734d463 100644
--- a/base/task/single_thread_task_executor_unittest.cc
+++ b/base/task/single_thread_task_executor_unittest.cc
@@ -48,13 +48,13 @@
#endif
#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+
#include "base/message_loop/message_pump_win.h"
#include "base/process/memory.h"
#include "base/win/current_module.h"
#include "base/win/message_window.h"
#include "base/win/scoped_handle.h"
-
-#include <windows.h>
#endif
using ::testing::IsNull;
diff --git a/base/test/file_path_reparse_point_win.cc b/base/test/file_path_reparse_point_win.cc
index d5644d7..3e5b652 100644
--- a/base/test/file_path_reparse_point_win.cc
+++ b/base/test/file_path_reparse_point_win.cc
@@ -5,6 +5,7 @@
#include "base/test/file_path_reparse_point_win.h"
#include <windows.h>
+
#include <winioctl.h>
#include <utility>
diff --git a/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc
index 476caf49..9d135c2 100644
--- a/base/test/launcher/test_launcher.cc
+++ b/base/test/launcher/test_launcher.cc
@@ -79,10 +79,10 @@
#endif
#if BUILDFLAG(IS_WIN)
-#include "base/strings/string_util_win.h"
-
#include <windows.h>
+#include "base/strings/string_util_win.h"
+
// To avoid conflicts with the macro from the Windows SDK...
#undef GetCommandLine
#endif
diff --git a/base/test/test_file_util_win.cc b/base/test/test_file_util_win.cc
index c6ddd34..cc7edf2a 100644
--- a/base/test/test_file_util_win.cc
+++ b/base/test/test_file_util_win.cc
@@ -4,10 +4,11 @@
#include "base/test/test_file_util.h"
+#include <windows.h>
+
#include <aclapi.h>
#include <stddef.h>
#include <wchar.h>
-#include <windows.h>
#include <memory>
diff --git a/base/test/test_file_util_win_unittest.cc b/base/test/test_file_util_win_unittest.cc
index 58e5456b..deaacf6 100644
--- a/base/test/test_file_util_win_unittest.cc
+++ b/base/test/test_file_util_win_unittest.cc
@@ -5,6 +5,7 @@
#include "base/test/test_file_util.h"
#include <windows.h>
+
#include <string>
#include "base/files/file_path.h"
diff --git a/base/test/test_reg_util_win.cc b/base/test/test_reg_util_win.cc
index 1a6087cd..5652b912 100644
--- a/base/test/test_reg_util_win.cc
+++ b/base/test/test_reg_util_win.cc
@@ -4,9 +4,10 @@
#include "base/test/test_reg_util_win.h"
-#include <stdint.h>
#include <windows.h>
+#include <stdint.h>
+
#include <string_view>
#include "base/memory/ptr_util.h"
diff --git a/base/test/test_shortcut_win.cc b/base/test/test_shortcut_win.cc
index 49015ec..680ccc3 100644
--- a/base/test/test_shortcut_win.cc
+++ b/base/test/test_shortcut_win.cc
@@ -4,11 +4,12 @@
#include "base/test/test_shortcut_win.h"
+#include <objbase.h>
+
#include <windows.h>
-#include <objbase.h>
-#include <shlobj.h>
#include <propkey.h>
+#include <shlobj.h>
#include <wrl/client.h>
#include <string>
diff --git a/base/threading/platform_thread_unittest.cc b/base/threading/platform_thread_unittest.cc
index fee8139..ec57b267 100644
--- a/base/threading/platform_thread_unittest.cc
+++ b/base/threading/platform_thread_unittest.cc
@@ -20,6 +20,7 @@
#include "base/threading/platform_thread_internal_posix.h"
#elif BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/threading/platform_thread_win.h"
#endif
diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
index c4e5586..bbf14b8 100644
--- a/base/threading/platform_thread_win.cc
+++ b/base/threading/platform_thread_win.cc
@@ -4,6 +4,8 @@
#include "base/threading/platform_thread_win.h"
+#include <windows.h>
+
#include <stddef.h>
#include <string>
@@ -29,8 +31,6 @@
#include "build/build_config.h"
#include "partition_alloc/partition_alloc_buildflags.h"
-#include <windows.h>
-
#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
#include "partition_alloc/stack/stack.h"
#endif
diff --git a/base/threading/thread_local_storage_perftest.cc b/base/threading/thread_local_storage_perftest.cc
index 9f5d1c0..ebf2e6bb 100644
--- a/base/threading/thread_local_storage_perftest.cc
+++ b/base/threading/thread_local_storage_perftest.cc
@@ -22,6 +22,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/win/windows_types.h"
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
#include <pthread.h>
diff --git a/base/time/time_win.cc b/base/time/time_win.cc
index c6540592..e6a0fe22 100644
--- a/base/time/time_win.cc
+++ b/base/time/time_win.cc
@@ -33,11 +33,11 @@
#include "base/time/time.h"
-#include <windows.foundation.h>
#include <windows.h>
#include <mmsystem.h>
#include <stdint.h>
+#include <windows.foundation.h>
#include <atomic>
#include <ostream>
diff --git a/base/time/time_win_unittest.cc b/base/time/time_win_unittest.cc
index 7684d61..df0b6fca 100644
--- a/base/time/time_win_unittest.cc
+++ b/base/time/time_win_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/time/time.h"
+
#include <windows.h>
#include <mmsystem.h>
@@ -16,7 +18,6 @@
#include "base/strings/string_piece.h"
#include "base/threading/platform_thread.h"
-#include "base/time/time.h"
#include "base/win/registry.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/trace_event/process_memory_dump_unittest.cc b/base/trace_event/process_memory_dump_unittest.cc
index c41775c..8d8d2d49e 100644
--- a/base/trace_event/process_memory_dump_unittest.cc
+++ b/base/trace_event/process_memory_dump_unittest.cc
@@ -23,6 +23,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "winbase.h"
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
#include <sys/mman.h>
diff --git a/base/trace_event/trace_logging_minimal_win.h b/base/trace_event/trace_logging_minimal_win.h
index 8930d63..8c517f3 100644
--- a/base/trace_event/trace_logging_minimal_win.h
+++ b/base/trace_event/trace_logging_minimal_win.h
@@ -23,10 +23,11 @@
* logging like TraceLoggingProvider.h.
*/
-#include <stdint.h>
#include <windows.h>
-// Evntprov.h must come after windows.h.
+
#include <evntprov.h>
+#include <stdint.h>
+
#include <cstdint>
// TODO([email protected]) Update headers and use defined constants instead
// of magic numbers after crbug.com/1089996 is resolved.
diff --git a/base/win/access_control_list.cc b/base/win/access_control_list.cc
index f70c0e3d..827f5c6 100644
--- a/base/win/access_control_list.cc
+++ b/base/win/access_control_list.cc
@@ -4,9 +4,10 @@
#include "base/win/access_control_list.h"
-#include <aclapi.h>
#include <windows.h>
+#include <aclapi.h>
+
#include <utility>
#include <vector>
diff --git a/base/win/async_operation.h b/base/win/async_operation.h
index a5217ec..3123a526 100644
--- a/base/win/async_operation.h
+++ b/base/win/async_operation.h
@@ -6,6 +6,7 @@
#define BASE_WIN_ASYNC_OPERATION_H_
#include <unknwn.h>
+
#include <windows.foundation.h>
#include <wrl/async.h>
#include <wrl/client.h>
diff --git a/base/win/com_init_balancer.cc b/base/win/com_init_balancer.cc
index e46f4190..f38066ba 100644
--- a/base/win/com_init_balancer.cc
+++ b/base/win/com_init_balancer.cc
@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/win/com_init_balancer.h"
+
#include <objbase.h>
#include "base/check_op.h"
-#include "base/win/com_init_balancer.h"
namespace base {
namespace win {
diff --git a/base/win/com_init_check_hook.cc b/base/win/com_init_check_hook.cc
index bccaf19..598c86cc 100644
--- a/base/win/com_init_check_hook.cc
+++ b/base/win/com_init_check_hook.cc
@@ -4,9 +4,10 @@
#include "base/win/com_init_check_hook.h"
+#include <objbase.h>
+
#include <windows.h>
-#include <objbase.h>
#include <stdint.h>
#include <string.h>
diff --git a/base/win/com_init_check_hook_unittest.cc b/base/win/com_init_check_hook_unittest.cc
index 54e25bc..6f3b21e1 100644
--- a/base/win/com_init_check_hook_unittest.cc
+++ b/base/win/com_init_check_hook_unittest.cc
@@ -5,6 +5,7 @@
#include "base/win/com_init_check_hook.h"
#include <objbase.h>
+
#include <shlobj.h>
#include <wrl/client.h>
diff --git a/base/win/com_init_util.cc b/base/win/com_init_util.cc
index 9867c15..04dfa63 100644
--- a/base/win/com_init_util.cc
+++ b/base/win/com_init_util.cc
@@ -4,8 +4,9 @@
#include "base/win/com_init_util.h"
-#include <stdint.h>
#include <windows.h>
+
+#include <stdint.h>
#include <winternl.h>
#include "base/logging.h"
diff --git a/base/win/default_apps_util.cc b/base/win/default_apps_util.cc
index 76ef576d..517a1a4 100644
--- a/base/win/default_apps_util.cc
+++ b/base/win/default_apps_util.cc
@@ -5,6 +5,7 @@
#include "base/win/default_apps_util.h"
#include <shobjidl.h>
+
#include <wrl/client.h>
#include <string_view>
diff --git a/base/win/event_trace_controller_unittest.cc b/base/win/event_trace_controller_unittest.cc
index d4ee08f5..2e893da1 100644
--- a/base/win/event_trace_controller_unittest.cc
+++ b/base/win/event_trace_controller_unittest.cc
@@ -4,6 +4,8 @@
//
// Unit tests for event trace controller.
+#include "base/win/event_trace_controller.h"
+
#include <objbase.h>
#include <initguid.h> // NOLINT - has to be last
@@ -16,7 +18,6 @@
#include "base/strings/string_number_conversions_win.h"
#include "base/strings/string_util.h"
#include "base/system/sys_info.h"
-#include "base/win/event_trace_controller.h"
#include "base/win/event_trace_provider.h"
#include "base/win/scoped_handle.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/win/i18n.cc b/base/win/i18n.cc
index 5a75a621..7fe013f 100644
--- a/base/win/i18n.cc
+++ b/base/win/i18n.cc
@@ -10,7 +10,6 @@
#include <string_view>
#include "base/check_op.h"
-
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/base/win/pe_image_reader.h b/base/win/pe_image_reader.h
index 721cc0df..79e0dcd 100644
--- a/base/win/pe_image_reader.h
+++ b/base/win/pe_image_reader.h
@@ -5,9 +5,10 @@
#ifndef BASE_WIN_PE_IMAGE_READER_H_
#define BASE_WIN_PE_IMAGE_READER_H_
+#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
-#include <windows.h>
#include <memory>
diff --git a/base/win/pe_image_reader_unittest.cc b/base/win/pe_image_reader_unittest.cc
index 213d18b0..f13a012 100644
--- a/base/win/pe_image_reader_unittest.cc
+++ b/base/win/pe_image_reader_unittest.cc
@@ -2,16 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/win/pe_image_reader.h"
+
+#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
-#include <windows.h>
#include <wintrust.h>
#include "base/files/file_path.h"
#include "base/files/memory_mapped_file.h"
#include "base/memory/raw_ptr.h"
#include "base/path_service.h"
-#include "base/win/pe_image_reader.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/win/post_async_results.h b/base/win/post_async_results.h
index b5476fad..564605a 100644
--- a/base/win/post_async_results.h
+++ b/base/win/post_async_results.h
@@ -6,6 +6,7 @@
#define BASE_WIN_POST_ASYNC_RESULTS_H_
#include <unknwn.h>
+
#include <windows.foundation.h>
#include <wrl/async.h>
#include <wrl/client.h>
diff --git a/base/win/scoped_com_initializer.h b/base/win/scoped_com_initializer.h
index f86a927..a3bcaf9 100644
--- a/base/win/scoped_com_initializer.h
+++ b/base/win/scoped_com_initializer.h
@@ -6,6 +6,7 @@
#define BASE_WIN_SCOPED_COM_INITIALIZER_H_
#include <objbase.h>
+
#include <wrl/client.h>
#include "base/base_export.h"
diff --git a/base/win/scoped_handle_unittest.cc b/base/win/scoped_handle_unittest.cc
index 36425427..4499bb4 100644
--- a/base/win/scoped_handle_unittest.cc
+++ b/base/win/scoped_handle_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/win/scoped_handle.h"
+
#include <windows.h>
#include <winternl.h>
@@ -14,7 +16,6 @@
#include "base/scoped_native_library.h"
#include "base/test/multiprocess_test.h"
#include "base/test/test_timeouts.h"
-#include "base/win/scoped_handle.h"
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/multiprocess_func_list.h"
diff --git a/base/win/security_descriptor_unittest.cc b/base/win/security_descriptor_unittest.cc
index 197c4dd..8fc649e4 100644
--- a/base/win/security_descriptor_unittest.cc
+++ b/base/win/security_descriptor_unittest.cc
@@ -4,9 +4,10 @@
#include "base/win/security_descriptor.h"
+#include <windows.h>
+
#include <aclapi.h>
#include <sddl.h>
-#include <windows.h>
#include <optional>
#include <string>
diff --git a/base/win/security_util.cc b/base/win/security_util.cc
index 29634b8..37a63c6 100644
--- a/base/win/security_util.cc
+++ b/base/win/security_util.cc
@@ -5,6 +5,7 @@
#include "base/win/security_util.h"
#include <windows.h>
+
#include <winternl.h>
#include <optional>
diff --git a/base/win/shortcut.cc b/base/win/shortcut.cc
index 5500017..8daa303c 100644
--- a/base/win/shortcut.cc
+++ b/base/win/shortcut.cc
@@ -5,6 +5,7 @@
#include "base/win/shortcut.h"
#include <objbase.h>
+
#include <propkey.h>
#include <shlobj.h>
#include <wrl/client.h>
diff --git a/base/win/variant_vector.h b/base/win/variant_vector.h
index 8e297284..1148e37 100644
--- a/base/win/variant_vector.h
+++ b/base/win/variant_vector.h
@@ -6,6 +6,7 @@
#define BASE_WIN_VARIANT_VECTOR_H_
#include <objbase.h>
+
#include <oleauto.h>
#include <type_traits>
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
index 9d83f43..a896b2ab 100644
--- a/base/win/win_util.cc
+++ b/base/win/win_util.cc
@@ -4,13 +4,17 @@
#include "base/win/win_util.h"
+#include <objbase.h>
+
+#include <initguid.h>
+#include <shobjidl.h>
+#include <tchar.h>
+
#include <aclapi.h>
#include <cfgmgr32.h>
-#include <initguid.h>
#include <inspectable.h>
#include <lm.h>
#include <mdmregistration.h>
-#include <objbase.h>
#include <powrprof.h>
#include <propkey.h>
#include <psapi.h>
@@ -18,12 +22,10 @@
#include <sddl.h>
#include <setupapi.h>
#include <shellscalingapi.h>
-#include <shobjidl.h> // Must be before propkey.
#include <signal.h>
#include <stddef.h>
#include <stdlib.h>
#include <strsafe.h>
-#include <tchar.h> // Must be before tpcshrd.h or for any use of _T macro
#include <tpcshrd.h>
#include <uiviewsettingsinterop.h>
#include <windows.ui.viewmanagement.h>
diff --git a/base/win/wmi.cc b/base/win/wmi.cc
index 479da96..b869e5a1f 100644
--- a/base/win/wmi.cc
+++ b/base/win/wmi.cc
@@ -4,9 +4,10 @@
#include "base/win/wmi.h"
+#include <objbase.h>
+
#include <windows.h>
-#include <objbase.h>
#include <stdint.h>
#include <string_view>
diff --git a/chrome/app/chrome_exe_main_win.cc b/chrome/app/chrome_exe_main_win.cc
index 101c61a6..11d1511 100644
--- a/chrome/app/chrome_exe_main_win.cc
+++ b/chrome/app/chrome_exe_main_win.cc
@@ -4,11 +4,11 @@
#include "chrome/app/chrome_exe_main_win.h"
+#include <tchar.h>
#include <windows.h>
#include <malloc.h>
#include <stddef.h>
-#include <tchar.h>
#include <algorithm>
#include <array>
diff --git a/chrome/app/main_dll_loader_win.cc b/chrome/app/main_dll_loader_win.cc
index 1ae5b0a..3ec6c3fc 100644
--- a/chrome/app/main_dll_loader_win.cc
+++ b/chrome/app/main_dll_loader_win.cc
@@ -5,6 +5,7 @@
#include "chrome/app/main_dll_loader_win.h"
#include <windows.h> // NOLINT
+
#include <stddef.h>
#include <stdint.h>
#include <userenv.h> // NOLINT
diff --git a/chrome/browser/accessibility/caption_settings_dialog_win.cc b/chrome/browser/accessibility/caption_settings_dialog_win.cc
index 3807d7c..42579ff 100644
--- a/chrome/browser/accessibility/caption_settings_dialog_win.cc
+++ b/chrome/browser/accessibility/caption_settings_dialog_win.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/accessibility/caption_settings_dialog.h"
#include <windows.h>
+
#include <shellapi.h>
#include "base/functional/bind.h"
diff --git a/chrome/browser/apps/platform_apps/app_window_interactive_uitest.cc b/chrome/browser/apps/platform_apps/app_window_interactive_uitest.cc
index 06f60e8..8933cd1 100644
--- a/chrome/browser/apps/platform_apps/app_window_interactive_uitest.cc
+++ b/chrome/browser/apps/platform_apps/app_window_interactive_uitest.cc
@@ -22,6 +22,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
diff --git a/chrome/browser/component_updater/recovery_improved_component_installer_win.cc b/chrome/browser/component_updater/recovery_improved_component_installer_win.cc
index 12ce6cb..4711618 100644
--- a/chrome/browser/component_updater/recovery_improved_component_installer_win.cc
+++ b/chrome/browser/component_updater/recovery_improved_component_installer_win.cc
@@ -6,6 +6,7 @@
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
#include <windows.h>
+
#include <wrl/client.h>
#include <tuple>
diff --git a/chrome/browser/component_updater/soda_component_installer.cc b/chrome/browser/component_updater/soda_component_installer.cc
index 4651392..4807dc3 100644
--- a/chrome/browser/component_updater/soda_component_installer.cc
+++ b/chrome/browser/component_updater/soda_component_installer.cc
@@ -30,9 +30,10 @@
#include "crypto/sha2.h"
#if BUILDFLAG(IS_WIN)
-#include <aclapi.h>
#include <windows.h>
+#include <aclapi.h>
+
#include "base/win/scoped_localalloc.h"
#include "base/win/sid.h"
#endif
diff --git a/chrome/browser/device_reauth/win/authenticator_win.cc b/chrome/browser/device_reauth/win/authenticator_win.cc
index 9e53fb3..dedab8b 100644
--- a/chrome/browser/device_reauth/win/authenticator_win.cc
+++ b/chrome/browser/device_reauth/win/authenticator_win.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/device_reauth/win/authenticator_win.h"
#include <objbase.h>
+
#include <windows.foundation.h>
#include <windows.security.credentials.ui.h>
#include <windows.storage.streams.h>
diff --git a/chrome/browser/download/download_status_updater_win.cc b/chrome/browser/download/download_status_updater_win.cc
index 2383316..274413e 100644
--- a/chrome/browser/download/download_status_updater_win.cc
+++ b/chrome/browser/download/download_status_updater_win.cc
@@ -5,10 +5,13 @@
#include "chrome/browser/download/download_status_updater.h"
#include <objbase.h>
+
#include <shobjidl.h>
-#include <string>
+
#include <wrl/client.h>
+#include <string>
+
#include "base/logging.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
diff --git a/chrome/browser/enterprise/platform_auth/cloud_ap_provider_win.cc b/chrome/browser/enterprise/platform_auth/cloud_ap_provider_win.cc
index b9a412be..df0bc10 100644
--- a/chrome/browser/enterprise/platform_auth/cloud_ap_provider_win.cc
+++ b/chrome/browser/enterprise/platform_auth/cloud_ap_provider_win.cc
@@ -4,13 +4,14 @@
#include "chrome/browser/enterprise/platform_auth/cloud_ap_provider_win.h"
-#include <stdint.h>
-#include <windows.h> // Must precede lmjoin.h.
+#include <objbase.h>
+
+#include <windows.h>
#include <lmcons.h>
#include <lmjoin.h>
-#include <objbase.h>
#include <proofofpossessioncookieinfo.h>
+#include <stdint.h>
#include <windows.security.authentication.web.core.h>
#include <wrl/client.h>
diff --git a/chrome/browser/enterprise/signals/context_info_fetcher.cc b/chrome/browser/enterprise/signals/context_info_fetcher.cc
index 835c864..5036b878 100644
--- a/chrome/browser/enterprise/signals/context_info_fetcher.cc
+++ b/chrome/browser/enterprise/signals/context_info_fetcher.cc
@@ -40,8 +40,9 @@
#endif
#if BUILDFLAG(IS_WIN)
-#include <netfw.h>
#include <windows.h>
+
+#include <netfw.h>
#include <wrl/client.h>
#include "net/dns/public/win_dns_system_settings.h"
diff --git a/chrome/browser/enterprise/signals/device_info_fetcher_win.cc b/chrome/browser/enterprise/signals/device_info_fetcher_win.cc
index 56c2dac..ccdd4477 100644
--- a/chrome/browser/enterprise/signals/device_info_fetcher_win.cc
+++ b/chrome/browser/enterprise/signals/device_info_fetcher_win.cc
@@ -4,12 +4,18 @@
#include "chrome/browser/enterprise/signals/device_info_fetcher_win.h"
-#include <Windows.h>
+#include <windows.h>
// SECURITY_WIN32 must be defined in order to get
// EXTENDED_NAME_FORMAT enumeration.
#define SECURITY_WIN32 1
#include <security.h>
#undef SECURITY_WIN32
+#include <shobjidl.h> // NOLINT(build/include_order)
+
+#include <DSRole.h> // NOLINT(build/include_order)
+#include <iphlpapi.h> // NOLINT(build/include_order)
+#include <powersetting.h> // NOLINT(build/include_order)
+#include <propsys.h> // NOLINT(build/include_order)
#include <wincred.h>
#include "base/files/file_path.h"
@@ -21,19 +27,11 @@
#include "base/system/sys_info.h"
#include "base/win/registry.h"
#include "base/win/win_util.h"
-#include "base/win/windows_types.h"
#include "base/win/windows_version.h"
#include "base/win/wmi.h"
#include "chrome/browser/enterprise/signals/signals_common.h"
#include "net/base/network_interfaces.h"
-// Those headers need defines from windows_types.h, thus have to come after it.
-#include <DSRole.h> // NOLINT(build/include_order)
-#include <iphlpapi.h> // NOLINT(build/include_order)
-#include <powersetting.h> // NOLINT(build/include_order)
-#include <propsys.h> // NOLINT(build/include_order)
-#include <shobjidl.h> // NOLINT(build/include_order)
-
namespace enterprise_signals {
namespace {
diff --git a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_unittest.cc b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_unittest.cc
index 2a09489..df21db68 100644
--- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_unittest.cc
+++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_unittest.cc
@@ -49,9 +49,10 @@
#endif
#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+
#include <netfw.h>
#include <shlobj.h>
-#include <windows.h>
#include <wrl/client.h>
#include "base/test/test_reg_util_win.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_win.cc b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_win.cc
index 824c609..ab07964 100644
--- a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_win.cc
+++ b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_win.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h"
#include <windows.h>
+
#include <setupapi.h>
// LogSeverity is both a macro in setupapi.h and a typedef in base/logging.h
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_test_echo_host.cc b/chrome/browser/extensions/api/messaging/native_messaging_test_echo_host.cc
index 94b02854..899f3b4 100644
--- a/chrome/browser/extensions/api/messaging/native_messaging_test_echo_host.cc
+++ b/chrome/browser/extensions/api/messaging/native_messaging_test_echo_host.cc
@@ -4,9 +4,10 @@
// This is a simple Native Message Host application. It echoes any messages
// it receives.
-#include <string.h>
#include <windows.h>
+#include <string.h>
+
#include "base/files/file.h"
int main(int argc, char* argv[]) {
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc
index fd4a7a92..0370136 100644
--- a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc
+++ b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc
@@ -5,9 +5,9 @@
#include "chrome/browser/extensions/api/messaging/native_process_launcher.h"
#include <windows.h>
-#include <stdint.h>
#include <shellapi.h>
+#include <stdint.h>
#include <string>
diff --git a/chrome/browser/extensions/system_display/display_info_provider_win.cc b/chrome/browser/extensions/system_display/display_info_provider_win.cc
index 080c747..77b7873 100644
--- a/chrome/browser/extensions/system_display/display_info_provider_win.cc
+++ b/chrome/browser/extensions/system_display/display_info_provider_win.cc
@@ -4,11 +4,12 @@
#include "chrome/browser/extensions/system_display/display_info_provider_win.h"
-#include <memory>
-#include <utility>
+#include <windows.h>
#include <stddef.h>
-#include <windows.h>
+
+#include <memory>
+#include <utility>
#include "base/hash/hash.h"
#include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/first_run/first_run_internal_win.cc b/chrome/browser/first_run/first_run_internal_win.cc
index 09002f7..2a53bf7 100644
--- a/chrome/browser/first_run/first_run_internal_win.cc
+++ b/chrome/browser/first_run/first_run_internal_win.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/first_run/first_run_internal.h"
#include <windows.h>
+
#include <shellapi.h>
#include <stdint.h>
diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc
index adcaa33..a6f742b 100644
--- a/chrome/browser/first_run/upgrade_util_win.cc
+++ b/chrome/browser/first_run/upgrade_util_win.cc
@@ -4,10 +4,10 @@
#include "chrome/browser/first_run/upgrade_util_win.h"
-// Must be first.
+#include <objbase.h>
+
#include <windows.h>
-#include <objbase.h>
#include <psapi.h>
#include <shellapi.h>
#include <wrl/client.h>
diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc
index cf617fc..919ab70 100644
--- a/chrome/browser/google/google_update_win.cc
+++ b/chrome/browser/google/google_update_win.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/google/google_update_win.h"
#include <objbase.h>
+
#include <stdint.h>
#include <string.h>
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc
index e78ff57..6ac554a 100644
--- a/chrome/browser/icon_loader_win.cc
+++ b/chrome/browser/icon_loader_win.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/icon_loader.h"
#include <windows.h>
+
#include <shellapi.h>
#include "base/files/file_path.h"
diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc
index 0425bceb..8c083a9 100644
--- a/chrome/browser/importer/ie_importer_browsertest_win.cc
+++ b/chrome/browser/importer/ie_importer_browsertest_win.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// The order of these includes is important.
+#include <objbase.h>
+
#include <unknwn.h>
#include <windows.h>
#include <intshcut.h>
-#include <objbase.h>
#include <shlguid.h>
#include <shlobj.h>
#include <stddef.h>
diff --git a/chrome/browser/media/router/discovery/discovery_network_list_win.cc b/chrome/browser/media/router/discovery/discovery_network_list_win.cc
index 33ce112c1..d2dd7f1 100644
--- a/chrome/browser/media/router/discovery/discovery_network_list_win.cc
+++ b/chrome/browser/media/router/discovery/discovery_network_list_win.cc
@@ -5,23 +5,21 @@
#include "chrome/browser/media/router/discovery/discovery_network_list_win.h"
#include <winsock2.h>
-#include <wrl/client.h>
#include <windot11.h> // NOLINT
#include <wlanapi.h> // NOLINT
+#include <wrl/client.h>
#include <algorithm>
#include <cstring>
-
#include <utility>
#include <vector>
#include "base/check.h"
-#include "base/threading/scoped_thread_priority.h"
-
#include "base/memory/ptr_util.h"
#include "base/no_destructor.h"
#include "base/strings/string_number_conversions.h"
+#include "base/threading/scoped_thread_priority.h"
#include "base/win/hstring_reference.h"
#include "base/win/scoped_hstring.h"
#include "base/win/windows_version.h"
diff --git a/chrome/browser/media/router/discovery/discovery_network_list_win.h b/chrome/browser/media/router/discovery/discovery_network_list_win.h
index d58a80c..0b1a81e 100644
--- a/chrome/browser/media/router/discovery/discovery_network_list_win.h
+++ b/chrome/browser/media/router/discovery/discovery_network_list_win.h
@@ -5,12 +5,11 @@
#ifndef CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_DISCOVERY_NETWORK_LIST_WIN_H_
#define CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_DISCOVERY_NETWORK_LIST_WIN_H_
-#include <roapi.h>
-#include <windows.networking.connectivity.h>
#include <ws2tcpip.h>
-// iphlpapi.h must be included after ws2tcpip.h to use MIB_IF_TABLE2.
#include <iphlpapi.h> // NOLINT
+#include <roapi.h>
+#include <windows.networking.connectivity.h>
#include <map>
#include <memory>
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
index 335792a..03b1236 100644
--- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
@@ -46,6 +46,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/strings/string_util_win.h"
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
#endif
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc b/chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc
index 5c9a9a25f..b9be9b7 100644
--- a/chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc
+++ b/chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc
@@ -42,6 +42,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/strings/string_util_win.h"
#endif
diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc
index 2e0bd3d..ca09951 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.cc
+++ b/chrome/browser/media_galleries/media_galleries_test_util.cc
@@ -35,6 +35,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/test/test_reg_util_win.h"
#include "base/win/registry.h"
#endif // BUILDFLAG(IS_WIN)
diff --git a/chrome/browser/media_galleries/win/mtp_device_operations_util.cc b/chrome/browser/media_galleries/win/mtp_device_operations_util.cc
index 9491a01..ac59632 100644
--- a/chrome/browser/media_galleries/win/mtp_device_operations_util.cc
+++ b/chrome/browser/media_galleries/win/mtp_device_operations_util.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/media_galleries/win/mtp_device_operations_util.h"
#include <objbase.h>
+
#include <portabledevice.h>
#include <stdint.h>
diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc
index 652939f..faa25dfe 100644
--- a/chrome/browser/memory_details_win.cc
+++ b/chrome/browser/memory_details_win.cc
@@ -2,14 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// Windows headers must come first.
+#include "chrome/browser/memory_details.h"
+
#include <windows.h>
+#include <TlHelp32.h>
#include <psapi.h>
#include <stddef.h>
-#include <TlHelp32.h>
-
-#include "chrome/browser/memory_details.h"
#include <memory>
diff --git a/chrome/browser/net/net_error_diagnostics_dialog_win.cc b/chrome/browser/net/net_error_diagnostics_dialog_win.cc
index 56c16ff9..58d7d7a 100644
--- a/chrome/browser/net/net_error_diagnostics_dialog_win.cc
+++ b/chrome/browser/net/net_error_diagnostics_dialog_win.cc
@@ -4,10 +4,10 @@
#include "chrome/browser/net/net_error_diagnostics_dialog.h"
-// Winsock.h must be included before ndfapi.h.
-#include <winsock2.h> // NOLINT
-#include <ndfapi.h> // NOLINT
#include <windows.h> // NOLINT
+#include <winsock2.h> // NOLINT
+
+#include <ndfapi.h> // NOLINT
#include <memory>
#include <string>
diff --git a/chrome/browser/notifications/notification_platform_bridge_win.cc b/chrome/browser/notifications/notification_platform_bridge_win.cc
index f8f69501..c2484df 100644
--- a/chrome/browser/notifications/notification_platform_bridge_win.cc
+++ b/chrome/browser/notifications/notification_platform_bridge_win.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/notifications/notification_platform_bridge_win.h"
#include <objbase.h>
+
#include <wrl/event.h>
#include <map>
diff --git a/chrome/browser/policy/browser_dm_token_storage_win.cc b/chrome/browser/policy/browser_dm_token_storage_win.cc
index 4756956..525be94 100644
--- a/chrome/browser/policy/browser_dm_token_storage_win.cc
+++ b/chrome/browser/policy/browser_dm_token_storage_win.cc
@@ -4,13 +4,13 @@
#include "chrome/browser/policy/browser_dm_token_storage_win.h"
-// Must be first.
+#include <objbase.h>
+
+#include <unknwn.h>
#include <windows.h>
#include <comutil.h>
-#include <objbase.h>
#include <oleauto.h>
-#include <unknwn.h>
#include <winerror.h>
#include <wrl/client.h>
diff --git a/chrome/browser/policy/policy_initialization_browsertest.cc b/chrome/browser/policy/policy_initialization_browsertest.cc
index 88c431e..6fc1946 100644
--- a/chrome/browser/policy/policy_initialization_browsertest.cc
+++ b/chrome/browser/policy/policy_initialization_browsertest.cc
@@ -18,6 +18,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/test/test_reg_util_win.h"
#include "base/win/registry.h"
#endif
diff --git a/chrome/browser/policy/status_provider/updater_status_and_value_provider.cc b/chrome/browser/policy/status_provider/updater_status_and_value_provider.cc
index 6e338882..d707625 100644
--- a/chrome/browser/policy/status_provider/updater_status_and_value_provider.cc
+++ b/chrome/browser/policy/status_provider/updater_status_and_value_provider.cc
@@ -7,6 +7,7 @@
#include <windows.h>
#include <DSRole.h>
+
#include <algorithm>
#include <utility>
diff --git a/chrome/browser/printing/pdf_to_emf_converter.cc b/chrome/browser/printing/pdf_to_emf_converter.cc
index 6220dd2..7cce78f 100644
--- a/chrome/browser/printing/pdf_to_emf_converter.cc
+++ b/chrome/browser/printing/pdf_to_emf_converter.cc
@@ -4,9 +4,10 @@
#include "chrome/browser/printing/pdf_to_emf_converter.h"
-#include <stdint.h>
#include <windows.h>
+#include <stdint.h>
+
#include <memory>
#include <optional>
#include <string>
diff --git a/chrome/browser/printing/pdf_to_emf_converter_browsertest.cc b/chrome/browser/printing/pdf_to_emf_converter_browsertest.cc
index ff5160b..13907373 100644
--- a/chrome/browser/printing/pdf_to_emf_converter_browsertest.cc
+++ b/chrome/browser/printing/pdf_to_emf_converter_browsertest.cc
@@ -4,9 +4,10 @@
#include "chrome/browser/printing/pdf_to_emf_converter.h"
-#include <stdint.h>
#include <windows.h>
+#include <stdint.h>
+
#include <limits>
#include <optional>
#include <string_view>
diff --git a/chrome/browser/printing/printer_manager_dialog_win.cc b/chrome/browser/printing/printer_manager_dialog_win.cc
index edbe5af4..be3befb 100644
--- a/chrome/browser/printing/printer_manager_dialog_win.cc
+++ b/chrome/browser/printing/printer_manager_dialog_win.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/printing/printer_manager_dialog.h"
#include <windows.h>
+
#include <shellapi.h>
#include "base/files/file_path.h"
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
index 071f3c0..b6dba0d 100644
--- a/chrome/browser/process_singleton_win.cc
+++ b/chrome/browser/process_singleton_win.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/process_singleton.h"
#include <windows.h>
+
#include <shellapi.h>
#include <stddef.h>
diff --git a/chrome/browser/profile_resetter/triggered_profile_resetter_win_unittest.cc b/chrome/browser/profile_resetter/triggered_profile_resetter_win_unittest.cc
index a708146..e47cd51 100644
--- a/chrome/browser/profile_resetter/triggered_profile_resetter_win_unittest.cc
+++ b/chrome/browser/profile_resetter/triggered_profile_resetter_win_unittest.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
+#include <windows.h>
+
#include <stdint.h>
#include <memory>
@@ -21,8 +23,6 @@
#include "content/public/test/browser_task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include <windows.h>
-
using base::win::RegKey;
class TriggeredProfileResetterTest : public testing::Test {
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
index 29d3691..3d58549 100644
--- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.h"
+#include <windows.h>
+
#include <memory>
#include <utility>
@@ -20,8 +22,6 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include <windows.h>
-
using ::testing::_;
using ::testing::StrictMock;
diff --git a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h
index 506d171..343dbe8 100644
--- a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h
+++ b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
#include <windows.h>
+
#include <stddef.h>
namespace google {
diff --git a/chrome/browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc
index 243de1c..f0caa1b1 100644
--- a/chrome/browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/platform_state_store_win_unittest.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h"
+#include <windows.h>
+
#include <utility>
#include "base/memory/raw_ptr.h"
@@ -21,8 +23,6 @@
#include "content/public/test/browser_task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include <windows.h>
-
namespace safe_browsing {
namespace platform_state_store {
diff --git a/chrome/browser/safe_browsing/incident_reporting/verifier_test/verifier_test_dll.cc b/chrome/browser/safe_browsing/incident_reporting/verifier_test/verifier_test_dll.cc
index 9dee72e..b75cd7e 100644
--- a/chrome/browser/safe_browsing/incident_reporting/verifier_test/verifier_test_dll.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/verifier_test/verifier_test_dll.cc
@@ -5,6 +5,7 @@
// Some pointless code that will become a DLL with some exports and relocs.
#include <windows.h>
+
#include <intrin.h>
namespace {
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 1fc0faa..a2b0589e 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -4,11 +4,12 @@
#include "chrome/browser/shell_integration_win.h"
+#include <objbase.h>
+
#include <shobjidl.h>
#include <windows.h>
-#include <objbase.h>
-#include <propkey.h> // Needs to come after shobjidl.h.
+#include <propkey.h>
#include <stddef.h>
#include <stdint.h>
#include <wrl/client.h>
diff --git a/chrome/browser/task_manager/sampling/shared_sampler_win.cc b/chrome/browser/task_manager/sampling/shared_sampler_win.cc
index 21e59cd..a46951d 100644
--- a/chrome/browser/task_manager/sampling/shared_sampler_win.cc
+++ b/chrome/browser/task_manager/sampling/shared_sampler_win.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/task_manager/sampling/shared_sampler.h"
#include <windows.h>
+
#include <winternl.h>
#include <algorithm>
diff --git a/chrome/browser/task_manager/sampling/shared_sampler_win_defines.h b/chrome/browser/task_manager/sampling/shared_sampler_win_defines.h
index a2685b19..61ac1b3 100644
--- a/chrome/browser/task_manager/sampling/shared_sampler_win_defines.h
+++ b/chrome/browser/task_manager/sampling/shared_sampler_win_defines.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_TASK_MANAGER_SAMPLING_SHARED_SAMPLER_WIN_DEFINES_H_
#include <windows.h>
+
#include <winternl.h>
#include "build/build_config.h"
diff --git a/chrome/browser/taskbar/taskbar_decorator_win.cc b/chrome/browser/taskbar/taskbar_decorator_win.cc
index 20f37cf8..2612e0be 100644
--- a/chrome/browser/taskbar/taskbar_decorator_win.cc
+++ b/chrome/browser/taskbar/taskbar_decorator_win.cc
@@ -5,7 +5,9 @@
#include "chrome/browser/taskbar/taskbar_decorator_win.h"
#include <objbase.h>
+
#include <shobjidl.h>
+
#include <wrl/client.h>
#include <memory>
diff --git a/chrome/browser/ui/cryptuiapi_shim.h b/chrome/browser/ui/cryptuiapi_shim.h
index 02f8ecfb..9b82a43b 100644
--- a/chrome/browser/ui/cryptuiapi_shim.h
+++ b/chrome/browser/ui/cryptuiapi_shim.h
@@ -10,9 +10,10 @@
// which undefines the OpenSSL macros which conflict. Any Chromium headers
// which want to include cryptuiapi should instead include this header.
-#include <cryptuiapi.h>
#include <windows.h>
+#include <cryptuiapi.h>
+
#include "base/win/wincrypt_shim.h"
#endif // CHROME_BROWSER_UI_CRYPTUIAPI_SHIM_H_
diff --git a/chrome/browser/ui/network_profile_bubble.cc b/chrome/browser/ui/network_profile_bubble.cc
index f854178..3d1c2be 100644
--- a/chrome/browser/ui/network_profile_bubble.cc
+++ b/chrome/browser/ui/network_profile_bubble.cc
@@ -4,8 +4,9 @@
#include "chrome/browser/ui/network_profile_bubble.h"
-#include <stdint.h>
#include <windows.h>
+
+#include <stdint.h>
#include <wtsapi32.h>
#include "base/check_op.h"
diff --git a/chrome/browser/ui/views/accessibility/uia_accessibility_event_waiter.h b/chrome/browser/ui/views/accessibility/uia_accessibility_event_waiter.h
index a53cb31..44a4150b 100644
--- a/chrome/browser/ui/views/accessibility/uia_accessibility_event_waiter.h
+++ b/chrome/browser/ui/views/accessibility/uia_accessibility_event_waiter.h
@@ -6,8 +6,8 @@
#define CHROME_BROWSER_UI_VIEWS_ACCESSIBILITY_UIA_ACCESSIBILITY_EVENT_WAITER_H_
#include <ole2.h>
+
#include <stdint.h>
-#include <uiautomation.h>
#include <wrl/client.h>
#include <map>
@@ -23,6 +23,8 @@
#include "base/win/atl.h"
#include "ui/views/accessibility/view_accessibility.h"
+#include <uiautomation.h>
+
struct UiaAccessibilityWaiterInfo {
HWND hwnd;
std::wstring role;
diff --git a/chrome/browser/ui/views/elevation_icon_setter.cc b/chrome/browser/ui/views/elevation_icon_setter.cc
index dbd09d2..6db19aa3 100644
--- a/chrome/browser/ui/views/elevation_icon_setter.cc
+++ b/chrome/browser/ui/views/elevation_icon_setter.cc
@@ -13,6 +13,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include <shellapi.h>
#include "base/win/win_util.h"
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h
index 28412d0..ed08871 100644
--- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h
+++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_WINDOW_TREE_HOST_WIN_H_
#include <shobjidl.h>
+
#include <wrl/client.h>
#include <memory>
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
index ee0139c..8ea692c 100644
--- a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
+++ b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <objbase.h>
+
#include <propkey.h>
#include <shellapi.h>
#include <shlobj.h>
diff --git a/chrome/browser/ui/views/status_icons/status_icon_win.h b/chrome/browser/ui/views/status_icons/status_icon_win.h
index 41dd15e..f8c60c8 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_win.h
+++ b/chrome/browser/ui/views/status_icons/status_icon_win.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_
#include <windows.h>
+
#include <shellapi.h>
#include <memory>
diff --git a/chrome/browser/ui/webui/settings/settings_utils_win.cc b/chrome/browser/ui/webui/settings/settings_utils_win.cc
index c39f0509..c40ca84 100644
--- a/chrome/browser/ui/webui/settings/settings_utils_win.cc
+++ b/chrome/browser/ui/webui/settings/settings_utils_win.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/webui/settings/settings_utils.h"
#include <windows.h>
+
#include <shellapi.h>
#include "base/functional/bind.h"
diff --git a/chrome/browser/win/automation_controller.h b/chrome/browser/win/automation_controller.h
index 38039ba..7939b83a 100644
--- a/chrome/browser/win/automation_controller.h
+++ b/chrome/browser/win/automation_controller.h
@@ -8,14 +8,14 @@
// Needed for <uiautomation.h>
#include <objbase.h>
-#include <uiautomation.h>
-
#include <memory>
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
+#include <uiautomation.h>
+
// This is a helper class to facilitate the usage of the UI Automation API in
// the Chrome codebase. It takes care of initializing the Automation context and
// registering the event handlers. It also takes care of cleaning up the
diff --git a/chrome/browser/win/chrome_process_finder.cc b/chrome/browser/win/chrome_process_finder.cc
index fb359043..f572b9d 100644
--- a/chrome/browser/win/chrome_process_finder.cc
+++ b/chrome/browser/win/chrome_process_finder.cc
@@ -4,9 +4,10 @@
#include "chrome/browser/win/chrome_process_finder.h"
-#include <shellapi.h>
#include <windows.h>
+#include <shellapi.h>
+
#include <string>
#include <string_view>
diff --git a/chrome/browser/win/jumplist_updater.cc b/chrome/browser/win/jumplist_updater.cc
index 0c705d0..d543802d 100644
--- a/chrome/browser/win/jumplist_updater.cc
+++ b/chrome/browser/win/jumplist_updater.cc
@@ -4,10 +4,12 @@
#include "chrome/browser/win/jumplist_updater.h"
-#include <windows.h>
#include <objbase.h>
-#include <propkey.h>
+
#include <shobjidl.h>
+#include <windows.h>
+
+#include <propkey.h>
#include "base/command_line.h"
#include "base/files/file_path.h"
diff --git a/chrome/browser/win/jumplist_updater.h b/chrome/browser/win/jumplist_updater.h
index fb8cebe8..b3e9095c 100644
--- a/chrome/browser/win/jumplist_updater.h
+++ b/chrome/browser/win/jumplist_updater.h
@@ -5,8 +5,9 @@
#ifndef CHROME_BROWSER_WIN_JUMPLIST_UPDATER_H_
#define CHROME_BROWSER_WIN_JUMPLIST_UPDATER_H_
-#include <windows.h>
#include <shobjidl.h>
+#include <windows.h>
+
#include <stddef.h>
#include <wrl/client.h>
diff --git a/chrome/browser/win/parental_controls.cc b/chrome/browser/win/parental_controls.cc
index 3ec0d8c..62fc50f 100644
--- a/chrome/browser/win/parental_controls.cc
+++ b/chrome/browser/win/parental_controls.cc
@@ -4,8 +4,9 @@
#include "chrome/browser/win/parental_controls.h"
-#include <combaseapi.h>
#include <windows.h>
+
+#include <combaseapi.h>
#include <winerror.h>
#include <wpcapi.h>
#include <wrl/client.h>
diff --git a/chrome/browser/win/ui_automation_util.h b/chrome/browser/win/ui_automation_util.h
index 9a295d27..dc6748e 100644
--- a/chrome/browser/win/ui_automation_util.h
+++ b/chrome/browser/win/ui_automation_util.h
@@ -12,11 +12,10 @@
// Must be before <uiautomation.h>
#include <objbase.h>
-#include <uiautomation.h>
-
#include <string>
#include <vector>
+#include <uiautomation.h>
// Returns a cached BSTR property of |element|.
std::wstring GetCachedBstrValue(IUIAutomationElement* element,
diff --git a/chrome/chrome_elf/chrome_elf_main.cc b/chrome/chrome_elf/chrome_elf_main.cc
index 7ccdb12..7cd0b68 100644
--- a/chrome/chrome_elf/chrome_elf_main.cc
+++ b/chrome/chrome_elf/chrome_elf_main.cc
@@ -4,9 +4,10 @@
#include "chrome/chrome_elf/chrome_elf_main.h"
-#include <assert.h>
#include <windows.h>
+#include <assert.h>
+
#include "chrome/chrome_elf/chrome_elf_security.h"
#include "chrome/chrome_elf/crash/crash_helper.h"
#include "chrome/chrome_elf/third_party_dlls/beacon.h"
diff --git a/chrome/chrome_elf/crash/crash_helper.cc b/chrome/chrome_elf/crash/crash_helper.cc
index 27a8037..30a2c1ad 100644
--- a/chrome/chrome_elf/crash/crash_helper.cc
+++ b/chrome/chrome_elf/crash/crash_helper.cc
@@ -4,9 +4,10 @@
#include "chrome/chrome_elf/crash/crash_helper.h"
-#include <assert.h>
#include <windows.h>
+#include <assert.h>
+
#include <algorithm>
#include <string>
#include <vector>
diff --git a/chrome/chrome_elf/hook_util/test/hook_util_test.cc b/chrome/chrome_elf/hook_util/test/hook_util_test.cc
index 348b90e9..0f4b12e 100644
--- a/chrome/chrome_elf/hook_util/test/hook_util_test.cc
+++ b/chrome/chrome_elf/hook_util/test/hook_util_test.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/chrome_elf/hook_util/hook_util.h"
+
#include <windows.h>
-#include "chrome/chrome_elf/hook_util/hook_util.h"
// Compile in this test DLL, so that it's in the IAT.
#include "chrome/chrome_elf/hook_util/test/hook_util_test_dll.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/chrome_elf/nt_registry/nt_registry.h b/chrome/chrome_elf/nt_registry/nt_registry.h
index 200175d..a91f6c89 100644
--- a/chrome/chrome_elf/nt_registry/nt_registry.h
+++ b/chrome/chrome_elf/nt_registry/nt_registry.h
@@ -25,6 +25,7 @@
#define CHROME_CHROME_ELF_NT_REGISTRY_NT_REGISTRY_H_
#include <windows.h>
+
#include <winternl.h> // NTSTATUS
#include <string>
diff --git a/chrome/chrome_elf/nt_registry/nt_registry_functions.h b/chrome/chrome_elf/nt_registry/nt_registry_functions.h
index 6dfb149d..fa2aae9 100644
--- a/chrome/chrome_elf/nt_registry/nt_registry_functions.h
+++ b/chrome/chrome_elf/nt_registry/nt_registry_functions.h
@@ -6,6 +6,7 @@
#define CHROME_CHROME_ELF_NT_REGISTRY_NT_REGISTRY_FUNCTIONS_H_
#include <windows.h>
+
#include <winternl.h>
typedef enum _KEY_VALUE_INFORMATION_CLASS {
diff --git a/chrome/chrome_elf/third_party_dlls/hook.cc b/chrome/chrome_elf/third_party_dlls/hook.cc
index c5e45d3..497e339 100644
--- a/chrome/chrome_elf/third_party_dlls/hook.cc
+++ b/chrome/chrome_elf/third_party_dlls/hook.cc
@@ -4,10 +4,6 @@
#include "chrome/chrome_elf/third_party_dlls/hook.h"
-#include <atomic>
-#include <limits>
-#include <string>
-
#include <windows.h>
#include <assert.h>
@@ -15,6 +11,10 @@
#include <psapi.h>
#include <winternl.h>
+#include <atomic>
+#include <limits>
+#include <string>
+
#include "base/compiler_specific.h"
#include "chrome/chrome_elf/crash/crash_helper.h"
#include "chrome/chrome_elf/hook_util/hook_util.h"
diff --git a/chrome/chrome_elf/third_party_dlls/main.cc b/chrome/chrome_elf/third_party_dlls/main.cc
index 2662c12..9ee0429 100644
--- a/chrome/chrome_elf/third_party_dlls/main.cc
+++ b/chrome/chrome_elf/third_party_dlls/main.cc
@@ -4,13 +4,12 @@
#include "chrome/chrome_elf/third_party_dlls/main.h"
-#include <limits>
-
#include <windows.h>
+#include <assert.h>
#include <versionhelpers.h>
-#include <assert.h>
+#include <limits>
#include "chrome/chrome_elf/nt_registry/nt_registry.h"
#include "chrome/chrome_elf/third_party_dlls/hook.h"
diff --git a/chrome/chrome_elf/third_party_dlls/main_unittest_exe.cc b/chrome/chrome_elf/third_party_dlls/main_unittest_exe.cc
index d837491..af8b3a2 100644
--- a/chrome/chrome_elf/third_party_dlls/main_unittest_exe.cc
+++ b/chrome/chrome_elf/third_party_dlls/main_unittest_exe.cc
@@ -1,10 +1,10 @@
// Copyright 2018 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <windows.h>
-
#include "chrome/chrome_elf/third_party_dlls/main_unittest_exe.h"
+#include <windows.h>
+
#include <shellapi.h>
#include <stdlib.h>
diff --git a/chrome/common/chrome_paths_win.cc b/chrome/common/chrome_paths_win.cc
index 33b8496..260df845 100644
--- a/chrome/common/chrome_paths_win.cc
+++ b/chrome/common/chrome_paths_win.cc
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/common/chrome_paths_internal.h"
-
+#include <shobjidl.h>
#include <windows.h>
+
#include <knownfolders.h>
#include <shellapi.h>
#include <shlobj.h>
-#include <shobjidl.h>
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/win/scoped_co_mem.h"
#include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_paths_internal.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/install_static/install_util.h"
#include "components/nacl/common/nacl_switches.h"
diff --git a/chrome/common/conflicts/module_watcher_win.cc b/chrome/common/conflicts/module_watcher_win.cc
index 832aba2..0610cd0 100644
--- a/chrome/common/conflicts/module_watcher_win.cc
+++ b/chrome/common/conflicts/module_watcher_win.cc
@@ -5,6 +5,7 @@
#include "chrome/common/conflicts/module_watcher_win.h"
#include <windows.h>
+
#include <tlhelp32.h>
#include <winternl.h> // For UNICODE_STRING.
diff --git a/chrome/common/conflicts/module_watcher_win_unittest.cc b/chrome/common/conflicts/module_watcher_win_unittest.cc
index 1391c4e..19434a5e 100644
--- a/chrome/common/conflicts/module_watcher_win_unittest.cc
+++ b/chrome/common/conflicts/module_watcher_win_unittest.cc
@@ -4,14 +4,14 @@
#include "chrome/common/conflicts/module_watcher_win.h"
+#include <windows.h>
+
#include <memory>
#include "base/functional/bind.h"
#include "base/test/task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include <windows.h>
-
class ModuleWatcherTest : public testing::Test {
public:
ModuleWatcherTest(const ModuleWatcherTest&) = delete;
diff --git a/chrome/common/safe_browsing/binary_feature_extractor_win.cc b/chrome/common/safe_browsing/binary_feature_extractor_win.cc
index 42817097..846dca6 100644
--- a/chrome/common/safe_browsing/binary_feature_extractor_win.cc
+++ b/chrome/common/safe_browsing/binary_feature_extractor_win.cc
@@ -5,6 +5,7 @@
#include "chrome/common/safe_browsing/binary_feature_extractor.h"
#include <windows.h>
+
#include <softpub.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/chrome/credential_provider/extension/app_inventory_manager_unittests.cc b/chrome/credential_provider/extension/app_inventory_manager_unittests.cc
index 77e0447..0e32ea9 100644
--- a/chrome/credential_provider/extension/app_inventory_manager_unittests.cc
+++ b/chrome/credential_provider/extension/app_inventory_manager_unittests.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/credential_provider/extension/app_inventory_manager.h"
+
#include <windows.h>
#include <memory>
@@ -13,7 +15,6 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_path_override.h"
-#include "chrome/credential_provider/extension/app_inventory_manager.h"
#include "chrome/credential_provider/extension/user_device_context.h"
#include "chrome/credential_provider/gaiacp/gcpw_strings.h"
#include "chrome/credential_provider/gaiacp/mdm_utils.h"
diff --git a/chrome/credential_provider/extension/service_unittests.cc b/chrome/credential_provider/extension/service_unittests.cc
index e338ae6..3721815 100644
--- a/chrome/credential_provider/extension/service_unittests.cc
+++ b/chrome/credential_provider/extension/service_unittests.cc
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/credential_provider/extension/service.h"
+
#include <windows.h>
#include "base/files/file_path.h"
#include "base/threading/thread.h"
#include "chrome/credential_provider/extension/scoped_handle.h"
-#include "chrome/credential_provider/extension/service.h"
#include "chrome/credential_provider/test/gcp_fakes.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/credential_provider/extension/task_manager_unittests.cc b/chrome/credential_provider/extension/task_manager_unittests.cc
index 3eecbfe..4bc6fe4f 100644
--- a/chrome/credential_provider/extension/task_manager_unittests.cc
+++ b/chrome/credential_provider/extension/task_manager_unittests.cc
@@ -2,10 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <memory>
+#include "chrome/credential_provider/extension/task_manager.h"
+
+#include <windows.h>
#include <atlcomcli.h>
-#include <windows.h>
+
+#include <memory>
#include "base/functional/bind.h"
#include "base/strings/string_number_conversions.h"
@@ -15,7 +18,6 @@
#include "base/uuid.h"
#include "chrome/credential_provider/extension/extension_utils.h"
#include "chrome/credential_provider/extension/task.h"
-#include "chrome/credential_provider/extension/task_manager.h"
#include "chrome/credential_provider/gaiacp/gcp_utils.h"
#include "chrome/credential_provider/gaiacp/reg_utils.h"
#include "chrome/credential_provider/test/gcp_fakes.h"
diff --git a/chrome/credential_provider/gaiacp/device_policies_manager_unittests.cc b/chrome/credential_provider/gaiacp/device_policies_manager_unittests.cc
index 8cc505e..be1874e 100644
--- a/chrome/credential_provider/gaiacp/device_policies_manager_unittests.cc
+++ b/chrome/credential_provider/gaiacp/device_policies_manager_unittests.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/credential_provider/gaiacp/device_policies_manager.h"
+
#include <windows.h>
#include "base/strings/strcat_win.h"
@@ -9,7 +11,6 @@
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/credential_provider/gaiacp/device_policies_manager.h"
#include "chrome/credential_provider/gaiacp/gcpw_strings.h"
#include "chrome/credential_provider/gaiacp/reg_utils.h"
#include "chrome/credential_provider/test/gls_runner_test_base.h"
diff --git a/chrome/credential_provider/gaiacp/event_logging_api_manager.h b/chrome/credential_provider/gaiacp/event_logging_api_manager.h
index 925bb6be..47e0e97 100644
--- a/chrome/credential_provider/gaiacp/event_logging_api_manager.h
+++ b/chrome/credential_provider/gaiacp/event_logging_api_manager.h
@@ -6,6 +6,7 @@
#define CHROME_CREDENTIAL_PROVIDER_GAIACP_EVENT_LOGGING_API_MANAGER_H_
#include <windows.h>
+
#include <winevt.h>
#include <string>
diff --git a/chrome/credential_provider/gaiacp/event_logs_upload_manager.cc b/chrome/credential_provider/gaiacp/event_logs_upload_manager.cc
index 0d717090..c7e8332 100644
--- a/chrome/credential_provider/gaiacp/event_logs_upload_manager.cc
+++ b/chrome/credential_provider/gaiacp/event_logs_upload_manager.cc
@@ -5,6 +5,7 @@
#include "chrome/credential_provider/gaiacp/event_logs_upload_manager.h"
#include <windows.h>
+
#include <winevt.h>
#include <memory>
diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc b/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc
index 1e8fbba..fec9278 100644
--- a/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc
+++ b/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/credential_provider/gaiacp/gaia_credential_base.h"
+
#include <windows.h>
#include <sddl.h> // For ConvertSidToStringSid()
@@ -28,7 +30,6 @@
#include "base/uuid.h"
#include "chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.h"
#include "chrome/credential_provider/common/gcp_strings.h"
-#include "chrome/credential_provider/gaiacp/gaia_credential_base.h"
#include "chrome/credential_provider/gaiacp/gaia_resources.h"
#include "chrome/credential_provider/gaiacp/gcpw_strings.h"
#include "chrome/credential_provider/gaiacp/mdm_utils.h"
diff --git a/chrome/credential_provider/gaiacp/gcp_utils.cc b/chrome/credential_provider/gaiacp/gcp_utils.cc
index 78b283c..f341b38 100644
--- a/chrome/credential_provider/gaiacp/gcp_utils.cc
+++ b/chrome/credential_provider/gaiacp/gcp_utils.cc
@@ -4,10 +4,11 @@
#include "chrome/credential_provider/gaiacp/gcp_utils.h"
-#include <iphlpapi.h>
-#include <wincred.h> // For <ntsecapi.h>
#include <windows.h>
#include <winsock2.h>
+
+#include <iphlpapi.h>
+#include <wincred.h> // For <ntsecapi.h>
#include <winternl.h>
#include <string>
diff --git a/chrome/credential_provider/gaiacp/gem_device_details_manager.cc b/chrome/credential_provider/gaiacp/gem_device_details_manager.cc
index f4bdcdb..a2d89f7 100644
--- a/chrome/credential_provider/gaiacp/gem_device_details_manager.cc
+++ b/chrome/credential_provider/gaiacp/gem_device_details_manager.cc
@@ -5,10 +5,10 @@
#include "chrome/credential_provider/gaiacp/gem_device_details_manager.h"
#include <windows.h>
-#include <winternl.h>
#include <lm.h> // Needed for LSA_UNICODE_STRING
#include <process.h>
+#include <winternl.h>
#define _NTDEF_ // Prevent redefition errors, must come after <winternl.h>
#include <ntsecapi.h> // For POLICY_ALL_ACCESS types
diff --git a/chrome/credential_provider/gaiacp/gem_device_details_manager_unittests.cc b/chrome/credential_provider/gaiacp/gem_device_details_manager_unittests.cc
index 49c5910..98171582 100644
--- a/chrome/credential_provider/gaiacp/gem_device_details_manager_unittests.cc
+++ b/chrome/credential_provider/gaiacp/gem_device_details_manager_unittests.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/credential_provider/gaiacp/gem_device_details_manager.h"
+
#include <windows.h>
#include "base/base_paths_win.h"
@@ -12,7 +14,6 @@
#include "base/test/scoped_path_override.h"
#include "chrome/credential_provider/extension/user_device_context.h"
#include "chrome/credential_provider/gaiacp/gcpw_strings.h"
-#include "chrome/credential_provider/gaiacp/gem_device_details_manager.h"
#include "chrome/credential_provider/gaiacp/mdm_utils.h"
#include "chrome/credential_provider/gaiacp/reg_utils.h"
#include "chrome/credential_provider/test/gls_runner_test_base.h"
diff --git a/chrome/credential_provider/gaiacp/mdm_utils.cc b/chrome/credential_provider/gaiacp/mdm_utils.cc
index 5589da3..d96d574 100644
--- a/chrome/credential_provider/gaiacp/mdm_utils.cc
+++ b/chrome/credential_provider/gaiacp/mdm_utils.cc
@@ -5,8 +5,9 @@
#include "chrome/credential_provider/gaiacp/mdm_utils.h"
#include <windows.h>
-#include <winternl.h>
+
#include <lm.h> // Needed for PNTSTATUS
+#include <winternl.h>
#define _NTDEF_ // Prevent redefition errors, must come after <winternl.h>
#include <MDMRegistration.h> // For RegisterDeviceWithManagement()
diff --git a/chrome/credential_provider/gaiacp/os_gaia_user_manager.cc b/chrome/credential_provider/gaiacp/os_gaia_user_manager.cc
index 332170e..e6ef459 100644
--- a/chrome/credential_provider/gaiacp/os_gaia_user_manager.cc
+++ b/chrome/credential_provider/gaiacp/os_gaia_user_manager.cc
@@ -4,9 +4,10 @@
#include "chrome/credential_provider/gaiacp/os_gaia_user_manager.h"
+#include <windows.h>
+
#include <lm.h> // Needed for PNTSTATUS
#include <ntstatus.h>
-#include <windows.h>
#include <winternl.h>
#define _NTDEF_ // Prevent redefition errors, must come after <winternl.h>
diff --git a/chrome/credential_provider/gaiacp/password_recovery_manager.cc b/chrome/credential_provider/gaiacp/password_recovery_manager.cc
index ff6c760..b685c01 100644
--- a/chrome/credential_provider/gaiacp/password_recovery_manager.cc
+++ b/chrome/credential_provider/gaiacp/password_recovery_manager.cc
@@ -5,10 +5,10 @@
#include "chrome/credential_provider/gaiacp/password_recovery_manager.h"
#include <windows.h>
-#include <winternl.h>
#include <lm.h> // Needed for LSA_UNICODE_STRING
#include <process.h>
+#include <winternl.h>
#define _NTDEF_ // Prevent redefition errors, must come after <winternl.h>
#include <ntsecapi.h> // For POLICY_ALL_ACCESS types
diff --git a/chrome/credential_provider/gaiacp/reauth_credential_unittests.cc b/chrome/credential_provider/gaiacp/reauth_credential_unittests.cc
index 916625d..497cd59 100644
--- a/chrome/credential_provider/gaiacp/reauth_credential_unittests.cc
+++ b/chrome/credential_provider/gaiacp/reauth_credential_unittests.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/win/atl.h"
+#include "chrome/credential_provider/gaiacp/reauth_credential.h"
#include <wrl/client.h>
@@ -12,6 +12,7 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_reg_util_win.h"
+#include "base/win/atl.h"
#include "chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/credential_provider/common/gcp_strings.h"
@@ -20,7 +21,6 @@
#include "chrome/credential_provider/gaiacp/gcp_utils.h"
#include "chrome/credential_provider/gaiacp/gcpw_strings.h"
#include "chrome/credential_provider/gaiacp/mdm_utils.h"
-#include "chrome/credential_provider/gaiacp/reauth_credential.h"
#include "chrome/credential_provider/gaiacp/reg_utils.h"
#include "chrome/credential_provider/test/com_fakes.h"
#include "chrome/credential_provider/test/gcp_fakes.h"
diff --git a/chrome/credential_provider/gaiacp/scoped_handle.h b/chrome/credential_provider/gaiacp/scoped_handle.h
index 5c063e82..0caab2c0 100644
--- a/chrome/credential_provider/gaiacp/scoped_handle.h
+++ b/chrome/credential_provider/gaiacp/scoped_handle.h
@@ -6,6 +6,7 @@
#define CHROME_CREDENTIAL_PROVIDER_GAIACP_SCOPED_HANDLE_H_
#include <windows.h>
+
#include <winhttp.h>
#include "base/win/scoped_handle.h"
diff --git a/chrome/credential_provider/gaiacp/stdafx.h b/chrome/credential_provider/gaiacp/stdafx.h
index d718c89..254b71c 100644
--- a/chrome/credential_provider/gaiacp/stdafx.h
+++ b/chrome/credential_provider/gaiacp/stdafx.h
@@ -8,10 +8,10 @@
// Include common system include files.
#include <windows.h>
-#include <winternl.h>
#include <wincred.h>
#include <wincrypt.h>
+#include <winternl.h>
#define _NTDEF_ // Prevent redefition errors, must come after <winternl.h>
#include <Shellapi.h> // For CommandLineToArgvW()
diff --git a/chrome/credential_provider/gaiacp/user_policies_manager_unittests.cc b/chrome/credential_provider/gaiacp/user_policies_manager_unittests.cc
index 36b2152..1efbaa9 100644
--- a/chrome/credential_provider/gaiacp/user_policies_manager_unittests.cc
+++ b/chrome/credential_provider/gaiacp/user_policies_manager_unittests.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/credential_provider/gaiacp/user_policies_manager.h"
+
#include <windows.h>
#include "base/base_paths_win.h"
@@ -13,7 +15,6 @@
#include "chrome/credential_provider/extension/user_device_context.h"
#include "chrome/credential_provider/gaiacp/gcpw_strings.h"
#include "chrome/credential_provider/gaiacp/reg_utils.h"
-#include "chrome/credential_provider/gaiacp/user_policies_manager.h"
#include "chrome/credential_provider/test/gls_runner_test_base.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/credential_provider/setup/setup.cc b/chrome/credential_provider/setup/setup.cc
index 920038d..b4a2296 100644
--- a/chrome/credential_provider/setup/setup.cc
+++ b/chrome/credential_provider/setup/setup.cc
@@ -6,12 +6,12 @@
// that the app can be made entireless silent, as required by omaha.
#include <Windows.h>
-#include <shlobj.h> // Needed for IsUserAnAdmin()
+#include <shlobj.h> // Needed for IsUserAnAdmin()
#include <stdlib.h>
-#include <string>
#include <algorithm>
+#include <string>
#include "base/at_exit.h"
#include "base/command_line.h"
diff --git a/chrome/credential_provider/test/gcp_fakes.cc b/chrome/credential_provider/test/gcp_fakes.cc
index 782861c..aa35479e 100644
--- a/chrome/credential_provider/test/gcp_fakes.cc
+++ b/chrome/credential_provider/test/gcp_fakes.cc
@@ -6,15 +6,14 @@
#include <windows.h>
+#include <atlcomcli.h>
+#include <atlconv.h>
#include <lm.h>
#include <ntsecapi.h>
#include <ntstatus.h>
#include <process.h>
#include <sddl.h>
-#include <atlcomcli.h>
-#include <atlconv.h>
-
#include <string>
#include "base/command_line.h"
diff --git a/chrome/elevation_service/elevated_recovery_impl.cc b/chrome/elevation_service/elevated_recovery_impl.cc
index a248eb3..52a55cc 100644
--- a/chrome/elevation_service/elevated_recovery_impl.cc
+++ b/chrome/elevation_service/elevated_recovery_impl.cc
@@ -5,6 +5,7 @@
#include "chrome/elevation_service/elevated_recovery_impl.h"
#include <objbase.h>
+
#include <string>
#include <utility>
diff --git a/chrome/elevation_service/elevated_recovery_unittest.cc b/chrome/elevation_service/elevated_recovery_unittest.cc
index 1b602816..09fd957 100644
--- a/chrome/elevation_service/elevated_recovery_unittest.cc
+++ b/chrome/elevation_service/elevated_recovery_unittest.cc
@@ -2,9 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/elevation_service/elevated_recovery_impl.h"
-
#include <windows.h>
+
#include <wrl/implements.h>
#include <memory>
@@ -16,6 +15,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
#include "base/win/scoped_com_initializer.h"
+#include "chrome/elevation_service/elevated_recovery_impl.h"
#include "chrome/elevation_service/scoped_mock_context.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/elevation_service/elevator.h b/chrome/elevation_service/elevator.h
index d8d12ce..b60fb754 100644
--- a/chrome/elevation_service/elevator.h
+++ b/chrome/elevation_service/elevator.h
@@ -5,13 +5,13 @@
#ifndef CHROME_ELEVATION_SERVICE_ELEVATOR_H_
#define CHROME_ELEVATION_SERVICE_ELEVATOR_H_
-#include <string>
-
#include <windows.h>
#include <wrl/implements.h>
#include <wrl/module.h>
+#include <string>
+
#include "base/gtest_prod_util.h"
#include "base/win/windows_types.h"
#include "chrome/elevation_service/elevation_service_idl.h"
diff --git a/chrome/elevation_service/scoped_mock_context.cc b/chrome/elevation_service/scoped_mock_context.cc
index d76f2a64..b032e07 100644
--- a/chrome/elevation_service/scoped_mock_context.cc
+++ b/chrome/elevation_service/scoped_mock_context.cc
@@ -5,8 +5,10 @@
#include "chrome/elevation_service/scoped_mock_context.h"
#include <objbase.h>
-#include <objidl.h>
+
#include <unknwn.h>
+
+#include <objidl.h>
#include <wrl/implements.h>
#include "base/win/com_init_util.h"
diff --git a/chrome/elevation_service/scoped_mock_context.h b/chrome/elevation_service/scoped_mock_context.h
index cadf034..d79e3fd 100644
--- a/chrome/elevation_service/scoped_mock_context.h
+++ b/chrome/elevation_service/scoped_mock_context.h
@@ -6,6 +6,7 @@
#define CHROME_ELEVATION_SERVICE_SCOPED_MOCK_CONTEXT_H_
#include <unknwn.h>
+
#include <wrl/client.h>
#include "base/memory/raw_ptr_exclusion.h"
diff --git a/chrome/elevation_service/service_main.h b/chrome/elevation_service/service_main.h
index 27f962e..a1ca2c7f 100644
--- a/chrome/elevation_service/service_main.h
+++ b/chrome/elevation_service/service_main.h
@@ -6,6 +6,7 @@
#define CHROME_ELEVATION_SERVICE_SERVICE_MAIN_H_
#include <windows.h>
+
#include <wrl/implements.h>
#include "base/no_destructor.h"
diff --git a/chrome/install_static/install_constants.h b/chrome/install_static/install_constants.h
index dd5a861..1a69e17 100644
--- a/chrome/install_static/install_constants.h
+++ b/chrome/install_static/install_constants.h
@@ -9,9 +9,10 @@
#ifndef CHROME_INSTALL_STATIC_INSTALL_CONSTANTS_H_
#define CHROME_INSTALL_STATIC_INSTALL_CONSTANTS_H_
-#include <stdint.h>
#include <windows.h>
+#include <stdint.h>
+
#include "chrome/install_static/buildflags.h"
namespace install_static {
diff --git a/chrome/install_static/install_util.cc b/chrome/install_static/install_util.cc
index 0ddd804d..6d9d2cb 100644
--- a/chrome/install_static/install_util.cc
+++ b/chrome/install_static/install_util.cc
@@ -4,10 +4,11 @@
#include "chrome/install_static/install_util.h"
+#include <windows.h>
+
#include <assert.h>
#include <stdlib.h>
#include <string.h>
-#include <windows.h>
#include <algorithm>
#include <limits>
diff --git a/chrome/install_static/user_data_dir.cc b/chrome/install_static/user_data_dir.cc
index 1d15b57..5a12727 100644
--- a/chrome/install_static/user_data_dir.cc
+++ b/chrome/install_static/user_data_dir.cc
@@ -4,9 +4,10 @@
#include "chrome/install_static/user_data_dir.h"
-#include <assert.h>
#include <windows.h>
+#include <assert.h>
+
#include "chrome/chrome_elf/nt_registry/nt_registry.h"
#include "chrome/install_static/install_details.h"
#include "chrome/install_static/install_util.h"
diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc
index e776cd9..1daa771 100644
--- a/chrome/installer/gcapi/gcapi.cc
+++ b/chrome/installer/gcapi/gcapi.cc
@@ -12,7 +12,6 @@
#include <windows.h>
-// Must be after windows.h.
#include <versionhelpers.h>
#include <sddl.h>
@@ -21,6 +20,7 @@
#include <string.h>
#define STRSAFE_NO_DEPRECATE
#include <objbase.h>
+
#include <strsafe.h>
#include <tlhelp32.h>
#include <wrl/client.h>
diff --git a/chrome/installer/mini_installer/configuration.cc b/chrome/installer/mini_installer/configuration.cc
index d32618c4..f80ff1cd 100644
--- a/chrome/installer/mini_installer/configuration.cc
+++ b/chrome/installer/mini_installer/configuration.cc
@@ -4,10 +4,11 @@
#include "chrome/installer/mini_installer/configuration.h"
+#include <windows.h>
+
#include <shellapi.h> // NOLINT
#include <stddef.h>
#include <stdlib.h>
-#include <windows.h>
#include "build/branding_buildflags.h"
#include "chrome/installer/mini_installer/appid.h"
diff --git a/chrome/installer/mini_installer/decompress_test.cc b/chrome/installer/mini_installer/decompress_test.cc
index 129141a7..efe4d13 100644
--- a/chrome/installer/mini_installer/decompress_test.cc
+++ b/chrome/installer/mini_installer/decompress_test.cc
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/installer/mini_installer/decompress.h"
+
#include <windows.h>
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
-#include "chrome/installer/mini_installer/decompress.h"
#include "testing/gtest/include/gtest/gtest.h"
TEST(MiniDecompressTest, ExpandTest) {
diff --git a/chrome/installer/mini_installer/delete_with_retry.cc b/chrome/installer/mini_installer/delete_with_retry.cc
index ac3cec98..afd5431 100644
--- a/chrome/installer/mini_installer/delete_with_retry.cc
+++ b/chrome/installer/mini_installer/delete_with_retry.cc
@@ -4,10 +4,10 @@
#include "chrome/installer/mini_installer/delete_with_retry.h"
-#include <utility>
-
#include <windows.h>
+#include <utility>
+
namespace mini_installer {
namespace {
diff --git a/chrome/installer/mini_installer/mini_string_test.cc b/chrome/installer/mini_installer/mini_string_test.cc
index 0582532..9ba9e8c4 100644
--- a/chrome/installer/mini_installer/mini_string_test.cc
+++ b/chrome/installer/mini_installer/mini_string_test.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/installer/mini_installer/mini_string.h"
+
#include <windows.h>
#include <stddef.h>
@@ -9,7 +11,6 @@
#include <string>
-#include "chrome/installer/mini_installer/mini_string.h"
#include "testing/gtest/include/gtest/gtest.h"
using mini_installer::StackString;
diff --git a/chrome/installer/mini_installer/write_to_disk.cc b/chrome/installer/mini_installer/write_to_disk.cc
index 65d56bb..5c7ea39 100644
--- a/chrome/installer/mini_installer/write_to_disk.cc
+++ b/chrome/installer/mini_installer/write_to_disk.cc
@@ -4,9 +4,10 @@
#include "chrome/installer/mini_installer/write_to_disk.h"
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include <algorithm>
#include "chrome/installer/mini_installer/memory_range.h"
diff --git a/chrome/installer/mini_installer/write_to_disk_unittest.cc b/chrome/installer/mini_installer/write_to_disk_unittest.cc
index 892d533..2602fca 100644
--- a/chrome/installer/mini_installer/write_to_disk_unittest.cc
+++ b/chrome/installer/mini_installer/write_to_disk_unittest.cc
@@ -4,9 +4,10 @@
#include "chrome/installer/mini_installer/write_to_disk.h"
-#include <string.h>
#include <windows.h>
+#include <string.h>
+
#include <algorithm>
#include <iterator>
#include <string>
diff --git a/chrome/installer/setup/google_chrome_behaviors.cc b/chrome/installer/setup/google_chrome_behaviors.cc
index 5cd74590..8c8e253e 100644
--- a/chrome/installer/setup/google_chrome_behaviors.cc
+++ b/chrome/installer/setup/google_chrome_behaviors.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/installer/setup/brand_behaviors.h"
-
#include <windows.h>
#include <shellapi.h>
@@ -24,6 +22,7 @@
#include "base/win/wmi.h"
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/install_static/install_util.h"
+#include "chrome/installer/setup/brand_behaviors.h"
#include "chrome/installer/util/google_update_constants.h"
#include "chrome/installer/util/google_update_settings.h"
#include "chrome/installer/util/install_util.h"
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index ef96559..8cd353e 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -7,12 +7,13 @@
#include "chrome/installer/setup/install_worker.h"
+#include <windows.h>
+
#include <oaidl.h>
#include <shlobj.h>
#include <stddef.h>
#include <stdint.h>
#include <time.h>
-#include <windows.h>
#include <wrl/client.h>
#include <memory>
diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
index a191dea..b9471ce 100644
--- a/chrome/installer/setup/setup_util.cc
+++ b/chrome/installer/setup/setup_util.cc
@@ -7,8 +7,10 @@
#include "chrome/installer/setup/setup_util.h"
#include <objbase.h>
-#include <stddef.h>
+
#include <windows.h>
+
+#include <stddef.h>
#include <wtsapi32.h>
#include <initializer_list>
diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc
index 9693dd7..dbc9233 100644
--- a/chrome/installer/setup/setup_util_unittest.cc
+++ b/chrome/installer/setup/setup_util_unittest.cc
@@ -4,9 +4,10 @@
#include "chrome/installer/setup/setup_util_unittest.h"
-#include <shlobj.h>
#include <windows.h>
+#include <shlobj.h>
+
#include <ios>
#include <memory>
#include <string>
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 3d1eb2de..7be7f1fe 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -6,9 +6,10 @@
#include "chrome/installer/setup/uninstall.h"
+#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
-#include <windows.h>
#include <initializer_list>
#include <memory>
diff --git a/chrome/installer/util/advanced_firewall_manager_win.cc b/chrome/installer/util/advanced_firewall_manager_win.cc
index d0a69707..1b6722a1 100644
--- a/chrome/installer/util/advanced_firewall_manager_win.cc
+++ b/chrome/installer/util/advanced_firewall_manager_win.cc
@@ -5,6 +5,7 @@
#include "chrome/installer/util/advanced_firewall_manager_win.h"
#include <objbase.h>
+
#include <stddef.h>
#include "base/logging.h"
diff --git a/chrome/installer/util/delete_after_reboot_helper.h b/chrome/installer/util/delete_after_reboot_helper.h
index 50cb87b..a02e251 100644
--- a/chrome/installer/util/delete_after_reboot_helper.h
+++ b/chrome/installer/util/delete_after_reboot_helper.h
@@ -8,13 +8,13 @@
#ifndef CHROME_INSTALLER_UTIL_DELETE_AFTER_REBOOT_HELPER_H_
#define CHROME_INSTALLER_UTIL_DELETE_AFTER_REBOOT_HELPER_H_
-#include <string>
-#include <vector>
-
#include <windows.h>
#include <stddef.h>
+#include <string>
+#include <vector>
+
namespace base {
class FilePath;
}
diff --git a/chrome/installer/util/delete_reg_key_work_item_unittest.cc b/chrome/installer/util/delete_reg_key_work_item_unittest.cc
index 609131a..63d3e41 100644
--- a/chrome/installer/util/delete_reg_key_work_item_unittest.cc
+++ b/chrome/installer/util/delete_reg_key_work_item_unittest.cc
@@ -4,9 +4,10 @@
#include "chrome/installer/util/delete_reg_key_work_item.h"
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include <memory>
#include "base/logging.h"
diff --git a/chrome/installer/util/duplicate_tree_detector_unittest.cc b/chrome/installer/util/duplicate_tree_detector_unittest.cc
index 54ac07a6..0ea2fbb 100644
--- a/chrome/installer/util/duplicate_tree_detector_unittest.cc
+++ b/chrome/installer/util/duplicate_tree_detector_unittest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/installer/util/duplicate_tree_detector.h"
+
#include <windows.h>
#include <fstream>
@@ -10,7 +12,6 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/strings/string_util.h"
-#include "chrome/installer/util/duplicate_tree_detector.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
diff --git a/chrome/installer/util/google_update_settings_unittest.cc b/chrome/installer/util/google_update_settings_unittest.cc
index e61f381..a8e773c 100644
--- a/chrome/installer/util/google_update_settings_unittest.cc
+++ b/chrome/installer/util/google_update_settings_unittest.cc
@@ -4,9 +4,10 @@
#include "chrome/installer/util/google_update_settings.h"
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include <memory>
#include <string_view>
diff --git a/chrome/installer/util/logging_installer.cc b/chrome/installer/util/logging_installer.cc
index e9ca6b7..b01b925 100644
--- a/chrome/installer/util/logging_installer.cc
+++ b/chrome/installer/util/logging_installer.cc
@@ -4,9 +4,10 @@
#include "chrome/installer/util/logging_installer.h"
-#include <stdint.h>
#include <windows.h>
+#include <stdint.h>
+
#include <tuple>
#include "base/command_line.h"
diff --git a/chrome/installer/util/lzma_util.cc b/chrome/installer/util/lzma_util.cc
index 23a7ec0d..eeb964b 100644
--- a/chrome/installer/util/lzma_util.cc
+++ b/chrome/installer/util/lzma_util.cc
@@ -4,9 +4,9 @@
#include "chrome/installer/util/lzma_util.h"
-#include <ntstatus.h>
#include <windows.h>
+#include <ntstatus.h>
#include <stddef.h>
#include <set>
diff --git a/chrome/installer/util/registry_util.cc b/chrome/installer/util/registry_util.cc
index 73e07ac..868c82a 100644
--- a/chrome/installer/util/registry_util.cc
+++ b/chrome/installer/util/registry_util.cc
@@ -5,6 +5,7 @@
#include "chrome/installer/util/registry_util.h"
#include <windows.h>
+
#include <string>
#include "base/command_line.h"
diff --git a/chrome/installer/util/self_cleaning_temp_dir_unittest.cc b/chrome/installer/util/self_cleaning_temp_dir_unittest.cc
index 9f83c51..db3d7fa 100644
--- a/chrome/installer/util/self_cleaning_temp_dir_unittest.cc
+++ b/chrome/installer/util/self_cleaning_temp_dir_unittest.cc
@@ -5,6 +5,7 @@
#include "chrome/installer/util/self_cleaning_temp_dir.h"
#include <windows.h>
+
#include <stdint.h>
#include <wincrypt.h>
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 746a1d8f..44aa164a 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -10,9 +10,11 @@
#include "chrome/installer/util/shell_util.h"
#include <objbase.h>
+
+#include <shobjidl.h>
+
#include <shellapi.h>
#include <shlobj.h>
-#include <shobjidl.h>
#include <wrl/client.h>
#include <algorithm>
diff --git a/chrome/installer/util/shell_util.h b/chrome/installer/util/shell_util.h
index f737e57..5a9714c 100644
--- a/chrome/installer/util/shell_util.h
+++ b/chrome/installer/util/shell_util.h
@@ -9,9 +9,10 @@
#ifndef CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
#define CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
+#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
-#include <windows.h>
#include <map>
#include <memory>
diff --git a/chrome/installer/util/taskbar_util.cc b/chrome/installer/util/taskbar_util.cc
index 4dff4fb..b44e60f 100644
--- a/chrome/installer/util/taskbar_util.cc
+++ b/chrome/installer/util/taskbar_util.cc
@@ -5,6 +5,7 @@
#include "chrome/installer/util/taskbar_util.h"
#include <objbase.h>
+
#include <shellapi.h>
#include <shlobj.h>
#include <wrl/client.h>
diff --git a/chrome/services/util_win/av_products.cc b/chrome/services/util_win/av_products.cc
index 76b7176ec..c3d81e0 100644
--- a/chrome/services/util_win/av_products.cc
+++ b/chrome/services/util_win/av_products.cc
@@ -4,10 +4,12 @@
#include "chrome/services/util_win/av_products.h"
-#include <iwscapi.h>
#include <objbase.h>
-#include <stddef.h>
+
#include <windows.h>
+
+#include <iwscapi.h>
+#include <stddef.h>
#include <wrl/client.h>
#include <wscapi.h>
diff --git a/chrome/services/util_win/processor_metrics.cc b/chrome/services/util_win/processor_metrics.cc
index 29c5bb2d..37ab0ee 100644
--- a/chrome/services/util_win/processor_metrics.cc
+++ b/chrome/services/util_win/processor_metrics.cc
@@ -5,6 +5,7 @@
#include "chrome/services/util_win/processor_metrics.h"
#include <objbase.h>
+
#include <sysinfoapi.h>
#include <wbemidl.h>
#include <winbase.h>
diff --git a/chrome/services/util_win/util_win_impl.cc b/chrome/services/util_win/util_win_impl.cc
index ed26acee..b4ccc91 100644
--- a/chrome/services/util_win/util_win_impl.cc
+++ b/chrome/services/util_win/util_win_impl.cc
@@ -5,6 +5,7 @@
#include "chrome/services/util_win/util_win_impl.h"
#include <objbase.h>
+
#include <shldisp.h>
#include <wrl/client.h>
diff --git a/chrome/test/base/window_contents_as_string_win.cc b/chrome/test/base/window_contents_as_string_win.cc
index 6b3a863..100d49f 100644
--- a/chrome/test/base/window_contents_as_string_win.cc
+++ b/chrome/test/base/window_contents_as_string_win.cc
@@ -7,7 +7,6 @@
// Needed for <uiautomation.h>
#include <objbase.h>
-#include <uiautomation.h>
#include <wrl/client.h>
#include <utility>
@@ -17,6 +16,8 @@
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_variant.h"
+#include <uiautomation.h>
+
namespace {
// IDs corresponding to the properties read by CachedElementContentsAsString.
diff --git a/chrome/test/chromedriver/devtools_client_impl_integrationtest.cc b/chrome/test/chromedriver/devtools_client_impl_integrationtest.cc
index 97cd242..34687f43 100644
--- a/chrome/test/chromedriver/devtools_client_impl_integrationtest.cc
+++ b/chrome/test/chromedriver/devtools_client_impl_integrationtest.cc
@@ -9,8 +9,9 @@
#include "base/compiler_specific.h"
#if BUILDFLAG(IS_WIN)
-#include <fcntl.h>
#include <windows.h>
+
+#include <fcntl.h>
#endif
#include "base/command_line.h"
diff --git a/chrome/test/chromedriver/navigation_tracker_integrationtest.cc b/chrome/test/chromedriver/navigation_tracker_integrationtest.cc
index 44fdf97..ad6b94c4 100644
--- a/chrome/test/chromedriver/navigation_tracker_integrationtest.cc
+++ b/chrome/test/chromedriver/navigation_tracker_integrationtest.cc
@@ -9,8 +9,9 @@
#include "base/compiler_specific.h"
#if BUILDFLAG(IS_WIN)
-#include <fcntl.h>
#include <windows.h>
+
+#include <fcntl.h>
#endif
#include <optional>
diff --git a/chrome/test/chromedriver/net/pipe_builder.cc b/chrome/test/chromedriver/net/pipe_builder.cc
index eeda7ba..bf34b51 100644
--- a/chrome/test/chromedriver/net/pipe_builder.cc
+++ b/chrome/test/chromedriver/net/pipe_builder.cc
@@ -20,6 +20,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/win/win_util.h"
#endif
diff --git a/chrome/test/chromedriver/net/pipe_builder_unittest.cc b/chrome/test/chromedriver/net/pipe_builder_unittest.cc
index 3049e60..64177fd 100644
--- a/chrome/test/chromedriver/net/pipe_builder_unittest.cc
+++ b/chrome/test/chromedriver/net/pipe_builder_unittest.cc
@@ -9,8 +9,9 @@
#include "base/compiler_specific.h"
#if BUILDFLAG(IS_WIN)
-#include <fcntl.h>
#include <windows.h>
+
+#include <fcntl.h>
#endif
#include "base/command_line.h"
diff --git a/chrome/test/chromedriver/net/pipe_connection_win.cc b/chrome/test/chromedriver/net/pipe_connection_win.cc
index 0c7179c..af752f2 100644
--- a/chrome/test/chromedriver/net/pipe_connection_win.cc
+++ b/chrome/test/chromedriver/net/pipe_connection_win.cc
@@ -4,9 +4,10 @@
#include "chrome/test/chromedriver/net/pipe_connection_win.h"
+#include <windows.h>
+
#include <io.h>
#include <stdlib.h>
-#include <windows.h>
#include <list>
#include <memory>
diff --git a/chrome/updater/app/server/win/com_classes.h b/chrome/updater/app/server/win/com_classes.h
index 0efd1e8..8b03b515 100644
--- a/chrome/updater/app/server/win/com_classes.h
+++ b/chrome/updater/app/server/win/com_classes.h
@@ -6,6 +6,7 @@
#define CHROME_UPDATER_APP_SERVER_WIN_COM_CLASSES_H_
#include <windows.h>
+
#include <wrl/implements.h>
#include <string>
diff --git a/chrome/updater/app/server/win/com_classes_legacy.cc b/chrome/updater/app/server/win/com_classes_legacy.cc
index 92b7a41..6318a8c0 100644
--- a/chrome/updater/app/server/win/com_classes_legacy.cc
+++ b/chrome/updater/app/server/win/com_classes_legacy.cc
@@ -4,9 +4,10 @@
#include "chrome/updater/app/server/win/com_classes_legacy.h"
+#include <windows.h>
+
#include <oleauto.h>
#include <shellapi.h>
-#include <windows.h>
#include <wrl/client.h>
#include <optional>
diff --git a/chrome/updater/app/server/win/com_classes_legacy.h b/chrome/updater/app/server/win/com_classes_legacy.h
index 3f2c662..8c44212 100644
--- a/chrome/updater/app/server/win/com_classes_legacy.h
+++ b/chrome/updater/app/server/win/com_classes_legacy.h
@@ -6,6 +6,7 @@
#define CHROME_UPDATER_APP_SERVER_WIN_COM_CLASSES_LEGACY_H_
#include <windows.h>
+
#include <wrl/implements.h>
#include <optional>
diff --git a/chrome/updater/app/server/win/com_classes_legacy_unittest.cc b/chrome/updater/app/server/win/com_classes_legacy_unittest.cc
index 38e1fdf..f0e5dd3 100644
--- a/chrome/updater/app/server/win/com_classes_legacy_unittest.cc
+++ b/chrome/updater/app/server/win/com_classes_legacy_unittest.cc
@@ -4,8 +4,9 @@
#include "chrome/updater/app/server/win/com_classes_legacy.h"
-#include <shellapi.h>
#include <windows.h>
+
+#include <shellapi.h>
#include <wrl/client.h>
#include <string>
diff --git a/chrome/updater/ipc/update_service_internal_proxy_win.cc b/chrome/updater/ipc/update_service_internal_proxy_win.cc
index 936b8f5..449536b3 100644
--- a/chrome/updater/ipc/update_service_internal_proxy_win.cc
+++ b/chrome/updater/ipc/update_service_internal_proxy_win.cc
@@ -5,6 +5,7 @@
#include "chrome/updater/ipc/update_service_internal_proxy_win.h"
#include <windows.h>
+
#include <wrl/client.h>
#include <wrl/implements.h>
diff --git a/chrome/updater/ipc/update_service_proxy_win.cc b/chrome/updater/ipc/update_service_proxy_win.cc
index 7ba18e3..e14af3b 100644
--- a/chrome/updater/ipc/update_service_proxy_win.cc
+++ b/chrome/updater/ipc/update_service_proxy_win.cc
@@ -5,6 +5,7 @@
#include "chrome/updater/ipc/update_service_proxy_win.h"
#include <windows.h>
+
#include <wrl/client.h>
#include <wrl/implements.h>
diff --git a/chrome/updater/util/win_util.cc b/chrome/updater/util/win_util.cc
index f4735f05..a4dee5d 100644
--- a/chrome/updater/util/win_util.cc
+++ b/chrome/updater/util/win_util.cc
@@ -4,13 +4,14 @@
#include "chrome/updater/util/win_util.h"
+#include <windows.h>
+
#include <aclapi.h>
#include <combaseapi.h>
#include <objidl.h>
#include <regstr.h>
#include <shellapi.h>
#include <shlobj.h>
-#include <windows.h>
#include <winhttp.h>
#include <wrl/client.h>
#include <wtsapi32.h>
diff --git a/chrome/updater/util/win_util.h b/chrome/updater/util/win_util.h
index 638d7280..c6952eb 100644
--- a/chrome/updater/util/win_util.h
+++ b/chrome/updater/util/win_util.h
@@ -6,6 +6,7 @@
#define CHROME_UPDATER_UTIL_WIN_UTIL_H_
#include <windows.h>
+
#include <wrl/client.h>
#include <wrl/implements.h>
diff --git a/chrome/updater/util/win_util_unittest.cc b/chrome/updater/util/win_util_unittest.cc
index 189c5e07..7d32526c 100644
--- a/chrome/updater/util/win_util_unittest.cc
+++ b/chrome/updater/util/win_util_unittest.cc
@@ -5,10 +5,12 @@
#include "chrome/updater/util/win_util.h"
#include <objbase.h>
+
+#include <windows.h>
+
#include <regstr.h>
#include <shellapi.h>
#include <shlobj.h>
-#include <windows.h>
#include <optional>
#include <string>
diff --git a/chrome/updater/win/app_command_runner.cc b/chrome/updater/win/app_command_runner.cc
index 2e89a4c6..c45592c0 100644
--- a/chrome/updater/win/app_command_runner.cc
+++ b/chrome/updater/win/app_command_runner.cc
@@ -4,9 +4,10 @@
#include "chrome/updater/win/app_command_runner.h"
-#include <shellapi.h>
#include <windows.h>
+#include <shellapi.h>
+
#include <optional>
#include <string>
#include <utility>
diff --git a/chrome/updater/win/app_command_runner_unittest.cc b/chrome/updater/win/app_command_runner_unittest.cc
index 257f5f1..416ea33 100644
--- a/chrome/updater/win/app_command_runner_unittest.cc
+++ b/chrome/updater/win/app_command_runner_unittest.cc
@@ -4,9 +4,10 @@
#include "chrome/updater/win/app_command_runner.h"
+#include <windows.h>
+
#include <shellapi.h>
#include <shlobj.h>
-#include <windows.h>
#include <array>
#include <optional>
diff --git a/chrome/updater/win/installer/installer_main.cc b/chrome/updater/win/installer/installer_main.cc
index 40b74df..c0975640 100644
--- a/chrome/updater/win/installer/installer_main.cc
+++ b/chrome/updater/win/installer/installer_main.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <wchar.h>
#include <windows.h>
+#include <wchar.h>
+
#include <string>
#include "base/at_exit.h"
diff --git a/chrome/updater/win/installer/msi_custom_action.cc b/chrome/updater/win/installer/msi_custom_action.cc
index 14f52e02..b8916060 100644
--- a/chrome/updater/win/installer/msi_custom_action.cc
+++ b/chrome/updater/win/installer/msi_custom_action.cc
@@ -4,9 +4,10 @@
#include "chrome/updater/win/installer/msi_custom_action.h"
+#include <windows.h>
+
#include <msi.h>
#include <msiquery.h>
-#include <windows.h>
#include <optional>
#include <string>
diff --git a/chrome/updater/win/installer/pe_resource.h b/chrome/updater/win/installer/pe_resource.h
index 81b5616..1ca9939 100644
--- a/chrome/updater/win/installer/pe_resource.h
+++ b/chrome/updater/win/installer/pe_resource.h
@@ -5,9 +5,10 @@
#ifndef CHROME_UPDATER_WIN_INSTALLER_PE_RESOURCE_H_
#define CHROME_UPDATER_WIN_INSTALLER_PE_RESOURCE_H_
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
namespace updater {
// This class models a windows PE resource. It does not pretend to be a full
diff --git a/chrome/updater/win/installer/string_unittest.cc b/chrome/updater/win/installer/string_unittest.cc
index d5c7307e..f69e6fe 100644
--- a/chrome/updater/win/installer/string_unittest.cc
+++ b/chrome/updater/win/installer/string_unittest.cc
@@ -4,9 +4,10 @@
#include "chrome/updater/win/installer/string.h"
+#include <windows.h>
+
#include <stddef.h>
#include <stdlib.h>
-#include <windows.h>
#include <string>
diff --git a/chrome/updater/win/setup/setup_util.cc b/chrome/updater/win/setup/setup_util.cc
index 990b05a0..5f82c31 100644
--- a/chrome/updater/win/setup/setup_util.cc
+++ b/chrome/updater/win/setup/setup_util.cc
@@ -4,9 +4,10 @@
#include "chrome/updater/win/setup/setup_util.h"
+#include <windows.h>
+
#include <regstr.h>
#include <shlobj.h>
-#include <windows.h>
#include <wrl/client.h>
#include <wrl/implements.h>
diff --git a/chrome/updater/win/test/test_process_main.cc b/chrome/updater/win/test/test_process_main.cc
index f5ca654..c6c9a050 100644
--- a/chrome/updater/win/test/test_process_main.cc
+++ b/chrome/updater/win/test/test_process_main.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <shlobj.h>
#include <windows.h>
+#include <shlobj.h>
+
#include <string>
#include "base/at_exit.h"
diff --git a/chrome/updater/win/ui/ui_util.h b/chrome/updater/win/ui/ui_util.h
index caa882e..122398b 100644
--- a/chrome/updater/win/ui/ui_util.h
+++ b/chrome/updater/win/ui/ui_util.h
@@ -5,9 +5,10 @@
#ifndef CHROME_UPDATER_WIN_UI_UI_UTIL_H_
#define CHROME_UPDATER_WIN_UI_UI_UTIL_H_
-#include <stdint.h>
#include <windows.h>
+#include <stdint.h>
+
#include <string>
#include <vector>
diff --git a/chrome/utility/image_writer/image_writer_win.cc b/chrome/utility/image_writer/image_writer_win.cc
index a496f4b7..09d7554 100644
--- a/chrome/utility/image_writer/image_writer_win.cc
+++ b/chrome/utility/image_writer/image_writer_win.cc
@@ -2,14 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/utility/image_writer/image_writer.h"
+
#include <windows.h>
+
#include <setupapi.h>
#include <stddef.h>
#include <winioctl.h>
#include "base/logging.h"
#include "chrome/utility/image_writer/error_message_strings.h"
-#include "chrome/utility/image_writer/image_writer.h"
namespace image_writer {
diff --git a/chrome/utility/importer/edge_database_reader_unittest_win.cc b/chrome/utility/importer/edge_database_reader_unittest_win.cc
index 2c72e67..87ccdbe1 100644
--- a/chrome/utility/importer/edge_database_reader_unittest_win.cc
+++ b/chrome/utility/importer/edge_database_reader_unittest_win.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
#include <string.h>
diff --git a/chrome/utility/importer/edge_database_reader_win.cc b/chrome/utility/importer/edge_database_reader_win.cc
index e9ecb20..52612e656 100644
--- a/chrome/utility/importer/edge_database_reader_win.cc
+++ b/chrome/utility/importer/edge_database_reader_win.cc
@@ -5,12 +5,12 @@
#include "chrome/utility/importer/edge_database_reader_win.h"
#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
#include <vector>
-
namespace {
// This is an arbitary size chosen for the database error message buffer.
diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importer/ie_importer_win.cc
index ef1d8de..3c6ab7c 100644
--- a/chrome/utility/importer/ie_importer_win.cc
+++ b/chrome/utility/importer/ie_importer_win.cc
@@ -5,8 +5,10 @@
#include "chrome/utility/importer/ie_importer_win.h"
#include <objbase.h>
+
#include <ole2.h>
-#include <intshcut.h> // Needs to come after ole2.h
+
+#include <intshcut.h>
#include <shlobj.h>
#include <stddef.h>
#include <urlhist.h>
diff --git a/components/crash/core/app/crash_export_thunks.h b/components/crash/core/app/crash_export_thunks.h
index b70b6d9..efcc6fec 100644
--- a/components/crash/core/app/crash_export_thunks.h
+++ b/components/crash/core/app/crash_export_thunks.h
@@ -5,9 +5,10 @@
#ifndef COMPONENTS_CRASH_CORE_APP_CRASH_EXPORT_THUNKS_H_
#define COMPONENTS_CRASH_CORE_APP_CRASH_EXPORT_THUNKS_H_
+#include <windows.h>
+
#include <stddef.h>
#include <time.h>
-#include <windows.h>
#include "build/build_config.h"
diff --git a/components/crash/core/app/fallback_crash_handler_launcher_win.h b/components/crash/core/app/fallback_crash_handler_launcher_win.h
index d52762b..6a78d1e 100644
--- a/components/crash/core/app/fallback_crash_handler_launcher_win.h
+++ b/components/crash/core/app/fallback_crash_handler_launcher_win.h
@@ -5,13 +5,13 @@
#ifndef COMPONENTS_CRASH_CORE_APP_FALLBACK_CRASH_HANDLER_LAUNCHER_WIN_H_
#define COMPONENTS_CRASH_CORE_APP_FALLBACK_CRASH_HANDLER_LAUNCHER_WIN_H_
+#include <windows.h>
+
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/win/scoped_handle.h"
#include "base/win/startup_information.h"
-#include <windows.h>
-
namespace crash_reporter {
// This class is a last-ditch crash handler for the Crashpad handler process.
diff --git a/components/device_signals/core/system_signals/win/wmi_client_impl.cc b/components/device_signals/core/system_signals/win/wmi_client_impl.cc
index c81170c..7bdfad75 100644
--- a/components/device_signals/core/system_signals/win/wmi_client_impl.cc
+++ b/components/device_signals/core/system_signals/win/wmi_client_impl.cc
@@ -4,8 +4,9 @@
#include "components/device_signals/core/system_signals/win/wmi_client_impl.h"
-#include <wbemidl.h>
#include <windows.h>
+
+#include <wbemidl.h>
#include <wrl/client.h>
#include <algorithm>
diff --git a/components/device_signals/core/system_signals/win/wmi_client_impl_unittest.cc b/components/device_signals/core/system_signals/win/wmi_client_impl_unittest.cc
index 4e916b5..0c1bbf3 100644
--- a/components/device_signals/core/system_signals/win/wmi_client_impl_unittest.cc
+++ b/components/device_signals/core/system_signals/win/wmi_client_impl_unittest.cc
@@ -4,8 +4,9 @@
#include "components/device_signals/core/system_signals/win/wmi_client_impl.h"
-#include <wbemidl.h>
#include <windows.h>
+
+#include <wbemidl.h>
#include <wrl/client.h>
#include <wrl/implements.h>
diff --git a/components/device_signals/core/system_signals/win/wsc_client_impl.cc b/components/device_signals/core/system_signals/win/wsc_client_impl.cc
index 0b4e2a2..f6d4949 100644
--- a/components/device_signals/core/system_signals/win/wsc_client_impl.cc
+++ b/components/device_signals/core/system_signals/win/wsc_client_impl.cc
@@ -4,8 +4,9 @@
#include "components/device_signals/core/system_signals/win/wsc_client_impl.h"
-#include <iwscapi.h>
#include <windows.h>
+
+#include <iwscapi.h>
#include <wrl/client.h>
#include <wscapi.h>
diff --git a/components/device_signals/core/system_signals/win/wsc_client_impl_unittest.cc b/components/device_signals/core/system_signals/win/wsc_client_impl_unittest.cc
index 23b6c845..175076d 100644
--- a/components/device_signals/core/system_signals/win/wsc_client_impl_unittest.cc
+++ b/components/device_signals/core/system_signals/win/wsc_client_impl_unittest.cc
@@ -4,8 +4,9 @@
#include "components/device_signals/core/system_signals/win/wsc_client_impl.h"
-#include <iwscapi.h>
#include <windows.h>
+
+#include <iwscapi.h>
#include <wrl/client.h>
#include <wscapi.h>
diff --git a/components/download/internal/common/base_file_win.cc b/components/download/internal/common/base_file_win.cc
index 1db03ae..2892a830 100644
--- a/components/download/internal/common/base_file_win.cc
+++ b/components/download/internal/common/base_file_win.cc
@@ -4,11 +4,12 @@
#include "components/download/public/common/base_file.h"
+#include <objbase.h>
+
+#include <shobjidl.h>
#include <windows.h>
-#include <objbase.h>
#include <shellapi.h>
-#include <shobjidl.h>
#include <wrl/client.h>
#include <wrl/implements.h>
diff --git a/components/gwp_asan/client/guarded_page_allocator_win.cc b/components/gwp_asan/client/guarded_page_allocator_win.cc
index 313a509..348cd30 100644
--- a/components/gwp_asan/client/guarded_page_allocator_win.cc
+++ b/components/gwp_asan/client/guarded_page_allocator_win.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <windows.h>
-
#include "components/gwp_asan/client/guarded_page_allocator.h"
+#include <windows.h>
+
#include "base/check.h"
#include "build/build_config.h"
diff --git a/components/metrics/clean_exit_beacon.cc b/components/metrics/clean_exit_beacon.cc
index 2bceee5..4e02e18 100644
--- a/components/metrics/clean_exit_beacon.cc
+++ b/components/metrics/clean_exit_beacon.cc
@@ -30,6 +30,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/strings/string_util_win.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
diff --git a/components/metrics/drive_metrics_provider_win.cc b/components/metrics/drive_metrics_provider_win.cc
index 5264389..dba5adb9 100644
--- a/components/metrics/drive_metrics_provider_win.cc
+++ b/components/metrics/drive_metrics_provider_win.cc
@@ -5,7 +5,9 @@
#include "components/metrics/drive_metrics_provider.h"
#include <windows.h>
+
#include <winioctl.h>
+
#include <vector>
#include "base/files/file.h"
diff --git a/components/metrics/machine_id_provider_win.cc b/components/metrics/machine_id_provider_win.cc
index c92ad1f..c7c96ff 100644
--- a/components/metrics/machine_id_provider_win.cc
+++ b/components/metrics/machine_id_provider_win.cc
@@ -5,6 +5,7 @@
#include "components/metrics/machine_id_provider.h"
#include <windows.h>
+
#include <stdint.h>
#include <winioctl.h>
diff --git a/components/metrics/metrics_log.cc b/components/metrics/metrics_log.cc
index 68c04f8..2cd3c3b2 100644
--- a/components/metrics/metrics_log.cc
+++ b/components/metrics/metrics_log.cc
@@ -50,6 +50,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/win/current_module.h"
#endif
diff --git a/components/metrics/system_session_analyzer/system_session_analyzer_win.h b/components/metrics/system_session_analyzer/system_session_analyzer_win.h
index 2a1c835..c35fd93 100644
--- a/components/metrics/system_session_analyzer/system_session_analyzer_win.h
+++ b/components/metrics/system_session_analyzer/system_session_analyzer_win.h
@@ -6,6 +6,7 @@
#define COMPONENTS_METRICS_SYSTEM_SESSION_ANALYZER_SYSTEM_SESSION_ANALYZER_WIN_H_
#include <windows.h>
+
#include <winevt.h>
#include <map>
diff --git a/components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_win.cc b/components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_win.cc
index 91f71d5..1be0bc35 100644
--- a/components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_win.cc
+++ b/components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_win.cc
@@ -2,9 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <string.h>
+#include "components/named_mojo_ipc_server/named_mojo_server_endpoint_connector.h"
+
#include <windows.h>
+#include <string.h>
+
#include <memory>
#include <utility>
@@ -26,7 +29,6 @@
#include "base/win/windows_types.h"
#include "components/named_mojo_ipc_server/connection_info.h"
#include "components/named_mojo_ipc_server/endpoint_options.h"
-#include "components/named_mojo_ipc_server/named_mojo_server_endpoint_connector.h"
#include "mojo/public/cpp/platform/named_platform_channel.h"
#include "mojo/public/cpp/platform/platform_channel_endpoint.h"
#include "mojo/public/cpp/platform/platform_handle.h"
diff --git a/components/os_crypt/sync/os_crypt_win.cc b/components/os_crypt/sync/os_crypt_win.cc
index 6a2ee3f..c5cccf244 100644
--- a/components/os_crypt/sync/os_crypt_win.cc
+++ b/components/os_crypt/sync/os_crypt_win.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "components/os_crypt/sync/os_crypt.h"
+
#include <windows.h>
#include "base/base64.h"
@@ -15,7 +17,6 @@
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/wincrypt_shim.h"
-#include "components/os_crypt/sync/os_crypt.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
#include "components/version_info/version_info.h"
diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc
index ea8ad18..94dbb17e 100644
--- a/components/policy/core/common/policy_loader_win_unittest.cc
+++ b/components/policy/core/common/policy_loader_win_unittest.cc
@@ -5,6 +5,7 @@
#include "components/policy/core/common/policy_loader_win.h"
#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
#include <userenv.h>
diff --git a/components/policy/core/common/scoped_critical_policy_section.cc b/components/policy/core/common/scoped_critical_policy_section.cc
index bca9527..4c959b1 100644
--- a/components/policy/core/common/scoped_critical_policy_section.cc
+++ b/components/policy/core/common/scoped_critical_policy_section.cc
@@ -4,9 +4,10 @@
#include "components/policy/core/common/scoped_critical_policy_section.h"
-#include <userenv.h>
#include <windows.h>
+#include <userenv.h>
+
#include "base/functional/bind.h"
#include "base/logging.h"
#include "base/task/bind_post_task.h"
diff --git a/components/power_metrics/energy_metrics_provider_win.cc b/components/power_metrics/energy_metrics_provider_win.cc
index 7bd5279..b2beede 100644
--- a/components/power_metrics/energy_metrics_provider_win.cc
+++ b/components/power_metrics/energy_metrics_provider_win.cc
@@ -4,11 +4,10 @@
#include "components/power_metrics/energy_metrics_provider_win.h"
+#include <initguid.h>
#include <windows.h>
+
#include <devioctl.h>
-
-#include <initguid.h> // This has to be before emi.h
-
#include <emi.h>
#include <setupapi.h>
diff --git a/components/services/quarantine/quarantine_win.cc b/components/services/quarantine/quarantine_win.cc
index 851b9a6..545552a 100644
--- a/components/services/quarantine/quarantine_win.cc
+++ b/components/services/quarantine/quarantine_win.cc
@@ -4,15 +4,16 @@
#include "components/services/quarantine/quarantine.h"
+#include <objbase.h>
+
+#include <shobjidl.h>
#include <windows.h>
-#include <wrl/client.h>
#include <cguid.h>
-#include <objbase.h>
#include <shellapi.h>
#include <shlobj.h>
-#include <shobjidl.h>
#include <wininet.h>
+#include <wrl/client.h>
#include "base/check_op.h"
#include "base/feature_list.h"
diff --git a/components/services/quarantine/quarantine_win_unittest.cc b/components/services/quarantine/quarantine_win_unittest.cc
index 25c4c3ca..fa770d4 100644
--- a/components/services/quarantine/quarantine_win_unittest.cc
+++ b/components/services/quarantine/quarantine_win_unittest.cc
@@ -5,6 +5,7 @@
#include "components/services/quarantine/quarantine.h"
#include <windows.h>
+
#include <wininet.h>
#include <string_view>
diff --git a/components/services/quarantine/test_support_win.cc b/components/services/quarantine/test_support_win.cc
index 0f29ce3..8db496952 100644
--- a/components/services/quarantine/test_support_win.cc
+++ b/components/services/quarantine/test_support_win.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "components/services/quarantine/test_support.h"
+
#include <windows.h>
#include <string>
@@ -14,7 +16,6 @@
#include "base/win/scoped_handle.h"
#include "components/services/quarantine/common.h"
#include "components/services/quarantine/common_win.h"
-#include "components/services/quarantine/test_support.h"
namespace quarantine {
diff --git a/components/startup_metric_utils/browser/startup_metric_utils.cc b/components/startup_metric_utils/browser/startup_metric_utils.cc
index c1eea27..70ce5b0 100644
--- a/components/startup_metric_utils/browser/startup_metric_utils.cc
+++ b/components/startup_metric_utils/browser/startup_metric_utils.cc
@@ -23,7 +23,9 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include <winternl.h>
+
#include "base/win/win_util.h"
namespace {
diff --git a/components/storage_monitor/portable_device_watcher_win.cc b/components/storage_monitor/portable_device_watcher_win.cc
index 629e3c44..f51c9883 100644
--- a/components/storage_monitor/portable_device_watcher_win.cc
+++ b/components/storage_monitor/portable_device_watcher_win.cc
@@ -8,8 +8,9 @@
#include "components/storage_monitor/portable_device_watcher_win.h"
-#include <dbt.h>
#include <objbase.h>
+
+#include <dbt.h>
#include <portabledevice.h>
#include <wrl/client.h>
diff --git a/components/storage_monitor/storage_monitor_win.cc b/components/storage_monitor/storage_monitor_win.cc
index a3c74cc..ddf9e2a1 100644
--- a/components/storage_monitor/storage_monitor_win.cc
+++ b/components/storage_monitor/storage_monitor_win.cc
@@ -5,6 +5,7 @@
#include "components/storage_monitor/storage_monitor_win.h"
#include <windows.h>
+
#include <dbt.h>
#include <fileapi.h>
#include <shlobj.h>
diff --git a/components/storage_monitor/storage_monitor_win_unittest.cc b/components/storage_monitor/storage_monitor_win_unittest.cc
index f295154..9de17f7 100644
--- a/components/storage_monitor/storage_monitor_win_unittest.cc
+++ b/components/storage_monitor/storage_monitor_win_unittest.cc
@@ -2,7 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "components/storage_monitor/storage_monitor_win.h"
+
#include <windows.h>
+
#include <dbt.h>
#include <stddef.h>
@@ -21,7 +24,6 @@
#include "components/storage_monitor/portable_device_watcher_win.h"
#include "components/storage_monitor/removable_device_constants.h"
#include "components/storage_monitor/storage_info.h"
-#include "components/storage_monitor/storage_monitor_win.h"
#include "components/storage_monitor/test_portable_device_watcher_win.h"
#include "components/storage_monitor/test_storage_monitor.h"
#include "components/storage_monitor/test_storage_monitor_win.h"
diff --git a/components/storage_monitor/volume_mount_watcher_win.cc b/components/storage_monitor/volume_mount_watcher_win.cc
index 9f76d285..a93790b5 100644
--- a/components/storage_monitor/volume_mount_watcher_win.cc
+++ b/components/storage_monitor/volume_mount_watcher_win.cc
@@ -5,12 +5,12 @@
#include "components/storage_monitor/volume_mount_watcher_win.h"
#include <windows.h>
-#include <stddef.h>
-#include <stdint.h>
#include <dbt.h>
#include <fileapi.h>
#include <shlobj.h>
+#include <stddef.h>
+#include <stdint.h>
#include <winioctl.h>
#include <algorithm>
diff --git a/components/storage_monitor/volume_mount_watcher_win.h b/components/storage_monitor/volume_mount_watcher_win.h
index d14387fb..4ead6e8 100644
--- a/components/storage_monitor/volume_mount_watcher_win.h
+++ b/components/storage_monitor/volume_mount_watcher_win.h
@@ -5,6 +5,8 @@
#ifndef COMPONENTS_STORAGE_MONITOR_VOLUME_MOUNT_WATCHER_WIN_H_
#define COMPONENTS_STORAGE_MONITOR_VOLUME_MOUNT_WATCHER_WIN_H_
+#include <windows.h>
+
#include <map>
#include <set>
#include <string>
@@ -18,8 +20,6 @@
#include "components/storage_monitor/storage_info.h"
#include "components/storage_monitor/storage_monitor.h"
-#include <windows.h>
-
namespace storage_monitor {
class TestVolumeMountWatcherWin;
diff --git a/components/update_client/background_downloader_win.cc b/components/update_client/background_downloader_win.cc
index 7a44e6d..5742fc1 100644
--- a/components/update_client/background_downloader_win.cc
+++ b/components/update_client/background_downloader_win.cc
@@ -5,10 +5,12 @@
#include "components/update_client/background_downloader_win.h"
#include <objbase.h>
+
+#include <windows.h>
+
#include <shlobj_core.h>
#include <stddef.h>
#include <stdint.h>
-#include <windows.h>
#include <winerror.h>
#include <limits>
diff --git a/components/update_client/background_downloader_win.h b/components/update_client/background_downloader_win.h
index aa3eb068..ba5ebef 100644
--- a/components/update_client/background_downloader_win.h
+++ b/components/update_client/background_downloader_win.h
@@ -5,8 +5,9 @@
#ifndef COMPONENTS_UPDATE_CLIENT_BACKGROUND_DOWNLOADER_WIN_H_
#define COMPONENTS_UPDATE_CLIENT_BACKGROUND_DOWNLOADER_WIN_H_
-#include <bits.h>
#include <windows.h>
+
+#include <bits.h>
#include <wrl/client.h>
#include <memory>
diff --git a/components/visitedlink/browser/visitedlink_writer.cc b/components/visitedlink/browser/visitedlink_writer.cc
index 70f25737..34afa20 100644
--- a/components/visitedlink/browser/visitedlink_writer.cc
+++ b/components/visitedlink/browser/visitedlink_writer.cc
@@ -34,9 +34,10 @@
#include "url/origin.h"
#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+
#include <io.h>
#include <shlobj.h>
-#include <windows.h>
#endif // BUILDFLAG(IS_WIN)
using content::BrowserThread;
diff --git a/components/viz/host/host_display_client.cc b/components/viz/host/host_display_client.cc
index 7af928a9..0ef41b4 100644
--- a/components/viz/host/host_display_client.cc
+++ b/components/viz/host/host_display_client.cc
@@ -13,6 +13,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include <utility>
#include "components/viz/common/display/use_layered_window.h"
diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc
index d20203c..26f194b 100644
--- a/components/wifi/wifi_service_win.cc
+++ b/components/wifi/wifi_service_win.cc
@@ -4,12 +4,11 @@
#include "components/wifi/wifi_service.h"
-// clang-format off
-#include <windows.h> // Must be in front of other Windows header files.
-// clang-format on
+#include <objbase.h>
+
+#include <windows.h>
#include <iphlpapi.h>
-#include <objbase.h>
#include <stddef.h>
#include <stdint.h>
#include <wlanapi.h>
diff --git a/components/winhttp/net_util.h b/components/winhttp/net_util.h
index bbc8112..864dcc98 100644
--- a/components/winhttp/net_util.h
+++ b/components/winhttp/net_util.h
@@ -5,8 +5,9 @@
#ifndef COMPONENTS_WINHTTP_NET_UTIL_H_
#define COMPONENTS_WINHTTP_NET_UTIL_H_
-#include <stdint.h>
#include <windows.h>
+
+#include <stdint.h>
#include <winhttp.h>
#include <ostream>
diff --git a/components/winhttp/network_fetcher.h b/components/winhttp/network_fetcher.h
index 21892bfb..d8ac857 100644
--- a/components/winhttp/network_fetcher.h
+++ b/components/winhttp/network_fetcher.h
@@ -5,9 +5,10 @@
#ifndef COMPONENTS_WINHTTP_NETWORK_FETCHER_H_
#define COMPONENTS_WINHTTP_NETWORK_FETCHER_H_
-#include <stdint.h>
#include <windows.h>
+#include <stdint.h>
+
#include <memory>
#include <string>
#include <string_view>
diff --git a/components/winhttp/proxy_configuration.h b/components/winhttp/proxy_configuration.h
index eee680a..16dfd6bc 100644
--- a/components/winhttp/proxy_configuration.h
+++ b/components/winhttp/proxy_configuration.h
@@ -6,6 +6,7 @@
#define COMPONENTS_WINHTTP_PROXY_CONFIGURATION_H_
#include <windows.h>
+
#include <winhttp.h>
#include <optional>
diff --git a/components/winhttp/scoped_hinternet.cc b/components/winhttp/scoped_hinternet.cc
index 1d02d2e..3cab3f77 100644
--- a/components/winhttp/scoped_hinternet.cc
+++ b/components/winhttp/scoped_hinternet.cc
@@ -4,9 +4,10 @@
#include "components/winhttp/scoped_hinternet.h"
-#include <versionhelpers.h>
#include <windows.h>
+#include <versionhelpers.h>
+
#include <string_view>
#include <utility>
diff --git a/components/winhttp/scoped_hinternet.h b/components/winhttp/scoped_hinternet.h
index f7eaa57..e2958667 100644
--- a/components/winhttp/scoped_hinternet.h
+++ b/components/winhttp/scoped_hinternet.h
@@ -6,6 +6,7 @@
#define COMPONENTS_WINHTTP_SCOPED_HINTERNET_H_
#include <windows.h>
+
#include <winhttp.h>
#include <string_view>
diff --git a/components/winhttp/scoped_winttp_proxy_info.h b/components/winhttp/scoped_winttp_proxy_info.h
index 0a12e6e..6481b08 100644
--- a/components/winhttp/scoped_winttp_proxy_info.h
+++ b/components/winhttp/scoped_winttp_proxy_info.h
@@ -6,6 +6,7 @@
#define COMPONENTS_WINHTTP_SCOPED_WINTTP_PROXY_INFO_H_
#include <windows.h>
+
#include <winhttp.h>
#include <string>
diff --git a/components/zucchini/exception_filter_helper_win.cc b/components/zucchini/exception_filter_helper_win.cc
index 7f1e5d5..66a7596 100644
--- a/components/zucchini/exception_filter_helper_win.cc
+++ b/components/zucchini/exception_filter_helper_win.cc
@@ -4,9 +4,10 @@
#include "components/zucchini/exception_filter_helper_win.h"
+#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
-#include <windows.h>
#include <map>
diff --git a/components/zucchini/exception_filter_helper_win.h b/components/zucchini/exception_filter_helper_win.h
index e52bc60..b92b702 100644
--- a/components/zucchini/exception_filter_helper_win.h
+++ b/components/zucchini/exception_filter_helper_win.h
@@ -5,9 +5,10 @@
#ifndef COMPONENTS_ZUCCHINI_EXCEPTION_FILTER_HELPER_WIN_H_
#define COMPONENTS_ZUCCHINI_EXCEPTION_FILTER_HELPER_WIN_H_
+#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
-#include <windows.h>
#include <map>
diff --git a/content/browser/accessibility/hit_testing_win_browsertest.cc b/content/browser/accessibility/hit_testing_win_browsertest.cc
index b7c7fae..7c1b2aef 100644
--- a/content/browser/accessibility/hit_testing_win_browsertest.cc
+++ b/content/browser/accessibility/hit_testing_win_browsertest.cc
@@ -5,12 +5,15 @@
#ifndef CONTENT_BROWSER_ACCESSIBILITY_HIT_TESTING_WIN_BROWSERTEST_H_
#define CONTENT_BROWSER_ACCESSIBILITY_HIT_TESTING_WIN_BROWSERTEST_H_
-#include "content/browser/accessibility/hit_testing_browsertest.h"
+#include <objbase.h>
+
+#include <wrl/client.h>
#include "base/test/scoped_feature_list.h"
#include "base/win/scoped_variant.h"
#include "content/browser/accessibility/browser_accessibility.h"
#include "content/browser/accessibility/browser_accessibility_manager.h"
+#include "content/browser/accessibility/hit_testing_browsertest.h"
#include "content/public/test/accessibility_notification_waiter.h"
#include "content/public/test/browser_test.h"
#include "content/public/test/browser_test_utils.h"
@@ -18,9 +21,7 @@
#include "content/shell/browser/shell.h"
#include "ui/accessibility/accessibility_features.h"
-#include <objbase.h>
#include <uiautomation.h>
-#include <wrl/client.h>
using Microsoft::WRL::ComPtr;
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index e4b272b..c50d060 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -191,9 +191,10 @@
#endif
#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+
#include <commctrl.h>
#include <shellapi.h>
-#include <windows.h>
#include "base/threading/platform_thread_win.h"
#include "net/base/winsock_init.h"
diff --git a/content/browser/devtools/devtools_agent_host_impl.cc b/content/browser/devtools/devtools_agent_host_impl.cc
index f16aff8..13dc3d4 100644
--- a/content/browser/devtools/devtools_agent_host_impl.cc
+++ b/content/browser/devtools/devtools_agent_host_impl.cc
@@ -39,9 +39,10 @@
#include "services/network/public/mojom/network_context.mojom.h"
#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+
#include <fcntl.h>
#include <io.h>
-#include <windows.h>
#endif
namespace content {
diff --git a/content/browser/devtools/devtools_pipe_handler.cc b/content/browser/devtools/devtools_pipe_handler.cc
index cba089b..588e9ae 100644
--- a/content/browser/devtools/devtools_pipe_handler.cc
+++ b/content/browser/devtools/devtools_pipe_handler.cc
@@ -7,9 +7,10 @@
#include "build/build_config.h"
#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+
#include <io.h>
#include <stdlib.h>
-#include <windows.h>
#else
#include <sys/socket.h>
#endif
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index c5201f75..34eab2e 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -7,9 +7,10 @@
#include "build/build_config.h"
#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+
#include <aclapi.h>
#include <sddl.h>
-#include <windows.h>
#endif // BUILDFLAG(IS_WIN)
#include <array>
diff --git a/content/browser/loader/file_url_loader_factory_browsertest.cc b/content/browser/loader/file_url_loader_factory_browsertest.cc
index 21487a9..9c99e2a 100644
--- a/content/browser/loader/file_url_loader_factory_browsertest.cc
+++ b/content/browser/loader/file_url_loader_factory_browsertest.cc
@@ -15,8 +15,10 @@
#if BUILDFLAG(IS_WIN)
#include <objbase.h>
-#include <shlobj.h>
+
#include <windows.h>
+
+#include <shlobj.h>
#include <wrl/client.h>
#endif
diff --git a/content/browser/renderer_host/direct_manipulation_helper_win.cc b/content/browser/renderer_host/direct_manipulation_helper_win.cc
index b04194c3..e34b45a 100644
--- a/content/browser/renderer_host/direct_manipulation_helper_win.cc
+++ b/content/browser/renderer_host/direct_manipulation_helper_win.cc
@@ -5,6 +5,7 @@
#include "content/browser/renderer_host/direct_manipulation_helper_win.h"
#include <objbase.h>
+
#include <cmath>
#include "base/logging.h"
diff --git a/content/browser/renderer_host/direct_manipulation_helper_win.h b/content/browser/renderer_host/direct_manipulation_helper_win.h
index 2b70dc9d..ef1caba 100644
--- a/content/browser/renderer_host/direct_manipulation_helper_win.h
+++ b/content/browser/renderer_host/direct_manipulation_helper_win.h
@@ -9,6 +9,7 @@
#include <directmanipulation.h>
#include <wrl.h>
+
#include <memory>
#include <string>
diff --git a/content/browser/renderer_host/direct_manipulation_test_helper_win.h b/content/browser/renderer_host/direct_manipulation_test_helper_win.h
index 2ed92430..052456f5 100644
--- a/content/browser/renderer_host/direct_manipulation_test_helper_win.h
+++ b/content/browser/renderer_host/direct_manipulation_test_helper_win.h
@@ -5,9 +5,11 @@
#ifndef CONTENT_BROWSER_RENDERER_HOST_DIRECT_MANIPULATION_TEST_HELPER_WIN_H_
#define CONTENT_BROWSER_RENDERER_HOST_DIRECT_MANIPULATION_TEST_HELPER_WIN_H_
-#include <directmanipulation.h>
#include <windows.h>
+
+#include <directmanipulation.h>
#include <wrl.h>
+
#include <array>
namespace content {
diff --git a/content/browser/renderer_host/direct_manipulation_win_unittest.cc b/content/browser/renderer_host/direct_manipulation_win_unittest.cc
index 542a8d69..f561cfba 100644
--- a/content/browser/renderer_host/direct_manipulation_win_unittest.cc
+++ b/content/browser/renderer_host/direct_manipulation_win_unittest.cc
@@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/renderer_host/direct_manipulation_helper_win.h"
-
#include <objbase.h>
+#include "content/browser/renderer_host/direct_manipulation_helper_win.h"
#include "content/browser/renderer_host/direct_manipulation_test_helper_win.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/ui_base_features.h"
diff --git a/content/browser/screenlock_monitor/screenlock_monitor_device_source.h b/content/browser/screenlock_monitor/screenlock_monitor_device_source.h
index b303399a..383c373 100644
--- a/content/browser/screenlock_monitor/screenlock_monitor_device_source.h
+++ b/content/browser/screenlock_monitor/screenlock_monitor_device_source.h
@@ -14,6 +14,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include <wtsapi32.h>
#endif // BUILDFLAG(IS_WIN)
diff --git a/content/browser/speech/tts_win.cc b/content/browser/speech/tts_win.cc
index 46264f8..834b7737 100644
--- a/content/browser/speech/tts_win.cc
+++ b/content/browser/speech/tts_win.cc
@@ -2,8 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <math.h>
#include <objbase.h>
+
+#include <math.h>
#include <sapi.h>
#include <stdint.h>
#include <wrl/client.h>
diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc
index 690cbc1..d0abf014 100644
--- a/content/browser/tracing/tracing_controller_impl.cc
+++ b/content/browser/tracing/tracing_controller_impl.cc
@@ -73,6 +73,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/win/registry.h"
#include "base/win/win_util.h"
#include "base/win/windows_version.h"
diff --git a/content/browser/utility_process_host_browsertest.cc b/content/browser/utility_process_host_browsertest.cc
index 06689525..9f2b77b 100644
--- a/content/browser/utility_process_host_browsertest.cc
+++ b/content/browser/utility_process_host_browsertest.cc
@@ -41,6 +41,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "sandbox/policy/mojom/sandbox.mojom.h"
#include "sandbox/win/src/sandbox_types.h"
#endif // BUILDFLAG(IS_WIN)
diff --git a/content/child/font_warmup_win_unittest.cc b/content/child/font_warmup_win_unittest.cc
index ad0e210..e0b42e7 100644
--- a/content/child/font_warmup_win_unittest.cc
+++ b/content/child/font_warmup_win_unittest.cc
@@ -5,6 +5,7 @@
#include "content/child/font_warmup_win.h"
#include <windows.h>
+
#include <dwrite.h>
#include <stddef.h>
#include <stdint.h>
@@ -18,7 +19,6 @@
#include "base/logging.h"
#include "base/path_service.h"
#include "base/test/task_environment.h"
-
#include "content/child/dwrite_font_proxy/dwrite_font_proxy_win.h"
#include "content/public/common/content_paths.h"
#include "content/test/dwrite_font_fake_sender_win.h"
diff --git a/content/common/content_switches_internal.cc b/content/common/content_switches_internal.cc
index 2ff46a1..0d7a097f1 100644
--- a/content/common/content_switches_internal.cc
+++ b/content/common/content_switches_internal.cc
@@ -32,9 +32,9 @@
#endif
#if BUILDFLAG(IS_WIN)
-#include "base/win/windows_version.h"
-
#include <windows.h>
+
+#include "base/win/windows_version.h"
#endif
namespace content {
diff --git a/content/common/font_list_win.cc b/content/common/font_list_win.cc
index 7a26ddd..662493b 100644
--- a/content/common/font_list_win.cc
+++ b/content/common/font_list_win.cc
@@ -4,8 +4,9 @@
#include "content/common/font_list.h"
-#include <dwrite.h>
#include <windows.h>
+
+#include <dwrite.h>
#include <wrl/client.h>
#include <string>
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 234d3af2..322a2e3 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -72,8 +72,9 @@
#include "ui/gl/init/gl_factory.h"
#if BUILDFLAG(IS_WIN)
-#include <dwmapi.h>
#include <windows.h>
+
+#include <dwmapi.h>
#endif
#if BUILDFLAG(IS_ANDROID)
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index 0c518ce..e6ece0d2 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -153,10 +153,12 @@
#if BUILDFLAG(IS_WIN)
#include <combaseapi.h>
-#include <uiautomation.h>
#include <wrl/client.h>
+
#include "base/win/scoped_safearray.h"
#include "base/win/scoped_variant.h"
+
+#include <uiautomation.h>
#endif
#if defined(USE_AURA)
diff --git a/content/renderer/gpu_benchmarking_extension.cc b/content/renderer/gpu_benchmarking_extension.cc
index ae52760..628f7fe 100644
--- a/content/renderer/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu_benchmarking_extension.cc
@@ -84,10 +84,13 @@
// XpsObjectModel.h indirectly includes <wincrypt.h> which is
// incompatible with Chromium's OpenSSL. By including wincrypt_shim.h
// first, problems are avoided.
+// clang-format off
#include "base/win/wincrypt_shim.h"
+// clang-format on
+
+#include <objbase.h>
#include <XpsObjectModel.h>
-#include <objbase.h>
#include <wrl/client.h>
#endif
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
index 701bab7d..5cb5a8cf 100644
--- a/content/renderer/render_process_impl.cc
+++ b/content/renderer/render_process_impl.cc
@@ -8,6 +8,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include <mlang.h>
#include <objidl.h>
#endif
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 2462412..d38d1cbd 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -183,7 +183,9 @@
#if BUILDFLAG(IS_WIN)
#include <objbase.h>
+
#include <windows.h>
+
#include "content/renderer/media/win/dcomp_texture_factory.h"
#include "content/renderer/media/win/overlay_state_service_provider.h"
#include "media/base/win/mf_feature_checks.h"
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index b508519..c75cc75f 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -75,9 +75,9 @@
#endif // BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_WIN)
+#include <initguid.h>
#include <windows.h>
-#include <initguid.h>
#include "base/logging_win.h"
#include "base/win/scoped_handle.h"
#include "base/win/win_util.h"
diff --git a/content/shell/browser/shell_download_manager_delegate.cc b/content/shell/browser/shell_download_manager_delegate.cc
index f6baa53..efeb0ae 100644
--- a/content/shell/browser/shell_download_manager_delegate.cc
+++ b/content/shell/browser/shell_download_manager_delegate.cc
@@ -13,6 +13,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include <commdlg.h>
#endif
diff --git a/content/shell/browser/shell_javascript_dialog_win.cc b/content/shell/browser/shell_javascript_dialog_win.cc
index 95798e2..b06fc611 100644
--- a/content/shell/browser/shell_javascript_dialog_win.cc
+++ b/content/shell/browser/shell_javascript_dialog_win.cc
@@ -4,6 +4,8 @@
#include "content/shell/browser/shell_javascript_dialog.h"
+#include <windows.h>
+
#include <utility>
#include "base/strings/string_util.h"
@@ -12,8 +14,6 @@
#include "content/shell/browser/shell.h"
#include "content/shell/browser/shell_javascript_dialog_manager.h"
-#include <windows.h>
-
namespace content {
class ShellJavaScriptDialog;
diff --git a/content/shell/common/v8_crashpad_support_win.cc b/content/shell/common/v8_crashpad_support_win.cc
index 11c7536..d1f095b9 100644
--- a/content/shell/common/v8_crashpad_support_win.cc
+++ b/content/shell/common/v8_crashpad_support_win.cc
@@ -5,6 +5,7 @@
#include "content/shell/common/v8_crashpad_support_win.h"
#include <windows.h>
+
#include "components/crash/core/app/crash_export_thunks.h"
#include "gin/public/debug.h"
diff --git a/content/web_test/browser/web_test_browser_main_platform_support_win.cc b/content/web_test/browser/web_test_browser_main_platform_support_win.cc
index 24117223..bb398b3 100644
--- a/content/web_test/browser/web_test_browser_main_platform_support_win.cc
+++ b/content/web_test/browser/web_test_browser_main_platform_support_win.cc
@@ -4,9 +4,10 @@
#include "content/web_test/browser/web_test_browser_main_platform_support.h"
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include <iostream>
#include <list>
#include <string>
diff --git a/device/base/device_info_query_win.h b/device/base/device_info_query_win.h
index 130a07a..6eb28bf 100644
--- a/device/base/device_info_query_win.h
+++ b/device/base/device_info_query_win.h
@@ -6,6 +6,7 @@
#define DEVICE_BASE_DEVICE_INFO_QUERY_WIN_H_
#include <windows.h>
+
#include <setupapi.h>
#include <string>
diff --git a/device/bluetooth/bluetooth_task_manager_win.cc b/device/bluetooth/bluetooth_task_manager_win.cc
index 03c2658..8d30696 100644
--- a/device/bluetooth/bluetooth_task_manager_win.cc
+++ b/device/bluetooth/bluetooth_task_manager_win.cc
@@ -4,9 +4,10 @@
#include "device/bluetooth/bluetooth_task_manager_win.h"
-#include <stddef.h>
#include <winsock2.h>
+#include <stddef.h>
+
#include <memory>
#include <string>
#include <utility>
diff --git a/device/fido/win/logging.h b/device/fido/win/logging.h
index 34b7c51..11b8572 100644
--- a/device/fido/win/logging.h
+++ b/device/fido/win/logging.h
@@ -6,6 +6,7 @@
#define DEVICE_FIDO_WIN_LOGGING_H_
#include <windows.h>
+
#include <ostream>
#include "third_party/microsoft_webauthn/webauthn.h"
diff --git a/device/gamepad/hid_writer_win.cc b/device/gamepad/hid_writer_win.cc
index ae1ef84..312f4ae 100644
--- a/device/gamepad/hid_writer_win.cc
+++ b/device/gamepad/hid_writer_win.cc
@@ -5,9 +5,10 @@
#include "device/gamepad/hid_writer_win.h"
#include <Unknwn.h>
+#include <windows.h>
+
#include <WinDef.h>
#include <stdint.h>
-#include <windows.h>
#include "base/strings/string_util_win.h"
diff --git a/device/gamepad/raw_input_data_fetcher_win.h b/device/gamepad/raw_input_data_fetcher_win.h
index 8be982f..523d7ca 100644
--- a/device/gamepad/raw_input_data_fetcher_win.h
+++ b/device/gamepad/raw_input_data_fetcher_win.h
@@ -6,11 +6,12 @@
#define DEVICE_GAMEPAD_RAW_INPUT_DATA_FETCHER_WIN_H_
#include <Unknwn.h>
+#include <windows.h>
+
#include <WinDef.h>
#include <hidsdi.h>
#include <stdint.h>
#include <stdlib.h>
-#include <windows.h>
#include <map>
#include <memory>
diff --git a/device/gamepad/raw_input_gamepad_device_win.h b/device/gamepad/raw_input_gamepad_device_win.h
index 7d92c55..1b93197 100644
--- a/device/gamepad/raw_input_gamepad_device_win.h
+++ b/device/gamepad/raw_input_gamepad_device_win.h
@@ -6,11 +6,12 @@
#define DEVICE_GAMEPAD_RAW_INPUT_GAMEPAD_DEVICE_WIN_H_
#include <Unknwn.h>
+#include <windows.h>
+
#include <WinDef.h>
#include <hidsdi.h>
#include <stdint.h>
#include <stdlib.h>
-#include <windows.h>
#include <memory>
#include <optional>
diff --git a/device/gamepad/xinput_data_fetcher_win.h b/device/gamepad/xinput_data_fetcher_win.h
index aa06285..9e09ae5 100644
--- a/device/gamepad/xinput_data_fetcher_win.h
+++ b/device/gamepad/xinput_data_fetcher_win.h
@@ -13,10 +13,11 @@
#define WIN32_LEAN_AND_MEAN
#endif
#include <Unknwn.h>
+#include <windows.h>
+
#include <WinDef.h>
#include <XInput.h>
#include <stdlib.h>
-#include <windows.h>
#include "base/compiler_specific.h"
#include "base/memory/weak_ptr.h"
diff --git a/extensions/browser/api/system_cpu/cpu_info_provider_win.cc b/extensions/browser/api/system_cpu/cpu_info_provider_win.cc
index a309f12..e6076144 100644
--- a/extensions/browser/api/system_cpu/cpu_info_provider_win.cc
+++ b/extensions/browser/api/system_cpu/cpu_info_provider_win.cc
@@ -5,6 +5,7 @@
#include "extensions/browser/api/system_cpu/cpu_info_provider.h"
#include <windows.h>
+
#include <winternl.h>
#include <memory>
diff --git a/gpu/command_buffer/service/dxgi_shared_handle_manager.cc b/gpu/command_buffer/service/dxgi_shared_handle_manager.cc
index 4d0a9643..9346fc8 100644
--- a/gpu/command_buffer/service/dxgi_shared_handle_manager.cc
+++ b/gpu/command_buffer/service/dxgi_shared_handle_manager.cc
@@ -4,9 +4,10 @@
#include "gpu/command_buffer/service/dxgi_shared_handle_manager.h"
-#include <d3d11_1.h>
#include <windows.h>
+#include <d3d11_1.h>
+
#include "base/atomic_ref_count.h"
#include "base/logging.h"
#include "gpu/command_buffer/common/constants.h"
diff --git a/gpu/command_buffer/service/dxgi_shared_handle_manager_unittest.cc b/gpu/command_buffer/service/dxgi_shared_handle_manager_unittest.cc
index 08b1edb..9ac4fc9 100644
--- a/gpu/command_buffer/service/dxgi_shared_handle_manager_unittest.cc
+++ b/gpu/command_buffer/service/dxgi_shared_handle_manager_unittest.cc
@@ -4,9 +4,10 @@
#include "gpu/command_buffer/service/dxgi_shared_handle_manager.h"
-#include <d3d11_1.h>
#include <windows.h>
+#include <d3d11_1.h>
+
#include "base/synchronization/condition_variable.h"
#include "base/synchronization/lock.h"
#include "base/task/thread_pool.h"
diff --git a/gpu/command_buffer/service/shared_image/d3d_image_backing.h b/gpu/command_buffer/service/shared_image/d3d_image_backing.h
index 8147e16..d70e6e0 100644
--- a/gpu/command_buffer/service/shared_image/d3d_image_backing.h
+++ b/gpu/command_buffer/service/shared_image/d3d_image_backing.h
@@ -5,9 +5,10 @@
#ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_D3D_IMAGE_BACKING_H_
#define GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_D3D_IMAGE_BACKING_H_
+#include <windows.h>
+
#include <d3d11.h>
#include <dxgi1_2.h>
-#include <windows.h>
#include <wrl/client.h>
#include <array>
diff --git a/gpu/command_buffer/service/shared_image/d3d_image_backing_factory.h b/gpu/command_buffer/service/shared_image/d3d_image_backing_factory.h
index 936b798..b7d746e7 100644
--- a/gpu/command_buffer/service/shared_image/d3d_image_backing_factory.h
+++ b/gpu/command_buffer/service/shared_image/d3d_image_backing_factory.h
@@ -5,9 +5,10 @@
#ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_D3D_IMAGE_BACKING_FACTORY_H_
#define GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_D3D_IMAGE_BACKING_FACTORY_H_
+#include <windows.h>
+
#include <d3d11.h>
#include <dxgi1_2.h>
-#include <windows.h>
#include <wrl/client.h>
#include <memory>
diff --git a/gpu/command_buffer/service/shared_image/d3d_image_utils.h b/gpu/command_buffer/service/shared_image/d3d_image_utils.h
index 2c7290c..1cfdfee 100644
--- a/gpu/command_buffer/service/shared_image/d3d_image_utils.h
+++ b/gpu/command_buffer/service/shared_image/d3d_image_utils.h
@@ -5,8 +5,9 @@
#ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_D3D_IMAGE_UTILS_H_
#define GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_D3D_IMAGE_UTILS_H_
-#include <d3d11.h>
#include <windows.h>
+
+#include <d3d11.h>
#include <wrl/client.h>
#include "base/containers/span.h"
diff --git a/gpu/command_buffer/service/shared_image/dcomp_surface_image_backing.h b/gpu/command_buffer/service/shared_image/dcomp_surface_image_backing.h
index 4ae2c7a9c..93a481f 100644
--- a/gpu/command_buffer/service/shared_image/dcomp_surface_image_backing.h
+++ b/gpu/command_buffer/service/shared_image/dcomp_surface_image_backing.h
@@ -5,12 +5,12 @@
#ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_DCOMP_SURFACE_IMAGE_BACKING_H_
#define GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_DCOMP_SURFACE_IMAGE_BACKING_H_
-#include <d3d11.h>
-#include <dcomp.h>
#include <windows.h>
-#include <wrl/client.h>
+#include <d3d11.h>
#include <dawn/native/D3DBackend.h>
+#include <dcomp.h>
+#include <wrl/client.h>
#include "base/memory/scoped_refptr.h"
#include "gpu/command_buffer/service/shared_image/dcomp_surface_image_representation.h"
diff --git a/gpu/command_buffer/service/shared_image/dxgi_swap_chain_image_backing.h b/gpu/command_buffer/service/shared_image/dxgi_swap_chain_image_backing.h
index 40345509..8550de2 100644
--- a/gpu/command_buffer/service/shared_image/dxgi_swap_chain_image_backing.h
+++ b/gpu/command_buffer/service/shared_image/dxgi_swap_chain_image_backing.h
@@ -5,13 +5,14 @@
#ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_DXGI_SWAP_CHAIN_IMAGE_BACKING_H_
#define GPU_COMMAND_BUFFER_SERVICE_SHARED_IMAGE_DXGI_SWAP_CHAIN_IMAGE_BACKING_H_
-#include <d3d11.h>
-#include <dxgi1_2.h>
#include <windows.h>
-#include <wrl/client.h>
-#include <utility>
+#include <d3d11.h>
#include <dawn/native/D3DBackend.h>
+#include <dxgi1_2.h>
+#include <wrl/client.h>
+
+#include <utility>
#include "gpu/command_buffer/common/mailbox.h"
#include "gpu/command_buffer/service/shared_image/d3d_image_backing.h"
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index 191d73d..199ef54 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -34,6 +34,7 @@
#if BUILDFLAG(IS_WIN)
#include <tchar.h>
+
#include "ipc/handle_win.h"
#include "ipc/ipc_platform_file.h"
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
diff --git a/media/audio/win/audio_low_latency_input_win.cc b/media/audio/win/audio_low_latency_input_win.cc
index a8ea821..1e2b634 100644
--- a/media/audio/win/audio_low_latency_input_win.cc
+++ b/media/audio/win/audio_low_latency_input_win.cc
@@ -5,6 +5,7 @@
#include "media/audio/win/audio_low_latency_input_win.h"
#include <objbase.h>
+
#include <propkey.h>
#include <windows.devices.enumeration.h>
#include <windows.media.devices.h>
diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc
index 429b1eb..ac2fae37 100644
--- a/media/audio/win/audio_low_latency_input_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_input_win_unittest.cc
@@ -5,6 +5,7 @@
#include "media/audio/win/audio_low_latency_input_win.h"
#include <windows.h>
+
#include <mmsystem.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc
index 882d0687..6d0061f 100644
--- a/media/audio/win/audio_low_latency_output_win.cc
+++ b/media/audio/win/audio_low_latency_output_win.cc
@@ -4,10 +4,11 @@
#include "media/audio/win/audio_low_latency_output_win.h"
+#include <objbase.h>
+
#include <Functiondiscoverykeys_devpkey.h>
#include <audiopolicy.h>
#include <inttypes.h>
-#include <objbase.h>
#include <climits>
#include <memory>
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
index 99029264..b39c97a 100644
--- a/media/audio/win/audio_manager_win.cc
+++ b/media/audio/win/audio_manager_win.cc
@@ -4,11 +4,11 @@
#include "media/audio/win/audio_manager_win.h"
-#include <windows.h>
-
-#include <objbase.h> // This has to be before initguid.h
+#include <objbase.h>
#include <initguid.h>
+#include <windows.h>
+
#include <mmsystem.h>
#include <setupapi.h>
#include <stddef.h>
diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc
index 12abf4d..39ff2520 100644
--- a/media/audio/win/audio_output_win_unittest.cc
+++ b/media/audio/win/audio_output_win_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <windows.h>
+
#include <mmsystem.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/media/audio/win/avrt_wrapper_win.h b/media/audio/win/avrt_wrapper_win.h
index 7a95f860..fc4cef12 100644
--- a/media/audio/win/avrt_wrapper_win.h
+++ b/media/audio/win/avrt_wrapper_win.h
@@ -18,6 +18,7 @@
#define MEDIA_AUDIO_WIN_AVRT_WRAPPER_WIN_H_
#include <windows.h>
+
#include <avrt.h>
namespace avrt {
diff --git a/media/audio/win/core_audio_util_win.cc b/media/audio/win/core_audio_util_win.cc
index 02d4802..685d160 100644
--- a/media/audio/win/core_audio_util_win.cc
+++ b/media/audio/win/core_audio_util_win.cc
@@ -4,12 +4,14 @@
#include "media/audio/win/core_audio_util_win.h"
+#include <objbase.h>
+
#include <comdef.h>
#include <devicetopology.h>
#include <functiondiscoverykeys_devpkey.h>
-#include <objbase.h>
#include <stddef.h>
#include <stdint.h>
+
#include <bitset>
#include "base/command_line.h"
diff --git a/media/audio/win/device_enumeration_win.cc b/media/audio/win/device_enumeration_win.cc
index 11b1678..e2f35a5a 100644
--- a/media/audio/win/device_enumeration_win.cc
+++ b/media/audio/win/device_enumeration_win.cc
@@ -4,10 +4,12 @@
#include "media/audio/win/device_enumeration_win.h"
-#include <MMDeviceAPI.h>
-#include <mmsystem.h>
#include <objbase.h>
-#include <Functiondiscoverykeys_devpkey.h> // MMDeviceAPI.h must come first
+
+#include <MMDeviceAPI.h>
+
+#include <Functiondiscoverykeys_devpkey.h>
+#include <mmsystem.h>
#include <stddef.h>
#include <wrl/client.h>
diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h
index 644de74a4..80990fa 100644
--- a/media/audio/win/waveout_output_win.h
+++ b/media/audio/win/waveout_output_win.h
@@ -6,8 +6,9 @@
#define MEDIA_AUDIO_WIN_WAVEOUT_OUTPUT_WIN_H_
#include <windows.h>
-#include <mmsystem.h>
+
#include <mmreg.h>
+#include <mmsystem.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/media/base/win/media_foundation_cdm_proxy.h b/media/base/win/media_foundation_cdm_proxy.h
index 7e6488b..4e185e8 100644
--- a/media/base/win/media_foundation_cdm_proxy.h
+++ b/media/base/win/media_foundation_cdm_proxy.h
@@ -5,9 +5,10 @@
#ifndef MEDIA_BASE_WIN_MEDIA_FOUNDATION_CDM_PROXY_H_
#define MEDIA_BASE_WIN_MEDIA_FOUNDATION_CDM_PROXY_H_
+#include <unknwn.h>
+
#include <mfobjects.h>
#include <stdint.h>
-#include <unknwn.h>
#include <windef.h>
#include "base/memory/ref_counted.h"
diff --git a/media/capture/video/win/capability_list_win.h b/media/capture/video/win/capability_list_win.h
index d2ebd05..a11a2bf 100644
--- a/media/capture/video/win/capability_list_win.h
+++ b/media/capture/video/win/capability_list_win.h
@@ -9,9 +9,10 @@
#ifndef MEDIA_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
#define MEDIA_CAPTURE_VIDEO_WIN_CAPABILITY_LIST_WIN_H_
-#include <list>
#include <windows.h>
+#include <list>
+
#include "media/capture/video_capture_types.h"
namespace media {
diff --git a/media/capture/video/win/sink_filter_win.h b/media/capture/video/win/sink_filter_win.h
index b7e98fe..c7b340c 100644
--- a/media/capture/video/win/sink_filter_win.h
+++ b/media/capture/video/win/sink_filter_win.h
@@ -9,6 +9,7 @@
#define MEDIA_CAPTURE_VIDEO_WIN_SINK_FILTER_WIN_H_
#include <windows.h>
+
#include <stddef.h>
#include "base/memory/scoped_refptr.h"
diff --git a/media/capture/video/win/video_capture_device_factory_win.cc b/media/capture/video/win/video_capture_device_factory_win.cc
index 550d03e..59894306 100644
--- a/media/capture/video/win/video_capture_device_factory_win.cc
+++ b/media/capture/video/win/video_capture_device_factory_win.cc
@@ -4,9 +4,10 @@
#include "media/capture/video/win/video_capture_device_factory_win.h"
+#include <objbase.h>
+
#include <mfapi.h>
#include <mferror.h>
-#include <objbase.h>
#include <stddef.h>
#include <windows.devices.enumeration.h>
#include <windows.foundation.collections.h>
diff --git a/media/capture/video/win/video_capture_device_utils_win.h b/media/capture/video/win/video_capture_device_utils_win.h
index 8d15e98..2c7acf8 100644
--- a/media/capture/video/win/video_capture_device_utils_win.h
+++ b/media/capture/video/win/video_capture_device_utils_win.h
@@ -5,10 +5,11 @@
#ifndef MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_UTILS_WIN_H_
#define MEDIA_CAPTURE_VIDEO_WIN_VIDEO_CAPTURE_DEVICE_UTILS_WIN_H_
+#include <windows.h>
+
// Avoid including strsafe.h via dshow as it will cause build warnings.
#define NO_DSHOW_STRSAFE
#include <dshow.h>
-#include <windows.h>
#include "media/base/video_facing.h"
#include "media/capture/mojom/image_capture_types.h"
diff --git a/media/capture/video/win/video_capture_device_win.cc b/media/capture/video/win/video_capture_device_win.cc
index 74fa8ce..62a7ed4 100644
--- a/media/capture/video/win/video_capture_device_win.cc
+++ b/media/capture/video/win/video_capture_device_win.cc
@@ -4,9 +4,10 @@
#include "media/capture/video/win/video_capture_device_win.h"
+#include <objbase.h>
+
#include <ks.h>
#include <ksmedia.h>
-#include <objbase.h>
#include <algorithm>
#include <list>
diff --git a/media/gpu/windows/d3d11_picture_buffer.cc b/media/gpu/windows/d3d11_picture_buffer.cc
index f3774266..16494e1 100644
--- a/media/gpu/windows/d3d11_picture_buffer.cc
+++ b/media/gpu/windows/d3d11_picture_buffer.cc
@@ -4,9 +4,10 @@
#include "media/gpu/windows/d3d11_picture_buffer.h"
+#include <windows.h>
+
#include <d3d11.h>
#include <d3d11_1.h>
-#include <windows.h>
#include <wrl/client.h>
#include <memory>
diff --git a/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc b/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc
index 627a94d..c2b11b1 100644
--- a/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc
+++ b/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc
@@ -4,11 +4,12 @@
#include "media/gpu/windows/media_foundation_video_encode_accelerator_win.h"
+#include <objbase.h>
+
#include <codecapi.h>
#include <d3d11_1.h>
#include <mferror.h>
#include <mftransform.h>
-#include <objbase.h>
#include <algorithm>
#include <iterator>
diff --git a/media/midi/midi_manager_winrt.cc b/media/midi/midi_manager_winrt.cc
index d5ce617..9c62603 100644
--- a/media/midi/midi_manager_winrt.cc
+++ b/media/midi/midi_manager_winrt.cc
@@ -9,13 +9,14 @@
#define INITGUID
+#include <objbase.h>
+
+#include <initguid.h>
#include <windows.h>
#include <cfgmgr32.h>
#include <comdef.h>
#include <devpkey.h>
-#include <initguid.h>
-#include <objbase.h>
#include <robuffer.h>
#include <windows.devices.enumeration.h>
#include <windows.devices.midi.h>
diff --git a/mojo/core/broker_win.cc b/mojo/core/broker_win.cc
index bac6d67..37ca350 100644
--- a/mojo/core/broker_win.cc
+++ b/mojo/core/broker_win.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "mojo/core/broker.h"
+
#include <windows.h>
#include <limits>
@@ -11,7 +13,6 @@
#include "base/logging.h"
#include "base/memory/platform_shared_memory_region.h"
#include "base/numerics/safe_conversions.h"
-#include "mojo/core/broker.h"
#include "mojo/core/broker_messages.h"
#include "mojo/core/channel.h"
#include "mojo/core/platform_handle_utils.h"
diff --git a/mojo/core/channel_win.cc b/mojo/core/channel_win.cc
index 49283f80..dc5bbc0 100644
--- a/mojo/core/channel_win.cc
+++ b/mojo/core/channel_win.cc
@@ -4,9 +4,10 @@
#include "mojo/core/channel.h"
-#include <stdint.h>
#include <windows.h>
+#include <stdint.h>
+
#include <algorithm>
#include <limits>
#include <memory>
diff --git a/mojo/core/platform_handle_in_transit.cc b/mojo/core/platform_handle_in_transit.cc
index 410cc11..44330d2 100644
--- a/mojo/core/platform_handle_in_transit.cc
+++ b/mojo/core/platform_handle_in_transit.cc
@@ -12,9 +12,10 @@
#include "build/build_config.h"
#if BUILDFLAG(IS_WIN)
-#include <ntstatus.h>
#include <windows.h>
+#include <ntstatus.h>
+
#include "base/win/nt_status.h"
#include "base/win/scoped_handle.h"
#include "mojo/public/cpp/platform/platform_handle_security_util_win.h"
diff --git a/mojo/core/platform_wrapper_unittest.cc b/mojo/core/platform_wrapper_unittest.cc
index 34818e6..2f454e6 100644
--- a/mojo/core/platform_wrapper_unittest.cc
+++ b/mojo/core/platform_wrapper_unittest.cc
@@ -23,6 +23,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/win/scoped_handle.h"
#elif BUILDFLAG(IS_APPLE)
#include "base/apple/scoped_mach_port.h"
diff --git a/mojo/core/test/test_utils_win.cc b/mojo/core/test/test_utils_win.cc
index a42e4fd..424aca9 100644
--- a/mojo/core/test/test_utils_win.cc
+++ b/mojo/core/test/test_utils_win.cc
@@ -4,11 +4,12 @@
#include "mojo/core/test/test_utils.h"
+#include <windows.h>
+
#include <fcntl.h>
#include <io.h>
#include <stddef.h>
#include <string.h>
-#include <windows.h>
#include <ostream>
diff --git a/mojo/public/cpp/platform/named_platform_channel_win.cc b/mojo/public/cpp/platform/named_platform_channel_win.cc
index 0af6ec7..e6f5c36 100644
--- a/mojo/public/cpp/platform/named_platform_channel_win.cc
+++ b/mojo/public/cpp/platform/named_platform_channel_win.cc
@@ -5,11 +5,11 @@
#include "mojo/public/cpp/platform/named_platform_channel.h"
#include <windows.h>
-#include <memory>
-// NOTE: This needs to be included *after* windows.h.
#include <sddl.h>
+#include <memory>
+
#include "base/logging.h"
#include "base/rand_util.h"
#include "base/strings/strcat_win.h"
diff --git a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_win.cc b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_win.cc
index 0715cb0..b41aa90 100644
--- a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_win.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_win.cc
@@ -7,16 +7,18 @@
#if defined(WIN32)
#include "nacl_io/kernel_wrap.h"
+
+#include <windows.h>
+
#include <errno.h>
#include <fcntl.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/types.h> // This must be included before <sys/stat.h>.
#include <sys/stat.h>
-#include "nacl_io/kernel_intercept.h"
+#include <sys/types.h>
-#include <windows.h>
+#include "nacl_io/kernel_intercept.h"
namespace {
diff --git a/net/base/file_stream_context_win.cc b/net/base/file_stream_context_win.cc
index 9c8a2a483..67c46ce 100644
--- a/net/base/file_stream_context_win.cc
+++ b/net/base/file_stream_context_win.cc
@@ -5,6 +5,7 @@
#include "net/base/file_stream_context.h"
#include <windows.h>
+
#include <utility>
#include "base/files/file_path.h"
diff --git a/net/base/ip_endpoint.cc b/net/base/ip_endpoint.cc
index 57e0263..ce2a094 100644
--- a/net/base/ip_endpoint.cc
+++ b/net/base/ip_endpoint.cc
@@ -25,6 +25,7 @@
#if BUILDFLAG(IS_WIN)
#include <winsock2.h>
+
#include <ws2bth.h>
#include "net/base/winsock_util.h" // For kBluetoothAddressSize
diff --git a/net/base/ip_endpoint_unittest.cc b/net/base/ip_endpoint_unittest.cc
index 204de09..1159d901 100644
--- a/net/base/ip_endpoint_unittest.cc
+++ b/net/base/ip_endpoint_unittest.cc
@@ -26,6 +26,7 @@
#if BUILDFLAG(IS_WIN)
#include <winsock2.h>
+
#include <ws2bth.h>
#include "base/test/gtest_util.h" // For EXPECT_DCHECK_DEATH
diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc
index cc0f4c9..a4cfc9c 100644
--- a/net/base/network_change_notifier_win.cc
+++ b/net/base/network_change_notifier_win.cc
@@ -4,9 +4,10 @@
#include "net/base/network_change_notifier_win.h"
-#include <iphlpapi.h>
#include <winsock2.h>
+#include <iphlpapi.h>
+
#include <utility>
#include "base/feature_list.h"
diff --git a/net/base/network_change_notifier_win.h b/net/base/network_change_notifier_win.h
index 055db7354..4e74edb 100644
--- a/net/base/network_change_notifier_win.h
+++ b/net/base/network_change_notifier_win.h
@@ -5,9 +5,10 @@
#ifndef NET_BASE_NETWORK_CHANGE_NOTIFIER_WIN_H_
#define NET_BASE_NETWORK_CHANGE_NOTIFIER_WIN_H_
+#include <windows.h>
+
#include <netlistmgr.h>
#include <ocidl.h>
-#include <windows.h>
#include <wrl.h>
#include <wrl/client.h>
diff --git a/net/base/network_interfaces.cc b/net/base/network_interfaces.cc
index c8a66341..7a92349 100644
--- a/net/base/network_interfaces.cc
+++ b/net/base/network_interfaces.cc
@@ -13,6 +13,7 @@
#if BUILDFLAG(IS_WIN)
#include <winsock2.h>
+
#include "net/base/winsock_init.h"
#endif
diff --git a/net/base/network_interfaces_unittest.cc b/net/base/network_interfaces_unittest.cc
index 40cad1d..6b3498f 100644
--- a/net/base/network_interfaces_unittest.cc
+++ b/net/base/network_interfaces_unittest.cc
@@ -16,10 +16,12 @@
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
#include <net/if.h>
#elif BUILDFLAG(IS_WIN)
+#include <objbase.h>
+
#include <windows.h>
#include <iphlpapi.h>
-#include <objbase.h>
+
#include "base/strings/string_util.h"
#include "base/win/win_util.h"
#endif
diff --git a/net/base/network_interfaces_win.h b/net/base/network_interfaces_win.h
index d77d676..c43c594 100644
--- a/net/base/network_interfaces_win.h
+++ b/net/base/network_interfaces_win.h
@@ -9,6 +9,7 @@
// of network_interfaces_win.cc to tests.
#include <winsock2.h>
+
#include <iphlpapi.h>
#include <wlanapi.h>
diff --git a/net/base/network_interfaces_win_unittest.cc b/net/base/network_interfaces_win_unittest.cc
index 7bc0fe7..2879e8c 100644
--- a/net/base/network_interfaces_win_unittest.cc
+++ b/net/base/network_interfaces_win_unittest.cc
@@ -4,9 +4,10 @@
#include "net/base/network_interfaces_win.h"
-#include <iphlpapi.h>
#include <objbase.h>
+#include <iphlpapi.h>
+
#include <ostream>
#include <string>
#include <unordered_set>
diff --git a/net/base/platform_mime_util_win.cc b/net/base/platform_mime_util_win.cc
index c92468d..ecc6d007 100644
--- a/net/base/platform_mime_util_win.cc
+++ b/net/base/platform_mime_util_win.cc
@@ -4,13 +4,13 @@
#include "net/base/platform_mime_util.h"
+#include <windows.h>
+
#include <string>
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
-#include <windows.h>
-
namespace net {
bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
diff --git a/net/base/winsock_init.cc b/net/base/winsock_init.cc
index 946f5c3..0d26d6ae 100644
--- a/net/base/winsock_init.cc
+++ b/net/base/winsock_init.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <winsock2.h>
-
#include "net/base/winsock_init.h"
+#include <winsock2.h>
+
#include "base/check.h"
#include "base/lazy_instance.h"
diff --git a/net/base/winsock_util.h b/net/base/winsock_util.h
index 35bde23..6220ba4 100644
--- a/net/base/winsock_util.h
+++ b/net/base/winsock_util.h
@@ -5,9 +5,10 @@
#ifndef NET_BASE_WINSOCK_UTIL_H_
#define NET_BASE_WINSOCK_UTIL_H_
-#include <stddef.h>
#include <winsock2.h>
+#include <stddef.h>
+
namespace net {
// Bluetooth address size. Windows Bluetooth is supported via winsock.
diff --git a/net/cert/x509_util_win.h b/net/cert/x509_util_win.h
index d68d466..5e8a3c2 100644
--- a/net/cert/x509_util_win.h
+++ b/net/cert/x509_util_win.h
@@ -5,11 +5,11 @@
#ifndef NET_CERT_X509_UTIL_WIN_H_
#define NET_CERT_X509_UTIL_WIN_H_
+#include <windows.h>
+
#include <memory>
#include <vector>
-#include <windows.h>
-
#include "base/memory/scoped_refptr.h"
#include "base/win/wincrypt_shim.h"
#include "crypto/scoped_capi_types.h"
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc
index 13a73285..710c91e5 100644
--- a/net/disk_cache/backend_unittest.cc
+++ b/net/disk_cache/backend_unittest.cc
@@ -73,9 +73,9 @@
using testing::Field;
#if BUILDFLAG(IS_WIN)
-#include "base/win/scoped_handle.h"
-
#include <windows.h>
+
+#include "base/win/scoped_handle.h"
#endif
// TODO(crbug.com/949811): Fix memory leaks in tests and re-enable on LSAN.
diff --git a/net/disk_cache/blockfile/mapped_file_win.cc b/net/disk_cache/blockfile/mapped_file_win.cc
index d0b4739..804a504 100644
--- a/net/disk_cache/blockfile/mapped_file_win.cc
+++ b/net/disk_cache/blockfile/mapped_file_win.cc
@@ -4,14 +4,14 @@
#include "net/disk_cache/blockfile/mapped_file.h"
+#include <windows.h>
+
#include <memory>
#include "base/check.h"
#include "base/files/file_path.h"
#include "net/disk_cache/disk_cache.h"
-#include <windows.h>
-
namespace disk_cache {
void* MappedFile::Init(const base::FilePath& name, size_t size) {
diff --git a/net/dns/dns_config_service_win.h b/net/dns/dns_config_service_win.h
index bdfae7e..746dd76 100644
--- a/net/dns/dns_config_service_win.h
+++ b/net/dns/dns_config_service_win.h
@@ -8,6 +8,7 @@
// The sole purpose of dns_config_service_win.h is for unittests so we just
// include these headers here.
#include <winsock2.h>
+
#include <iphlpapi.h>
#include <iptypes.h>
diff --git a/net/dns/public/win_dns_system_settings.h b/net/dns/public/win_dns_system_settings.h
index 47c988e..4eebcb441 100644
--- a/net/dns/public/win_dns_system_settings.h
+++ b/net/dns/public/win_dns_system_settings.h
@@ -6,6 +6,7 @@
#define NET_DNS_PUBLIC_WIN_DNS_SYSTEM_SETTINGS_H_
#include <winsock2.h>
+
#include <iphlpapi.h>
#include <iptypes.h>
diff --git a/net/http/http_auth_sspi_win.h b/net/http/http_auth_sspi_win.h
index 08c7cd3..b46a627 100644
--- a/net/http/http_auth_sspi_win.h
+++ b/net/http/http_auth_sspi_win.h
@@ -8,12 +8,13 @@
#ifndef NET_HTTP_HTTP_AUTH_SSPI_WIN_H_
#define NET_HTTP_HTTP_AUTH_SSPI_WIN_H_
+#include <windows.h>
+
#include "base/memory/raw_ptr.h"
// security.h needs to be included for CredHandle. Unfortunately CredHandle
// is a typedef and can't be forward declared.
#define SECURITY_WIN32 1
-#include <windows.h>
#include <security.h>
#include <string>
diff --git a/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc b/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc
index 2edd449..879e203 100644
--- a/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc
+++ b/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc
@@ -4,6 +4,11 @@
#include "net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.h"
+#include <windows.h>
+#include <winsock2.h>
+
+#include <dhcpcsdk.h>
+
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
#include "base/location.h"
@@ -18,10 +23,6 @@
#include "net/proxy_resolution/win/dhcpcsvc_init_win.h"
#include "net/url_request/url_request_context.h"
-#include <windows.h>
-#include <winsock2.h>
-#include <dhcpcsdk.h>
-
namespace {
// Maximum amount of time to wait for response from the Win32 DHCP API.
diff --git a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc
index 404a3be3..446e5ff 100644
--- a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc
+++ b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc
@@ -4,6 +4,10 @@
#include "net/proxy_resolution/win/dhcp_pac_file_fetcher_win.h"
+#include <winsock2.h>
+
+#include <iphlpapi.h>
+
#include <memory>
#include <vector>
@@ -20,9 +24,6 @@
#include "net/log/net_log.h"
#include "net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.h"
-#include <winsock2.h>
-#include <iphlpapi.h>
-
namespace net {
namespace {
diff --git a/net/proxy_resolution/win/dhcpcsvc_init_win.cc b/net/proxy_resolution/win/dhcpcsvc_init_win.cc
index a1b1b6f..d2e2a62 100644
--- a/net/proxy_resolution/win/dhcpcsvc_init_win.cc
+++ b/net/proxy_resolution/win/dhcpcsvc_init_win.cc
@@ -4,14 +4,14 @@
#include "net/proxy_resolution/win/dhcpcsvc_init_win.h"
-#include "base/check_op.h"
-#include "base/lazy_instance.h"
-
-#include <windows.h> // Must be in front of other Windows header files.
+#include <windows.h>
#include <dhcpcsdk.h>
#include <dhcpv6csdk.h>
+#include "base/check_op.h"
+#include "base/lazy_instance.h"
+
namespace {
class DhcpcsvcInitSingleton {
diff --git a/net/proxy_resolution/win/proxy_config_service_win.cc b/net/proxy_resolution/win/proxy_config_service_win.cc
index 042a938e7d8..ac85d29 100644
--- a/net/proxy_resolution/win/proxy_config_service_win.cc
+++ b/net/proxy_resolution/win/proxy_config_service_win.cc
@@ -5,6 +5,7 @@
#include "net/proxy_resolution/win/proxy_config_service_win.h"
#include <windows.h>
+
#include <winhttp.h>
#include "base/functional/bind.h"
diff --git a/net/proxy_resolution/win/proxy_config_service_win.h b/net/proxy_resolution/win/proxy_config_service_win.h
index 97bdc6f9..7597fe6 100644
--- a/net/proxy_resolution/win/proxy_config_service_win.h
+++ b/net/proxy_resolution/win/proxy_config_service_win.h
@@ -6,6 +6,7 @@
#define NET_PROXY_RESOLUTION_WIN_PROXY_CONFIG_SERVICE_WIN_H_
#include <windows.h>
+
#include <winhttp.h>
#include <memory>
diff --git a/net/proxy_resolution/win/proxy_resolver_winhttp.cc b/net/proxy_resolution/win/proxy_resolver_winhttp.cc
index 53acf4d..4650100a 100644
--- a/net/proxy_resolution/win/proxy_resolver_winhttp.cc
+++ b/net/proxy_resolution/win/proxy_resolver_winhttp.cc
@@ -5,6 +5,7 @@
#include "net/proxy_resolution/win/proxy_resolver_winhttp.h"
#include <windows.h>
+
#include <winhttp.h>
#include <memory>
diff --git a/net/socket/socket_descriptor.cc b/net/socket/socket_descriptor.cc
index f6db3d82..3e252d0 100644
--- a/net/socket/socket_descriptor.cc
+++ b/net/socket/socket_descriptor.cc
@@ -8,6 +8,7 @@
#if BUILDFLAG(IS_WIN)
#include <ws2tcpip.h>
+
#include "net/base/winsock_init.h"
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
#include <sys/socket.h>
diff --git a/net/socket/tcp_socket_win.h b/net/socket/tcp_socket_win.h
index f6cc34e..5dd11fad 100644
--- a/net/socket/tcp_socket_win.h
+++ b/net/socket/tcp_socket_win.h
@@ -5,9 +5,10 @@
#ifndef NET_SOCKET_TCP_SOCKET_WIN_H_
#define NET_SOCKET_TCP_SOCKET_WIN_H_
-#include <stdint.h>
#include <winsock2.h>
+#include <stdint.h>
+
#include <memory>
#include "base/memory/raw_ptr.h"
diff --git a/net/socket/udp_socket_win.cc b/net/socket/udp_socket_win.cc
index 2e28570..b172fc36 100644
--- a/net/socket/udp_socket_win.cc
+++ b/net/socket/udp_socket_win.cc
@@ -4,9 +4,10 @@
#include "net/socket/udp_socket_win.h"
-#include <mstcpip.h>
#include <winsock2.h>
+#include <mstcpip.h>
+
#include <memory>
#include "base/check_op.h"
diff --git a/net/socket/udp_socket_win.h b/net/socket/udp_socket_win.h
index b4008db..97dd806 100644
--- a/net/socket/udp_socket_win.h
+++ b/net/socket/udp_socket_win.h
@@ -5,9 +5,10 @@
#ifndef NET_SOCKET_UDP_SOCKET_WIN_H_
#define NET_SOCKET_UDP_SOCKET_WIN_H_
+#include <winsock2.h>
+
#include <qos2.h>
#include <stdint.h>
-#include <winsock2.h>
// Must be after winsock2.h:
#include <MSWSock.h>
diff --git a/net/ssl/client_cert_store_win.cc b/net/ssl/client_cert_store_win.cc
index 4e332f4..4f45df91 100644
--- a/net/ssl/client_cert_store_win.cc
+++ b/net/ssl/client_cert_store_win.cc
@@ -9,8 +9,9 @@
#include <memory>
#include <string>
-#define SECURITY_WIN32 // Needs to be defined before including security.h
#include <windows.h>
+
+#define SECURITY_WIN32
#include <security.h>
#include "base/functional/bind.h"
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 2965548..aba8058 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -156,8 +156,10 @@
#if BUILDFLAG(IS_WIN)
#include <objbase.h>
-#include <shlobj.h>
+
#include <windows.h>
+
+#include <shlobj.h>
#include <wrl/client.h>
#include "base/win/scoped_com_initializer.h"
diff --git a/ppapi/tests/pp_thread.h b/ppapi/tests/pp_thread.h
index 2cc99966..c4d6361 100644
--- a/ppapi/tests/pp_thread.h
+++ b/ppapi/tests/pp_thread.h
@@ -12,8 +12,9 @@
#if defined(PPAPI_POSIX)
#include <pthread.h>
#elif defined(PPAPI_OS_WIN)
-#include <process.h>
#include <windows.h>
+
+#include <process.h>
#else
#error No thread library detected.
#endif
diff --git a/printing/backend/spooler_win.cc b/printing/backend/spooler_win.cc
index 3bd1aa4..203b99e 100644
--- a/printing/backend/spooler_win.cc
+++ b/printing/backend/spooler_win.cc
@@ -5,6 +5,7 @@
#include "printing/backend/spooler_win.h"
#include <windows.h>
+
#include <winspool.h>
#include <winsvc.h>
diff --git a/printing/emf_win.h b/printing/emf_win.h
index f4cd909..afcad61 100644
--- a/printing/emf_win.h
+++ b/printing/emf_win.h
@@ -5,9 +5,10 @@
#ifndef PRINTING_EMF_WIN_H_
#define PRINTING_EMF_WIN_H_
+#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
-#include <windows.h>
#include <memory>
#include <vector>
diff --git a/printing/printing_test.h b/printing/printing_test.h
index 17ed1bc..e4b9999 100644
--- a/printing/printing_test.h
+++ b/printing/printing_test.h
@@ -6,6 +6,7 @@
#define PRINTING_PRINTING_TEST_H_
#include <windows.h>
+
#include <winspool.h>
#include <string>
diff --git a/remoting/base/breakpad_win.cc b/remoting/base/breakpad_win.cc
index dd1c7a7..16b51388 100644
--- a/remoting/base/breakpad_win.cc
+++ b/remoting/base/breakpad_win.cc
@@ -9,9 +9,10 @@
#include "remoting/base/breakpad.h"
-#include <crtdbg.h>
#include <windows.h>
+#include <crtdbg.h>
+
#include <memory>
#include <string>
diff --git a/remoting/host/audio_capturer_win.cc b/remoting/host/audio_capturer_win.cc
index 1c94e96..54b5916b 100644
--- a/remoting/host/audio_capturer_win.cc
+++ b/remoting/host/audio_capturer_win.cc
@@ -4,13 +4,15 @@
#include "remoting/host/audio_capturer_win.h"
+#include <objbase.h>
+
+#include <windows.h>
+
#include <avrt.h>
#include <mmreg.h>
#include <mmsystem.h>
-#include <objbase.h>
#include <stdint.h>
#include <stdlib.h>
-#include <windows.h>
#include <algorithm>
#include <memory>
diff --git a/remoting/host/curtain_mode_win.cc b/remoting/host/curtain_mode_win.cc
index f69882e..2be49af 100644
--- a/remoting/host/curtain_mode_win.cc
+++ b/remoting/host/curtain_mode_win.cc
@@ -4,13 +4,13 @@
#include "remoting/host/curtain_mode.h"
+#include <windows.h>
+
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/task/single_thread_task_runner.h"
#include "remoting/host/client_session_control.h"
-#include <windows.h>
-
namespace remoting {
class CurtainModeWin : public CurtainMode {
diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc
index c2b52c1d..6cbd0553 100644
--- a/remoting/host/desktop_session_win.cc
+++ b/remoting/host/desktop_session_win.cc
@@ -5,6 +5,7 @@
#include "remoting/host/desktop_session_win.h"
#include <objbase.h>
+
#include <sddl.h>
#include <wrl/client.h>
diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc
index 32f2aee..dcf0b21b 100644
--- a/remoting/host/disconnect_window_win.cc
+++ b/remoting/host/disconnect_window_win.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include <cstdlib>
#include <memory>
diff --git a/remoting/host/file_transfer/directory_helpers_win.cc b/remoting/host/file_transfer/directory_helpers_win.cc
index 25f5430..dae00fa3 100644
--- a/remoting/host/file_transfer/directory_helpers_win.cc
+++ b/remoting/host/file_transfer/directory_helpers_win.cc
@@ -4,9 +4,10 @@
#include "remoting/host/file_transfer/directory_helpers.h"
-#include <shlobj.h>
#include <windows.h>
+#include <shlobj.h>
+
#include "base/check_is_test.h"
#include "base/logging.h"
#include "base/win/scoped_handle.h"
diff --git a/remoting/host/file_transfer/file_chooser_main_win.cc b/remoting/host/file_transfer/file_chooser_main_win.cc
index e3cef0b2..2fad992 100644
--- a/remoting/host/file_transfer/file_chooser_main_win.cc
+++ b/remoting/host/file_transfer/file_chooser_main_win.cc
@@ -2,8 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <shlobj.h>
#include <windows.h>
+
+#include <shlobj.h>
#include <wrl/client.h>
#include <cstdio>
diff --git a/remoting/host/file_transfer/file_chooser_win.cc b/remoting/host/file_transfer/file_chooser_win.cc
index 25c39857..83b194f 100644
--- a/remoting/host/file_transfer/file_chooser_win.cc
+++ b/remoting/host/file_transfer/file_chooser_win.cc
@@ -5,6 +5,7 @@
#include "remoting/host/file_transfer/file_chooser.h"
#include <windows.h>
+
#include <wtsapi32.h>
#include <cstdlib>
diff --git a/remoting/host/host_event_logger_win.cc b/remoting/host/host_event_logger_win.cc
index 66cc3f48..31c9b3025 100644
--- a/remoting/host/host_event_logger_win.cc
+++ b/remoting/host/host_event_logger_win.cc
@@ -4,9 +4,10 @@
#include "remoting/host/host_event_logger.h"
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include <memory>
#include <string>
#include <vector>
diff --git a/remoting/host/input_injector_win.cc b/remoting/host/input_injector_win.cc
index 52bcb8b..9761d5d4 100644
--- a/remoting/host/input_injector_win.cc
+++ b/remoting/host/input_injector_win.cc
@@ -4,15 +4,16 @@
#include "remoting/host/input_injector.h"
-#include <stdint.h>
#include <windows.h>
+#include <stdint.h>
+
#include <algorithm>
+#include <optional>
#include <string>
#include <utility>
#include <vector>
-#include <optional>
#include "base/compiler_specific.h"
#include "base/functional/bind.h"
#include "base/location.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_win.cc b/remoting/host/it2me/it2me_confirmation_dialog_win.cc
index 1e4748c..cc6416fb 100644
--- a/remoting/host/it2me/it2me_confirmation_dialog_win.cc
+++ b/remoting/host/it2me/it2me_confirmation_dialog_win.cc
@@ -5,6 +5,7 @@
#include "remoting/host/it2me/it2me_confirmation_dialog.h"
#include <windows.h>
+
#include <commctrl.h>
#include <cstdint>
diff --git a/remoting/host/keyboard_layout_monitor_win.cc b/remoting/host/keyboard_layout_monitor_win.cc
index 70f7f6d..d8fe1ac 100644
--- a/remoting/host/keyboard_layout_monitor_win.cc
+++ b/remoting/host/keyboard_layout_monitor_win.cc
@@ -5,6 +5,7 @@
#include "remoting/host/keyboard_layout_monitor.h"
#include <windows.h>
+
#include <ime.h>
#include <memory>
diff --git a/remoting/host/pairing_registry_delegate_win.cc b/remoting/host/pairing_registry_delegate_win.cc
index c4686c2..3bd8715d 100644
--- a/remoting/host/pairing_registry_delegate_win.cc
+++ b/remoting/host/pairing_registry_delegate_win.cc
@@ -4,17 +4,17 @@
#include "remoting/host/pairing_registry_delegate_win.h"
-#include <utility>
+#include <windows.h>
#include <optional>
+#include <utility>
+
#include "base/json/json_string_value_serializer.h"
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "base/win/registry.h"
-#include <windows.h>
-
namespace remoting {
namespace {
diff --git a/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc b/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc
index 10959ee..7530ef6 100644
--- a/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc
+++ b/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc
@@ -3,8 +3,10 @@
// found in the LICENSE file.
#include <objbase.h>
-#include <shlobj.h>
+
#include <shobjidl.h>
+
+#include <shlobj.h>
#include <wrl/client.h>
#include <cwchar>
diff --git a/remoting/host/remote_open_url/url_forwarder_configurator_win.cc b/remoting/host/remote_open_url/url_forwarder_configurator_win.cc
index 905c0e27..5ac5982 100644
--- a/remoting/host/remote_open_url/url_forwarder_configurator_win.cc
+++ b/remoting/host/remote_open_url/url_forwarder_configurator_win.cc
@@ -5,7 +5,9 @@
#include "remoting/host/remote_open_url/url_forwarder_configurator_win.h"
#include <windows.h>
+
#include <wtsapi32.h>
+
#include <memory>
#include <string>
diff --git a/remoting/host/setup/me2me_native_messaging_host_main.cc b/remoting/host/setup/me2me_native_messaging_host_main.cc
index 67d5704..591a68e 100644
--- a/remoting/host/setup/me2me_native_messaging_host_main.cc
+++ b/remoting/host/setup/me2me_native_messaging_host_main.cc
@@ -44,11 +44,11 @@
#endif // BUILDFLAG(IS_APPLE)
#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+
#include "base/process/process_info.h"
#include "base/win/registry.h"
#include "remoting/host/pairing_registry_delegate_win.h"
-
-#include <windows.h>
#endif // BUILDFLAG(IS_WIN)
#if defined(USE_GLIB) && !BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/remoting/host/setup/start_host_main.cc b/remoting/host/setup/start_host_main.cc
index aade498..c70a79b9b 100644
--- a/remoting/host/setup/start_host_main.cc
+++ b/remoting/host/setup/start_host_main.cc
@@ -44,9 +44,9 @@
#endif // BUILDFLAG(IS_LINUX)
#if BUILDFLAG(IS_WIN)
-#include "base/process/process_info.h"
-
#include <windows.h>
+
+#include "base/process/process_info.h"
#endif // BUILDFLAG(IS_WIN)
namespace remoting {
diff --git a/remoting/host/usage_stats_consent_win.cc b/remoting/host/usage_stats_consent_win.cc
index 6484ca4..708d50fe 100644
--- a/remoting/host/usage_stats_consent_win.cc
+++ b/remoting/host/usage_stats_consent_win.cc
@@ -5,6 +5,7 @@
#include "remoting/host/usage_stats_consent.h"
#include <windows.h>
+
#include <string>
#include "base/logging.h"
diff --git a/remoting/host/win/host_service.cc b/remoting/host/win/host_service.cc
index ea15568..93d4a8e 100644
--- a/remoting/host/win/host_service.cc
+++ b/remoting/host/win/host_service.cc
@@ -8,6 +8,7 @@
#include "remoting/host/win/host_service.h"
#include <windows.h>
+
#include <sddl.h>
#include <wtsapi32.h>
diff --git a/remoting/host/win/host_service.h b/remoting/host/win/host_service.h
index 3197e188..5fb698b 100644
--- a/remoting/host/win/host_service.h
+++ b/remoting/host/win/host_service.h
@@ -6,6 +6,7 @@
#define REMOTING_HOST_WIN_HOST_SERVICE_H_
#include <windows.h>
+
#include <stdint.h>
#include <list>
diff --git a/remoting/host/win/launch_native_messaging_host_process.cc b/remoting/host/win/launch_native_messaging_host_process.cc
index 826d828..8646f76 100644
--- a/remoting/host/win/launch_native_messaging_host_process.cc
+++ b/remoting/host/win/launch_native_messaging_host_process.cc
@@ -5,6 +5,7 @@
#include "remoting/host/win/launch_native_messaging_host_process.h"
#include <windows.h>
+
#include <shellapi.h>
#include <cstdint>
diff --git a/remoting/host/win/launch_process_with_token.h b/remoting/host/win/launch_process_with_token.h
index d683c83..0df8b816 100644
--- a/remoting/host/win/launch_process_with_token.h
+++ b/remoting/host/win/launch_process_with_token.h
@@ -6,6 +6,7 @@
#define REMOTING_HOST_WIN_LAUNCH_PROCESS_WITH_TOKEN_H_
#include <windows.h>
+
#include <stdint.h>
#include "base/command_line.h"
diff --git a/remoting/host/win/simple_task_dialog.h b/remoting/host/win/simple_task_dialog.h
index 32aedf3..3ae19e1 100644
--- a/remoting/host/win/simple_task_dialog.h
+++ b/remoting/host/win/simple_task_dialog.h
@@ -9,11 +9,11 @@
#include <commctrl.h>
+#include <optional>
#include <string>
#include <utility>
#include <vector>
-#include <optional>
#include "base/sequence_checker.h"
#include "base/thread_annotations.h"
#include "base/time/time.h"
diff --git a/remoting/host/win/wts_session_change_observer.cc b/remoting/host/win/wts_session_change_observer.cc
index 39c4bc2..ef30480 100644
--- a/remoting/host/win/wts_session_change_observer.cc
+++ b/remoting/host/win/wts_session_change_observer.cc
@@ -5,6 +5,7 @@
#include "remoting/host/win/wts_session_change_observer.h"
#include <windows.h>
+
#include <winuser.h>
#include <wtsapi32.h>
diff --git a/remoting/host/win/wts_terminal_monitor.cc b/remoting/host/win/wts_terminal_monitor.cc
index 616ab7a..f1e13d1a 100644
--- a/remoting/host/win/wts_terminal_monitor.cc
+++ b/remoting/host/win/wts_terminal_monitor.cc
@@ -5,6 +5,7 @@
#include "remoting/host/win/wts_terminal_monitor.h"
#include <windows.h>
+
#include <wtsapi32.h>
#include "base/logging.h"
diff --git a/remoting/host/win/wts_terminal_observer.h b/remoting/host/win/wts_terminal_observer.h
index 762962f..19403e2 100644
--- a/remoting/host/win/wts_terminal_observer.h
+++ b/remoting/host/win/wts_terminal_observer.h
@@ -6,6 +6,7 @@
#define REMOTING_HOST_WIN_WTS_TERMINAL_OBSERVER_H_
#include <windows.h>
+
#include <stdint.h>
namespace remoting {
diff --git a/remoting/tools/breakpad_tester_win.cc b/remoting/tools/breakpad_tester_win.cc
index 5287fdaa..d27178fb 100644
--- a/remoting/tools/breakpad_tester_win.cc
+++ b/remoting/tools/breakpad_tester_win.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <windows.h>
+
#include <stdlib.h>
#include "base/at_exit.h"
diff --git a/rlz/win/lib/lib_mutex.cc b/rlz/win/lib/lib_mutex.cc
index 0b810b24..9f61991 100644
--- a/rlz/win/lib/lib_mutex.cc
+++ b/rlz/win/lib/lib_mutex.cc
@@ -5,6 +5,7 @@
#include "rlz/win/lib/lib_mutex.h"
#include <windows.h>
+
#include "base/win/windows_version.h"
namespace {
diff --git a/rlz/win/lib/machine_deal.cc b/rlz/win/lib/machine_deal.cc
index 852f9ff..536488e 100644
--- a/rlz/win/lib/machine_deal.cc
+++ b/rlz/win/lib/machine_deal.cc
@@ -7,6 +7,7 @@
#include "rlz/win/lib/machine_deal.h"
#include <windows.h>
+
#include <stddef.h>
#include <vector>
diff --git a/rlz/win/lib/machine_id_win.cc b/rlz/win/lib/machine_id_win.cc
index c0bf115..5e4ab93b 100644
--- a/rlz/win/lib/machine_id_win.cc
+++ b/rlz/win/lib/machine_id_win.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include <windows.h>
+
#include <Sddl.h> // For ConvertSidToStringSidW.
#include <memory>
diff --git a/rlz/win/lib/process_info.cc b/rlz/win/lib/process_info.cc
index 842afdd..4ec05f4a 100644
--- a/rlz/win/lib/process_info.cc
+++ b/rlz/win/lib/process_info.cc
@@ -4,13 +4,14 @@
//
// Information about the current process.
-#include <string>
-
#include "rlz/win/lib/process_info.h"
#include <windows.h>
+
#include <stddef.h>
+#include <string>
+
#include "base/process/process_info.h"
#include "base/win/scoped_handle.h"
#include "base/win/win_util.h"
diff --git a/rlz/win/lib/registry_util.cc b/rlz/win/lib/registry_util.cc
index d099a20..930217cd 100644
--- a/rlz/win/lib/registry_util.cc
+++ b/rlz/win/lib/registry_util.cc
@@ -7,6 +7,8 @@
#include "rlz/win/lib/registry_util.h"
+#include <windows.h>
+
#include "base/process/process_info.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
@@ -14,8 +16,6 @@
#include "rlz/lib/assert.h"
#include "rlz/win/lib/process_info.h"
-#include <windows.h>
-
namespace rlz_lib {
bool RegKeyReadValue(const base::win::RegKey& key, const wchar_t* name,
diff --git a/rlz/win/lib/rlz_lib_win.cc b/rlz/win/lib/rlz_lib_win.cc
index 71944c2..23549e5 100644
--- a/rlz/win/lib/rlz_lib_win.cc
+++ b/rlz/win/lib/rlz_lib_win.cc
@@ -5,9 +5,8 @@
// A library to manage RLZ information for access-points shared
// across different client applications.
-#include "rlz/lib/machine_deal_win.h"
-
#include <windows.h>
+
#include <aclapi.h>
#include <stddef.h>
#include <winerror.h>
@@ -16,6 +15,7 @@
#include "base/win/registry.h"
#include "rlz/lib/assert.h"
+#include "rlz/lib/machine_deal_win.h"
#include "rlz/lib/rlz_value_store.h"
#include "rlz/win/lib/machine_deal.h"
#include "rlz/win/lib/rlz_value_store_registry.h"
diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc
index 6e97b56..8b41e05f 100644
--- a/sandbox/policy/win/sandbox_win.cc
+++ b/sandbox/policy/win/sandbox_win.cc
@@ -4,18 +4,19 @@
#include "sandbox/policy/win/sandbox_win.h"
-#include <stddef.h>
#include <windows.h>
+
+#include <stddef.h>
#include <winternl.h>
#include <map>
+#include <optional>
#include <sstream>
#include <string>
#include <string_view>
#include <utility>
#include <vector>
-#include <optional>
#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/feature_list.h"
diff --git a/sandbox/policy/win/sandbox_win_unittest.cc b/sandbox/policy/win/sandbox_win_unittest.cc
index e16f7c2..7c5753b8 100644
--- a/sandbox/policy/win/sandbox_win_unittest.cc
+++ b/sandbox/policy/win/sandbox_win_unittest.cc
@@ -4,12 +4,12 @@
#include "sandbox/policy/win/sandbox_win.h"
+#include <windows.h>
+
#include <set>
#include <string>
#include <vector>
-#include <windows.h>
-
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
diff --git a/sandbox/win/src/alternate_desktop.cc b/sandbox/win/src/alternate_desktop.cc
index ef88d0b..f6017be 100644
--- a/sandbox/win/src/alternate_desktop.cc
+++ b/sandbox/win/src/alternate_desktop.cc
@@ -4,12 +4,12 @@
#include "sandbox/win/src/alternate_desktop.h"
+#include <windows.h>
+
#include "base/win/win_util.h"
#include "sandbox/win/src/acl.h"
#include "sandbox/win/src/window.h"
-#include <windows.h>
-
namespace sandbox {
AlternateDesktop::~AlternateDesktop() {
diff --git a/sandbox/win/src/app_container_base.cc b/sandbox/win/src/app_container_base.cc
index 8fd0b01..df8d87a 100644
--- a/sandbox/win/src/app_container_base.cc
+++ b/sandbox/win/src/app_container_base.cc
@@ -4,13 +4,13 @@
#include "sandbox/win/src/app_container_base.h"
-#include <memory>
-#include <utility>
-
#include <windows.h>
#include <userenv.h>
+#include <memory>
+#include <utility>
+
#include "base/win/security_descriptor.h"
#include "sandbox/win/src/acl.h"
#include "sandbox/win/src/restricted_token_utils.h"
diff --git a/sandbox/win/src/crosscall_params.h b/sandbox/win/src/crosscall_params.h
index 55cd419..a453a40 100644
--- a/sandbox/win/src/crosscall_params.h
+++ b/sandbox/win/src/crosscall_params.h
@@ -8,7 +8,6 @@
#include <windows.h>
#include <lmaccess.h>
-
#include <stddef.h>
#include <stdint.h>
diff --git a/sandbox/win/src/file_policy_test.cc b/sandbox/win/src/file_policy_test.cc
index 3b3eaf8..34fc8c9 100644
--- a/sandbox/win/src/file_policy_test.cc
+++ b/sandbox/win/src/file_policy_test.cc
@@ -2,13 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <algorithm>
+#include <windows.h>
#include <ntstatus.h>
-#include <windows.h>
#include <winioctl.h>
#include <winternl.h>
+#include <algorithm>
+
#include "base/strings/string_util_win.h"
#include "base/win/scoped_handle.h"
#include "sandbox/win/src/filesystem_policy.h"
diff --git a/sandbox/win/src/filesystem_policy.cc b/sandbox/win/src/filesystem_policy.cc
index 1a62c42f..8162587 100644
--- a/sandbox/win/src/filesystem_policy.cc
+++ b/sandbox/win/src/filesystem_policy.cc
@@ -5,10 +5,10 @@
#include "sandbox/win/src/filesystem_policy.h"
#include <windows.h>
-#include <winternl.h>
#include <ntstatus.h>
#include <stdint.h>
+#include <winternl.h>
#include <string>
diff --git a/sandbox/win/src/integrity_level_test.cc b/sandbox/win/src/integrity_level_test.cc
index 42e9871..eb45cea2 100644
--- a/sandbox/win/src/integrity_level_test.cc
+++ b/sandbox/win/src/integrity_level_test.cc
@@ -7,6 +7,7 @@
#include <atlsecurity.h>
#include <optional>
+
#include "base/process/process_info.h"
#include "base/win/access_token.h"
#include "sandbox/win/src/sandbox.h"
diff --git a/sandbox/win/src/interception_agent.h b/sandbox/win/src/interception_agent.h
index 63eae25..dd48a13 100644
--- a/sandbox/win/src/interception_agent.h
+++ b/sandbox/win/src/interception_agent.h
@@ -10,6 +10,7 @@
#define SANDBOX_WIN_SRC_INTERCEPTION_AGENT_H_
#include <windows.h>
+
#include <winternl.h>
#include "base/memory/raw_ptr_exclusion.h"
diff --git a/sandbox/win/src/ipc_leak_test.cc b/sandbox/win/src/ipc_leak_test.cc
index d7b3e8f..b741cd4 100644
--- a/sandbox/win/src/ipc_leak_test.cc
+++ b/sandbox/win/src/ipc_leak_test.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <windows.h>
+
#include <ntstatus.h>
#include <stdlib.h>
-#include <windows.h>
#include <winternl.h>
#include <memory>
diff --git a/sandbox/win/src/job.cc b/sandbox/win/src/job.cc
index 1bb579f..de239e2 100644
--- a/sandbox/win/src/job.cc
+++ b/sandbox/win/src/job.cc
@@ -7,6 +7,7 @@
#include <windows.h>
#include <stddef.h>
+
#include <utility>
#include "sandbox/win/src/restricted_token.h"
diff --git a/sandbox/win/src/lpc_policy_test.cc b/sandbox/win/src/lpc_policy_test.cc
index cf6b0f26..6ca852fe 100644
--- a/sandbox/win/src/lpc_policy_test.cc
+++ b/sandbox/win/src/lpc_policy_test.cc
@@ -5,11 +5,12 @@
// These tests have been added to specifically tests issues arising from (A)LPC
// lock down.
-#include <algorithm>
-
#include <windows.h>
+
#include <winioctl.h>
+#include <algorithm>
+
#include "build/build_config.h"
#include "sandbox/win/src/heap_helper.h"
#include "sandbox/win/src/sandbox.h"
diff --git a/sandbox/win/src/process_mitigations.cc b/sandbox/win/src/process_mitigations.cc
index 2b870c0..5ab3033 100644
--- a/sandbox/win/src/process_mitigations.cc
+++ b/sandbox/win/src/process_mitigations.cc
@@ -4,8 +4,9 @@
#include "sandbox/win/src/process_mitigations.h"
-#include <stddef.h>
#include <windows.h>
+
+#include <stddef.h>
#include <wow64apiset.h>
#include <algorithm>
diff --git a/sandbox/win/src/process_mitigations_dyncode_unittest.cc b/sandbox/win/src/process_mitigations_dyncode_unittest.cc
index cfd4e03..eafee6b 100644
--- a/sandbox/win/src/process_mitigations_dyncode_unittest.cc
+++ b/sandbox/win/src/process_mitigations_dyncode_unittest.cc
@@ -2,15 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/memory/raw_ptr.h"
-#include "sandbox/win/src/process_mitigations.h"
-
#include <windows.h>
#include <string>
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
+#include "base/memory/raw_ptr.h"
#include "base/path_service.h"
#include "base/strings/strcat_win.h"
#include "base/strings/string_number_conversions_win.h"
diff --git a/sandbox/win/src/process_mitigations_extensionpoints_unittest.cc b/sandbox/win/src/process_mitigations_extensionpoints_unittest.cc
index fef8581..202e88b 100644
--- a/sandbox/win/src/process_mitigations_extensionpoints_unittest.cc
+++ b/sandbox/win/src/process_mitigations_extensionpoints_unittest.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sandbox/win/src/process_mitigations.h"
-
#include <windows.h>
#include <psapi.h>
@@ -12,6 +10,7 @@
#include "base/win/registry.h"
#include "base/win/startup_information.h"
#include "base/win/win_util.h"
+#include "sandbox/win/src/process_mitigations.h"
#include "sandbox/win/tests/common/controller.h"
#include "sandbox/win/tests/integration_tests/hooking_dll.h"
#include "sandbox/win/tests/integration_tests/hooking_win_proc.h"
diff --git a/sandbox/win/src/process_mitigations_unittest.cc b/sandbox/win/src/process_mitigations_unittest.cc
index 1734887..9ea82c3 100644
--- a/sandbox/win/src/process_mitigations_unittest.cc
+++ b/sandbox/win/src/process_mitigations_unittest.cc
@@ -4,10 +4,11 @@
#include "sandbox/win/src/process_mitigations.h"
+#include <windows.h>
+
#include <excpt.h>
#include <ktmw32.h>
#include <ntstatus.h>
-#include <windows.h>
#include "base/files/file_util.h"
#include "base/numerics/safe_conversions.h"
diff --git a/sandbox/win/src/process_mitigations_win32k_unittest.cc b/sandbox/win/src/process_mitigations_win32k_unittest.cc
index befe593d..ac2ab25 100644
--- a/sandbox/win/src/process_mitigations_win32k_unittest.cc
+++ b/sandbox/win/src/process_mitigations_win32k_unittest.cc
@@ -2,12 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sandbox/win/src/process_mitigations.h"
-
#include <windows.h>
#include <string>
+#include "sandbox/win/src/process_mitigations.h"
#include "sandbox/win/src/process_mitigations_win32k_policy.h"
#include "sandbox/win/src/sandbox_policy.h"
#include "sandbox/win/tests/common/controller.h"
diff --git a/sandbox/win/src/restricted_token_unittest.cc b/sandbox/win/src/restricted_token_unittest.cc
index 29e679835..dc84269a 100644
--- a/sandbox/win/src/restricted_token_unittest.cc
+++ b/sandbox/win/src/restricted_token_unittest.cc
@@ -8,10 +8,10 @@
#include <windows.h>
+#include <optional>
#include <utility>
#include <vector>
-#include <optional>
#include "base/ranges/algorithm.h"
#include "base/win/access_control_list.h"
#include "base/win/access_token.h"
diff --git a/sandbox/win/src/sandbox_nt_util_unittest.cc b/sandbox/win/src/sandbox_nt_util_unittest.cc
index 18bcc5f..1608809 100644
--- a/sandbox/win/src/sandbox_nt_util_unittest.cc
+++ b/sandbox/win/src/sandbox_nt_util_unittest.cc
@@ -4,8 +4,9 @@
#include "sandbox/win/src/sandbox_nt_util.h"
-#include <ntstatus.h>
#include <windows.h>
+
+#include <ntstatus.h>
#include <winternl.h>
#include <memory>
diff --git a/sandbox/win/src/target_process.cc b/sandbox/win/src/target_process.cc
index b7f1ba4e..5b11778 100644
--- a/sandbox/win/src/target_process.cc
+++ b/sandbox/win/src/target_process.cc
@@ -4,9 +4,9 @@
#include "sandbox/win/src/target_process.h"
-#include <processenv.h>
#include <windows.h>
+#include <processenv.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/sandbox/win/src/target_services.cc b/sandbox/win/src/target_services.cc
index e5abfde..9752ea8 100644
--- a/sandbox/win/src/target_services.cc
+++ b/sandbox/win/src/target_services.cc
@@ -7,12 +7,12 @@
#include <windows.h>
#include <winsock2.h>
-#include <new>
-
#include <process.h>
#include <stdint.h>
+#include <new>
#include <optional>
+
#include "base/containers/span.h"
#include "base/logging.h"
#include "base/win/access_token.h"
diff --git a/sandbox/win/src/window.cc b/sandbox/win/src/window.cc
index 95a1f1c..f245b1eb 100644
--- a/sandbox/win/src/window.cc
+++ b/sandbox/win/src/window.cc
@@ -7,6 +7,7 @@
#include <windows.h>
#include <optional>
+
#include "base/notreached.h"
#include "base/win/security_descriptor.h"
#include "base/win/sid.h"
diff --git a/sandbox/win/src/zero_appshim_unittest.cc b/sandbox/win/src/zero_appshim_unittest.cc
index 904ef0f..6afae4b 100644
--- a/sandbox/win/src/zero_appshim_unittest.cc
+++ b/sandbox/win/src/zero_appshim_unittest.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <ntstatus.h>
#include <windows.h>
+#include <ntstatus.h>
+
#include "sandbox/win/src/nt_internals.h"
#include "sandbox/win/src/sandbox_nt_util.h"
#include "sandbox/win/src/target_services.h"
diff --git a/sandbox/win/tests/common/controller.h b/sandbox/win/tests/common/controller.h
index 10ab1bd..44a5f3d 100644
--- a/sandbox/win/tests/common/controller.h
+++ b/sandbox/win/tests/common/controller.h
@@ -6,6 +6,7 @@
#define SANDBOX_WIN_TESTS_COMMON_CONTROLLER_H_
#include <windows.h>
+
#include <string>
#include "base/dcheck_is_on.h"
diff --git a/sandbox/win/tests/integration_tests/cfi_unittest.cc b/sandbox/win/tests/integration_tests/cfi_unittest.cc
index 31c7e55..9dd730b 100644
--- a/sandbox/win/tests/integration_tests/cfi_unittest.cc
+++ b/sandbox/win/tests/integration_tests/cfi_unittest.cc
@@ -1,10 +1,10 @@
// Copyright 2020 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <intrin.h>
-
#include <windows.h>
+#include <intrin.h>
+
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/notreached.h"
diff --git a/sandbox/win/tests/integration_tests/hooking_dll.cc b/sandbox/win/tests/integration_tests/hooking_dll.cc
index 2043550..9a1e823 100644
--- a/sandbox/win/tests/integration_tests/hooking_dll.cc
+++ b/sandbox/win/tests/integration_tests/hooking_dll.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <stdio.h>
#include <windows.h>
+#include <stdio.h>
+
#define BUILDING_DLL
#include "hooking_dll.h"
diff --git a/sandbox/win/tests/integration_tests/hooking_win_proc.cc b/sandbox/win/tests/integration_tests/hooking_win_proc.cc
index 4798401..d39b86e 100644
--- a/sandbox/win/tests/integration_tests/hooking_win_proc.cc
+++ b/sandbox/win/tests/integration_tests/hooking_win_proc.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <windows.h>
-
#include "hooking_win_proc.h"
+#include <windows.h>
+
LRESULT CALLBACK WndProc(HWND window,
UINT message,
WPARAM w_param,
diff --git a/sandbox/win/tests/integration_tests/integration_tests_test.cc b/sandbox/win/tests/integration_tests/integration_tests_test.cc
index ba69add1..e3c7318 100644
--- a/sandbox/win/tests/integration_tests/integration_tests_test.cc
+++ b/sandbox/win/tests/integration_tests/integration_tests_test.cc
@@ -4,11 +4,11 @@
// Some tests for the framework itself.
+#include <windows.h>
+
#include <stddef.h>
#include <stdlib.h>
-#include <windows.h>
-
#include "base/debug/alias.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/stringprintf.h"
diff --git a/sandbox/win/tests/validation_tests/commands.cc b/sandbox/win/tests/validation_tests/commands.cc
index 8b5f3ff..706653e 100644
--- a/sandbox/win/tests/validation_tests/commands.cc
+++ b/sandbox/win/tests/validation_tests/commands.cc
@@ -2,13 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <Aclapi.h>
-#include <windows.h>
-#include <stddef.h>
-#include <string>
-
#include "sandbox/win/tests/validation_tests/commands.h"
+#include <windows.h>
+
+#include <Aclapi.h>
+#include <stddef.h>
+
+#include <string>
+
#include "sandbox/win/tests/common/controller.h"
namespace {
diff --git a/services/device/battery/battery_status_manager_win.h b/services/device/battery/battery_status_manager_win.h
index 56a5af9..78d9483 100644
--- a/services/device/battery/battery_status_manager_win.h
+++ b/services/device/battery/battery_status_manager_win.h
@@ -6,6 +6,7 @@
#define SERVICES_DEVICE_BATTERY_BATTERY_STATUS_MANAGER_WIN_H_
#include <windows.h>
+
#include "services/device/public/mojom/battery_status.mojom.h"
namespace device {
diff --git a/services/device/generic_sensor/platform_sensor_provider_win.cc b/services/device/generic_sensor/platform_sensor_provider_win.cc
index 9170ef7a..b68abaf 100644
--- a/services/device/generic_sensor/platform_sensor_provider_win.cc
+++ b/services/device/generic_sensor/platform_sensor_provider_win.cc
@@ -4,9 +4,10 @@
#include "services/device/generic_sensor/platform_sensor_provider_win.h"
-#include <comdef.h>
#include <objbase.h>
+#include <comdef.h>
+
#include <iomanip>
#include "base/functional/bind.h"
diff --git a/services/device/generic_sensor/platform_sensor_reader_win.cc b/services/device/generic_sensor/platform_sensor_reader_win.cc
index 23c47cd..9c36d40a 100644
--- a/services/device/generic_sensor/platform_sensor_reader_win.cc
+++ b/services/device/generic_sensor/platform_sensor_reader_win.cc
@@ -4,9 +4,10 @@
#include "services/device/generic_sensor/platform_sensor_reader_win.h"
+#include <objbase.h>
+
#include <Sensors.h>
#include <comdef.h>
-#include <objbase.h>
#include <wrl/implements.h>
#include <iomanip>
diff --git a/services/device/geolocation/wifi_data_provider_common_win.h b/services/device/geolocation/wifi_data_provider_common_win.h
index ac91eccd..e9b80d4 100644
--- a/services/device/geolocation/wifi_data_provider_common_win.h
+++ b/services/device/geolocation/wifi_data_provider_common_win.h
@@ -6,6 +6,7 @@
#define SERVICES_DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_COMMON_WIN_H_
#include <windows.h>
+
#include <ntddndis.h>
#include "services/device/geolocation/wifi_data_provider.h"
diff --git a/services/device/geolocation/wifi_data_provider_win.cc b/services/device/geolocation/wifi_data_provider_win.cc
index 56b651a..0c928f6 100644
--- a/services/device/geolocation/wifi_data_provider_win.cc
+++ b/services/device/geolocation/wifi_data_provider_win.cc
@@ -5,6 +5,7 @@
#include "services/device/geolocation/wifi_data_provider_win.h"
#include <windows.h>
+
#include <winioctl.h>
#include <wlanapi.h>
diff --git a/services/device/hid/hid_connection_win.cc b/services/device/hid/hid_connection_win.cc
index 1600e888..87bef72 100644
--- a/services/device/hid/hid_connection_win.cc
+++ b/services/device/hid/hid_connection_win.cc
@@ -19,9 +19,10 @@
#define INITGUID
-#include <hidclass.h>
#include <windows.h>
+#include <hidclass.h>
+
extern "C" {
#include <hidsdi.h>
}
diff --git a/services/device/hid/hid_connection_win.h b/services/device/hid/hid_connection_win.h
index 7da5025..43ce5df 100644
--- a/services/device/hid/hid_connection_win.h
+++ b/services/device/hid/hid_connection_win.h
@@ -6,6 +6,7 @@
#define SERVICES_DEVICE_HID_HID_CONNECTION_WIN_H_
#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
diff --git a/services/device/usb/scoped_winusb_handle.cc b/services/device/usb/scoped_winusb_handle.cc
index 4d36a20..6059ebe 100644
--- a/services/device/usb/scoped_winusb_handle.cc
+++ b/services/device/usb/scoped_winusb_handle.cc
@@ -5,6 +5,7 @@
#include "services/device/usb/scoped_winusb_handle.h"
#include <windows.h>
+
#include <winusb.h>
namespace device {
diff --git a/services/device/usb/usb_service_win.cc b/services/device/usb/usb_service_win.cc
index ec7a2cb..0888473 100644
--- a/services/device/usb/usb_service_win.cc
+++ b/services/device/usb/usb_service_win.cc
@@ -4,15 +4,15 @@
#include "services/device/usb/usb_service_win.h"
-// windows.h must be included first.
#include <windows.h>
#include <string_view>
#define INITGUID
-#include <devpkey.h>
#include <objbase.h>
+
+#include <devpkey.h>
#include <setupapi.h>
#include <stdint.h>
#include <usbiodef.h>
diff --git a/services/proxy_resolver_win/windows_system_proxy_resolver_impl.h b/services/proxy_resolver_win/windows_system_proxy_resolver_impl.h
index 004878e7..3f1f11a3 100644
--- a/services/proxy_resolver_win/windows_system_proxy_resolver_impl.h
+++ b/services/proxy_resolver_win/windows_system_proxy_resolver_impl.h
@@ -6,6 +6,7 @@
#define SERVICES_PROXY_RESOLVER_WIN_WINDOWS_SYSTEM_PROXY_RESOLVER_IMPL_H_
#include <windows.h>
+
#include <winhttp.h>
#include <memory>
diff --git a/services/proxy_resolver_win/windows_system_proxy_resolver_impl_unittest.cc b/services/proxy_resolver_win/windows_system_proxy_resolver_impl_unittest.cc
index 62119e0..b1199769 100644
--- a/services/proxy_resolver_win/windows_system_proxy_resolver_impl_unittest.cc
+++ b/services/proxy_resolver_win/windows_system_proxy_resolver_impl_unittest.cc
@@ -5,6 +5,7 @@
#include "services/proxy_resolver_win/windows_system_proxy_resolver_impl.h"
#include <windows.h>
+
#include <winhttp.h>
#include <memory>
diff --git a/services/proxy_resolver_win/winhttp_api_wrapper.h b/services/proxy_resolver_win/winhttp_api_wrapper.h
index 1819884d..6850b33 100644
--- a/services/proxy_resolver_win/winhttp_api_wrapper.h
+++ b/services/proxy_resolver_win/winhttp_api_wrapper.h
@@ -6,6 +6,7 @@
#define SERVICES_PROXY_RESOLVER_WIN_WINHTTP_API_WRAPPER_H_
#include <windows.h>
+
#include <winhttp.h>
#include <string>
diff --git a/services/proxy_resolver_win/winhttp_api_wrapper_impl.h b/services/proxy_resolver_win/winhttp_api_wrapper_impl.h
index 7dc4f11..c559a6c2 100644
--- a/services/proxy_resolver_win/winhttp_api_wrapper_impl.h
+++ b/services/proxy_resolver_win/winhttp_api_wrapper_impl.h
@@ -6,6 +6,7 @@
#define SERVICES_PROXY_RESOLVER_WIN_WINHTTP_API_WRAPPER_IMPL_H_
#include <windows.h>
+
#include <winhttp.h>
#include <string>
diff --git a/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_win.cc b/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_win.cc
index 574da4a2d..3515ff4 100644
--- a/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_win.cc
+++ b/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_win.cc
@@ -4,10 +4,10 @@
#include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h"
-#include <windows.h> // Must be in front of other Windows header files.
+#include <tchar.h>
+#include <windows.h>
#include <psapi.h>
-#include <tchar.h>
#include "base/numerics/safe_conversions.h"
#include "base/strings/stringprintf.h"
diff --git a/services/service_manager/service_process_launcher.cc b/services/service_manager/service_process_launcher.cc
index 7f4f7e76..9dbb33e 100644
--- a/services/service_manager/service_process_launcher.cc
+++ b/services/service_manager/service_process_launcher.cc
@@ -45,9 +45,9 @@
#endif
#if BUILDFLAG(IS_WIN)
-#include "base/win/windows_version.h"
-
#include <windows.h>
+
+#include "base/win/windows_version.h"
#endif
namespace service_manager {
diff --git a/services/test/echo/echo_service.cc b/services/test/echo/echo_service.cc
index 020bb13..fbd3fe0 100644
--- a/services/test/echo/echo_service.cc
+++ b/services/test/echo/echo_service.cc
@@ -10,6 +10,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include <winevt.h>
#include "base/native_library.h"
diff --git a/services/webnn/dml/platform_functions.h b/services/webnn/dml/platform_functions.h
index 627d11c..d095392 100644
--- a/services/webnn/dml/platform_functions.h
+++ b/services/webnn/dml/platform_functions.h
@@ -5,10 +5,11 @@
#ifndef SERVICES_WEBNN_DML_PLATFORM_FUNCTIONS_H_
#define SERVICES_WEBNN_DML_PLATFORM_FUNCTIONS_H_
+#include <windows.h>
+
#include <DirectML.h>
#include <d3d12.h>
#include <dxcore.h>
-#include <windows.h>
#include "base/component_export.h"
#include "base/no_destructor.h"
diff --git a/skia/ext/skia_utils_win.cc b/skia/ext/skia_utils_win.cc
index 882b8fe..8ac26e63 100644
--- a/skia/ext/skia_utils_win.cc
+++ b/skia/ext/skia_utils_win.cc
@@ -4,9 +4,10 @@
#include "skia/ext/skia_utils_win.h"
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include "base/check_op.h"
#include "base/debug/gdi_debug_util_win.h"
#include "base/numerics/checked_math.h"
diff --git a/skia/ext/skia_utils_win.h b/skia/ext/skia_utils_win.h
index 6fb82639..ac985ea9 100644
--- a/skia/ext/skia_utils_win.h
+++ b/skia/ext/skia_utils_win.h
@@ -5,18 +5,18 @@
#ifndef SKIA_EXT_SKIA_UTILS_WIN_H_
#define SKIA_EXT_SKIA_UTILS_WIN_H_
+#include <windows.h>
+
#include <vector>
#include "base/win/scoped_gdi_object.h"
+#include "build/build_config.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkImageInfo.h"
#include "third_party/skia/include/core/SkMatrix.h"
#include "third_party/skia/include/core/SkRefCnt.h"
-#include "build/build_config.h"
-#include <windows.h>
-
struct SkIRect;
struct SkPoint;
struct SkRect;
diff --git a/third_party/blink/renderer/controller/memory_usage_monitor_win.cc b/third_party/blink/renderer/controller/memory_usage_monitor_win.cc
index 55eeab8..275479a7 100644
--- a/third_party/blink/renderer/controller/memory_usage_monitor_win.cc
+++ b/third_party/blink/renderer/controller/memory_usage_monitor_win.cc
@@ -4,10 +4,10 @@
#include "third_party/blink/renderer/controller/memory_usage_monitor_win.h"
-#include <windows.h> // Must be in front of other Windows header files.
+#include <tchar.h>
+#include <windows.h>
#include <psapi.h>
-#include <tchar.h>
#include "third_party/blink/public/platform/platform.h"
diff --git a/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder_unittest.cc b/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder_unittest.cc
index ff95f4e..a3682278 100644
--- a/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder_unittest.cc
+++ b/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder_unittest.cc
@@ -53,6 +53,7 @@
#if BUILDFLAG(IS_WIN)
#include <objbase.h>
+
#include "media/gpu/windows/mf_audio_encoder.h"
#define HAS_AAC_ENCODER 1
#endif // BUILDFLAG(IS_WIN)
diff --git a/third_party/blink/renderer/platform/fonts/win/font_cache_skia_win.cc b/third_party/blink/renderer/platform/fonts/win/font_cache_skia_win.cc
index 0427952..331edc9c 100644
--- a/third_party/blink/renderer/platform/fonts/win/font_cache_skia_win.cc
+++ b/third_party/blink/renderer/platform/fonts/win/font_cache_skia_win.cc
@@ -29,10 +29,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <windows.h> // For GetACP()
+
#include <freetype/freetype.h>
#include <ft2build.h>
#include <unicode/uscript.h>
-#include <windows.h> // For GetACP()
#include <memory>
#include <string>
diff --git a/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc b/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc
index 8d8a827..e4f38a3 100644
--- a/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc
+++ b/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc
@@ -29,10 +29,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "third_party/blink/renderer/platform/fonts/font_platform_data.h"
+
#include <windows.h>
#include "third_party/blink/renderer/platform/fonts/font_cache.h"
-#include "third_party/blink/renderer/platform/fonts/font_platform_data.h"
#include "third_party/blink/renderer/platform/web_test_support.h"
#include "third_party/skia/include/core/SkFont.h"
#include "third_party/skia/include/core/SkTypeface.h"
diff --git a/third_party/blink/renderer/platform/text/locale_win.h b/third_party/blink/renderer/platform/text/locale_win.h
index 85560be..cbf4f9c 100644
--- a/third_party/blink/renderer/platform/text/locale_win.h
+++ b/third_party/blink/renderer/platform/text/locale_win.h
@@ -32,7 +32,9 @@
#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_TEXT_LOCALE_WIN_H_
#include <windows.h>
+
#include <memory>
+
#include "third_party/blink/renderer/platform/text/platform_locale.h"
#include "third_party/blink/renderer/platform/wtf/forward.h"
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
diff --git a/third_party/blink/renderer/platform/wtf/stack_util.cc b/third_party/blink/renderer/platform/wtf/stack_util.cc
index 8432101..c52adb0 100644
--- a/third_party/blink/renderer/platform/wtf/stack_util.cc
+++ b/third_party/blink/renderer/platform/wtf/stack_util.cc
@@ -10,9 +10,10 @@
#include "third_party/blink/renderer/platform/wtf/threading.h"
#if BUILDFLAG(IS_WIN)
+#include <windows.h>
+
#include <intrin.h>
#include <stddef.h>
-#include <windows.h>
#include <winnt.h>
#elif defined(__GLIBC__)
extern "C" void* __libc_stack_end; // NOLINT
diff --git a/tools/traceline/traceline/assembler.h b/tools/traceline/traceline/assembler.h
index 06d96c0..36f5e15 100644
--- a/tools/traceline/traceline/assembler.h
+++ b/tools/traceline/traceline/assembler.h
@@ -45,10 +45,11 @@
#define TRACELINE_ASSEMBLER_H_
#include <windows.h>
-#include <stdio.h>
-#include <string>
#include <stddef.h>
+#include <stdio.h>
+
+#include <string>
#include "logging.h"
diff --git a/tools/traceline/traceline/logging.h b/tools/traceline/traceline/logging.h
index be967ecf..18d126218 100644
--- a/tools/traceline/traceline/logging.h
+++ b/tools/traceline/traceline/logging.h
@@ -6,6 +6,7 @@
#define TRACELINE_LOGGING_H_
#include <windows.h>
+
#include <stdio.h>
#define CHECK(exp, ...) \
diff --git a/tools/traceline/traceline/main.cc b/tools/traceline/traceline/main.cc
index 2ab610e..672e913 100644
--- a/tools/traceline/traceline/main.cc
+++ b/tools/traceline/traceline/main.cc
@@ -20,11 +20,10 @@
#include "assembler.h"
#include "logging.h"
#include "rdtsc.h"
+#include "sidestep/mini_disassembler.h"
#include "sym_resolver.h"
#include "syscall_map.h"
-#include "sidestep/mini_disassembler.h"
-
namespace {
std::string JSONString(const std::string& str) {
diff --git a/tools/traceline/traceline/rdtsc.h b/tools/traceline/traceline/rdtsc.h
index 2a822197..ea3525b 100644
--- a/tools/traceline/traceline/rdtsc.h
+++ b/tools/traceline/traceline/rdtsc.h
@@ -6,6 +6,7 @@
#define TRACELINE_RDTSC_H_
#include <windows.h>
+
#include <powrprof.h>
#include "logging.h"
diff --git a/tools/traceline/traceline/sym_resolver.h b/tools/traceline/traceline/sym_resolver.h
index 59138b0..3fe2f84 100644
--- a/tools/traceline/traceline/sym_resolver.h
+++ b/tools/traceline/traceline/sym_resolver.h
@@ -11,11 +11,12 @@
#define TRACELINE_SYM_RESOLVER_H_
#include <windows.h>
+
#include <dbghelp.h>
-#include <vector>
-#include <string>
#include <map>
+#include <string>
+#include <vector>
static BOOL CALLBACK SymEnumer(PCSTR name, DWORD64 base, PVOID context) {
reinterpret_cast<std::vector<DWORD64>*>(context)->push_back(base);
diff --git a/tools/win/CreateTempFilesPerfEvaluation/CreateTempFilesPerfEval.cc b/tools/win/CreateTempFilesPerfEvaluation/CreateTempFilesPerfEval.cc
index a69f8eb..b9c9ca1 100644
--- a/tools/win/CreateTempFilesPerfEvaluation/CreateTempFilesPerfEval.cc
+++ b/tools/win/CreateTempFilesPerfEvaluation/CreateTempFilesPerfEval.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <tchar.h>
#include <windows.h>
#include <stdio.h>
-#include <tchar.h>
#include <algorithm>
#include <iostream>
diff --git a/tools/win/IdleWakeups/power_sampler.h b/tools/win/IdleWakeups/power_sampler.h
index a1accdf..20cd84c1 100644
--- a/tools/win/IdleWakeups/power_sampler.h
+++ b/tools/win/IdleWakeups/power_sampler.h
@@ -5,11 +5,11 @@
#ifndef TOOLS_WIN_IDLEWAKEUPS_POWER_SAMPLER_H_
#define TOOLS_WIN_IDLEWAKEUPS_POWER_SAMPLER_H_
+#include <windows.h>
+
#include <map>
#include <string>
-#include <windows.h>
-
// https://software.intel.com/en-us/blogs/2012/12/13/using-the-intel-power-gadget-api-on-mac-os-x
typedef int (*IntelEnergyLibInitialize_t)();
typedef int (*GetNumMsrs_t)(int* nMsr);
diff --git a/tools/win/IdleWakeups/stdafx.h b/tools/win/IdleWakeups/stdafx.h
index 992b3a0..f6fa5cac2a 100644
--- a/tools/win/IdleWakeups/stdafx.h
+++ b/tools/win/IdleWakeups/stdafx.h
@@ -9,9 +9,10 @@
// or project specific include files that are used frequently, but
// are changed infrequently
-#include <inttypes.h>
-#include <stdio.h>
#include <tchar.h>
#include <windows.h>
+#include <inttypes.h>
+#include <stdio.h>
+
#endif // TOOLS_WIN_IDLEWAKEUPS_STDAFX_H_
diff --git a/tools/win/IdleWakeups/system_information_sampler.h b/tools/win/IdleWakeups/system_information_sampler.h
index 5260038..828f587 100644
--- a/tools/win/IdleWakeups/system_information_sampler.h
+++ b/tools/win/IdleWakeups/system_information_sampler.h
@@ -5,12 +5,12 @@
#ifndef TOOLS_WIN_IDLEWAKEUPS_SYSTEM_INFORMATION_SAMPLER_H_
#define TOOLS_WIN_IDLEWAKEUPS_SYSTEM_INFORMATION_SAMPLER_H_
+#include <windows.h>
+
#include <map>
#include <memory>
#include <vector>
-#include <windows.h>
-
// SYSTEM_PROCESS_INFORMATION and SYSTEM_THREAD_INFORMATION structures
// use HANDLE for the thread / process IDs.
typedef HANDLE ThreadId;
diff --git a/tools/win/ShowGlobals/ShowGlobals.cc b/tools/win/ShowGlobals/ShowGlobals.cc
index 66cdd9a9..0e44c76 100644
--- a/tools/win/ShowGlobals/ShowGlobals.cc
+++ b/tools/win/ShowGlobals/ShowGlobals.cc
@@ -35,6 +35,7 @@
// them, and monitoring their changes can be instructive.
#include <atlbase.h>
+
#include <dia2.h>
#include <stdio.h>
#include <wrl/client.h>
diff --git a/tools/win/ShowThreadNames/ShowThreadNames.cc b/tools/win/ShowThreadNames/ShowThreadNames.cc
index 03c0e1f..c220b885 100644
--- a/tools/win/ShowThreadNames/ShowThreadNames.cc
+++ b/tools/win/ShowThreadNames/ShowThreadNames.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <tchar.h>
#include <windows.h>
#include <stdio.h>
-#include <tchar.h>
#include <tlhelp32.h>
#include <algorithm>
diff --git a/tools/win/chromeexts/commands/crash_info_command.cc b/tools/win/chromeexts/commands/crash_info_command.cc
index 8c05473..e689d9f0 100644
--- a/tools/win/chromeexts/commands/crash_info_command.cc
+++ b/tools/win/chromeexts/commands/crash_info_command.cc
@@ -4,9 +4,10 @@
#include "tools/win/chromeexts/commands/crash_info_command.h"
-#include <dbgeng.h>
#include <windows.h>
+#include <dbgeng.h>
+
#include <cstring>
#include <ctime>
#include <vector>
diff --git a/tools/win/chromeexts/commands/gwp_asan_command.cc b/tools/win/chromeexts/commands/gwp_asan_command.cc
index c7689d5..f001190cb 100644
--- a/tools/win/chromeexts/commands/gwp_asan_command.cc
+++ b/tools/win/chromeexts/commands/gwp_asan_command.cc
@@ -4,10 +4,11 @@
#include "tools/win/chromeexts/commands/gwp_asan_command.h"
+#include <windows.h>
+
#include <dbgeng.h>
#include <stdio.h>
#include <stdlib.h>
-#include <windows.h>
#include <fstream>
#include <istream>
diff --git a/tools/win/chromeexts/commands/hwnd_command.cc b/tools/win/chromeexts/commands/hwnd_command.cc
index 5bd57e2..52f4242 100644
--- a/tools/win/chromeexts/commands/hwnd_command.cc
+++ b/tools/win/chromeexts/commands/hwnd_command.cc
@@ -4,9 +4,10 @@
#include "tools/win/chromeexts/commands/hwnd_command.h"
-#include <dbgeng.h>
#include <windows.h>
+#include <dbgeng.h>
+
#include "base/strings/utf_string_conversions.h"
namespace tools {
diff --git a/tools/win/chromeexts/commands/view_command.cc b/tools/win/chromeexts/commands/view_command.cc
index b1b3f0a..6c2ac0e7 100644
--- a/tools/win/chromeexts/commands/view_command.cc
+++ b/tools/win/chromeexts/commands/view_command.cc
@@ -4,8 +4,9 @@
#include "tools/win/chromeexts/commands/view_command.h"
-#include <dbgeng.h>
#include <windows.h>
+
+#include <dbgeng.h>
#include <wrl/client.h>
#include <ostream>
diff --git a/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_unittest.cc b/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_unittest.cc
index bbde8ae..cccc232 100644
--- a/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_unittest.cc
+++ b/ui/accessibility/platform/ax_platform_node_textrangeprovider_win_unittest.cc
@@ -2,10 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/accessibility/platform/ax_platform_node_win_unittest.h"
-
-#include <UIAutomationClient.h>
-#include <UIAutomationCoreApi.h>
+#include "ui/accessibility/platform/ax_platform_node_textrangeprovider_win.h"
#include <memory>
#include <utility>
@@ -16,9 +13,12 @@
#include "base/win/scoped_variant.h"
#include "ui/accessibility/ax_selection.h"
#include "ui/accessibility/platform/ax_fragment_root_win.h"
-#include "ui/accessibility/platform/ax_platform_node_textrangeprovider_win.h"
+#include "ui/accessibility/platform/ax_platform_node_win_unittest.h"
#include "ui/accessibility/platform/sequence_affine_com_object_root_win.h"
+#include <UIAutomationClient.h>
+#include <UIAutomationCoreApi.h>
+
using Microsoft::WRL::ComPtr;
namespace ui {
diff --git a/ui/accessibility/platform/ax_platform_node_win.h b/ui/accessibility/platform/ax_platform_node_win.h
index d6f635e..1c2a6065 100644
--- a/ui/accessibility/platform/ax_platform_node_win.h
+++ b/ui/accessibility/platform/ax_platform_node_win.h
@@ -6,9 +6,9 @@
#define UI_ACCESSIBILITY_PLATFORM_AX_PLATFORM_NODE_WIN_H_
#include <objbase.h>
+
#include <oleacc.h>
#include <oleauto.h>
-#include <uiautomation.h>
#include <wrl/client.h>
#include <array>
@@ -30,6 +30,8 @@
#include "ui/accessibility/platform/sequence_affine_com_object_root_win.h"
#include "ui/gfx/range/range.h"
+#include <uiautomation.h>
+
// This nonstandard GUID is taken directly from the Mozilla sources
// (https://searchfox.org/mozilla-central/source/accessible/windows/msaa/ServiceProvider.cpp#60).
const GUID GUID_IAccessibleContentDocument = {
diff --git a/ui/accessibility/platform/ax_platform_relation_win.h b/ui/accessibility/platform/ax_platform_relation_win.h
index acc85877..e8d81b0 100644
--- a/ui/accessibility/platform/ax_platform_relation_win.h
+++ b/ui/accessibility/platform/ax_platform_relation_win.h
@@ -7,6 +7,7 @@
#include <oleacc.h>
#include <wrl/client.h>
+
#include <set>
#include <vector>
diff --git a/ui/accessibility/platform/ax_platform_text_boundary.h b/ui/accessibility/platform/ax_platform_text_boundary.h
index 14345249..d61c551a 100644
--- a/ui/accessibility/platform/ax_platform_text_boundary.h
+++ b/ui/accessibility/platform/ax_platform_text_boundary.h
@@ -16,9 +16,10 @@
#if BUILDFLAG(IS_WIN)
#include <oleacc.h>
-#include <uiautomation.h>
#include "third_party/iaccessible2/ia2_api_all.h"
+
+#include <uiautomation.h>
#endif // BUILDFLAG(IS_WIN)
namespace ui {
diff --git a/ui/accessibility/platform/iaccessible2/scoped_co_mem_array.h b/ui/accessibility/platform/iaccessible2/scoped_co_mem_array.h
index 99007f3..fc2afa5 100644
--- a/ui/accessibility/platform/iaccessible2/scoped_co_mem_array.h
+++ b/ui/accessibility/platform/iaccessible2/scoped_co_mem_array.h
@@ -5,11 +5,11 @@
#ifndef UI_ACCESSIBILITY_PLATFORM_IACCESSIBLE2_SCOPED_CO_MEM_ARRAY_H_
#define UI_ACCESSIBILITY_PLATFORM_IACCESSIBLE2_SCOPED_CO_MEM_ARRAY_H_
+#include <objbase.h>
+
#include <cstddef>
#include <utility>
-#include <objbase.h>
-
#include "base/check_op.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/raw_ptr_exclusion.h"
diff --git a/ui/accessibility/platform/iaccessible2/scoped_co_mem_array_unittest.cc b/ui/accessibility/platform/iaccessible2/scoped_co_mem_array_unittest.cc
index ecc17b9..5416ff3 100644
--- a/ui/accessibility/platform/iaccessible2/scoped_co_mem_array_unittest.cc
+++ b/ui/accessibility/platform/iaccessible2/scoped_co_mem_array_unittest.cc
@@ -4,10 +4,10 @@
#include "ui/accessibility/platform/iaccessible2/scoped_co_mem_array.h"
-#include <vector>
-
#include <objbase.h>
+#include <vector>
+
#include "base/win/windows_types.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/ui/accessibility/platform/inspect/ax_event_recorder_win_uia.h b/ui/accessibility/platform/inspect/ax_event_recorder_win_uia.h
index 53eec98..d40f789 100644
--- a/ui/accessibility/platform/inspect/ax_event_recorder_win_uia.h
+++ b/ui/accessibility/platform/inspect/ax_event_recorder_win_uia.h
@@ -6,9 +6,10 @@
#define UI_ACCESSIBILITY_PLATFORM_INSPECT_AX_EVENT_RECORDER_WIN_UIA_H_
#include <ole2.h>
+
#include <stdint.h>
-#include <uiautomation.h>
#include <wrl/client.h>
+
#include <string>
#include <utility>
#include <vector>
@@ -24,6 +25,8 @@
#include "ui/accessibility/platform/inspect/ax_event_recorder.h"
#include "ui/accessibility/platform/inspect/ax_inspect.h"
+#include <uiautomation.h>
+
namespace ui {
class COMPONENT_EXPORT(AX_PLATFORM) AXEventRecorderWinUia
diff --git a/ui/accessibility/platform/inspect/ax_inspect_utils_win.cc b/ui/accessibility/platform/inspect/ax_inspect_utils_win.cc
index 8fdfdac..5ffec78 100644
--- a/ui/accessibility/platform/inspect/ax_inspect_utils_win.cc
+++ b/ui/accessibility/platform/inspect/ax_inspect_utils_win.cc
@@ -4,8 +4,6 @@
#include "ui/accessibility/platform/inspect/ax_inspect_utils_win.h"
-#include <uiautomation.h>
-
#include <map>
#include <string>
@@ -20,6 +18,8 @@
#include "third_party/iaccessible2/ia2_api_all.h"
#include "ui/accessibility/platform/inspect/ax_inspect.h"
+#include <uiautomation.h>
+
namespace ui {
namespace {
diff --git a/ui/accessibility/platform/inspect/ax_tree_formatter_uia_win.cc b/ui/accessibility/platform/inspect/ax_tree_formatter_uia_win.cc
index 0ac03b7..7039db9a 100644
--- a/ui/accessibility/platform/inspect/ax_tree_formatter_uia_win.cc
+++ b/ui/accessibility/platform/inspect/ax_tree_formatter_uia_win.cc
@@ -8,7 +8,6 @@
#include <oleacc.h>
#include <stddef.h>
#include <stdint.h>
-#include <uiautomation.h>
#include <wrl/client.h>
#include <iostream>
@@ -34,6 +33,8 @@
#include "ui/accessibility/platform/uia_registrar_win.h"
#include "ui/gfx/win/hwnd_util.h"
+#include <uiautomation.h>
+
namespace {
std::string UiaIdentifierToCondensedString(int32_t id) {
diff --git a/ui/accessibility/platform/inspect/ax_tree_formatter_uia_win.h b/ui/accessibility/platform/inspect/ax_tree_formatter_uia_win.h
index 0eb0161..387b68b 100644
--- a/ui/accessibility/platform/inspect/ax_tree_formatter_uia_win.h
+++ b/ui/accessibility/platform/inspect/ax_tree_formatter_uia_win.h
@@ -4,11 +4,9 @@
#ifndef UI_ACCESSIBILITY_PLATFORM_INSPECT_AX_TREE_FORMATTER_UIA_WIN_H_
#define UI_ACCESSIBILITY_PLATFORM_INSPECT_AX_TREE_FORMATTER_UIA_WIN_H_
-#include "ui/accessibility/platform/inspect/ax_tree_formatter_base.h"
-
#include <ole2.h>
+
#include <stdint.h>
-#include <uiautomation.h>
#include <wrl/client.h>
#include <map>
@@ -17,6 +15,9 @@
#include "base/component_export.h"
#include "base/win/scoped_variant.h"
+#include "ui/accessibility/platform/inspect/ax_tree_formatter_base.h"
+
+#include <uiautomation.h>
namespace ui {
diff --git a/ui/accessibility/platform/uia_registrar_win.h b/ui/accessibility/platform/uia_registrar_win.h
index 20dc3af7..428599de 100644
--- a/ui/accessibility/platform/uia_registrar_win.h
+++ b/ui/accessibility/platform/uia_registrar_win.h
@@ -6,10 +6,11 @@
#define UI_ACCESSIBILITY_PLATFORM_UIA_REGISTRAR_WIN_H_
#include <objbase.h>
-#include <uiautomation.h>
#include "base/component_export.h"
+#include <uiautomation.h>
+
namespace ui {
// UIA custom events.
diff --git a/ui/aura/input_state_lookup_win.cc b/ui/aura/input_state_lookup_win.cc
index 2c38cc2..e7757a1 100644
--- a/ui/aura/input_state_lookup_win.cc
+++ b/ui/aura/input_state_lookup_win.cc
@@ -5,6 +5,7 @@
#include "ui/aura/input_state_lookup_win.h"
#include <windows.h>
+
#include <winuser.h>
#include "base/memory/ptr_util.h"
diff --git a/ui/aura/native_window_occlusion_tracker_win.h b/ui/aura/native_window_occlusion_tracker_win.h
index cb0103ae..8d676f6b 100644
--- a/ui/aura/native_window_occlusion_tracker_win.h
+++ b/ui/aura/native_window_occlusion_tracker_win.h
@@ -7,6 +7,7 @@
#include <shobjidl.h>
#include <windows.h>
+
#include <winuser.h>
#include <wrl/client.h>
diff --git a/ui/base/accelerators/global_media_keys_listener_win_interactive_test.cc b/ui/base/accelerators/global_media_keys_listener_win_interactive_test.cc
index 4ecf6f3c..26138f1 100644
--- a/ui/base/accelerators/global_media_keys_listener_win_interactive_test.cc
+++ b/ui/base/accelerators/global_media_keys_listener_win_interactive_test.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/accelerators/global_media_keys_listener_win.h"
-
#include <windows.h>
#include "base/functional/callback.h"
@@ -11,6 +9,7 @@
#include "base/test/task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/accelerators/accelerator.h"
+#include "ui/base/accelerators/global_media_keys_listener_win.h"
#include "ui/events/event.h"
namespace ui {
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
index ca7bb72..6810fe13 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -4,11 +4,13 @@
#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
-#include <coml2api.h>
#include <objbase.h>
+
+#include <shobjidl.h>
+
+#include <coml2api.h>
#include <objidl.h>
#include <shlobj.h>
-#include <shobjidl.h>
#include <stdint.h>
#include <wrl/client.h>
diff --git a/ui/base/dragdrop/os_exchange_data_win_unittest.cc b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
index dc6c2e1..721884e 100644
--- a/ui/base/dragdrop/os_exchange_data_win_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
@@ -5,6 +5,7 @@
#include "ui/base/dragdrop/os_exchange_data.h"
#include <objbase.h>
+
#include <memory>
#include "base/containers/contains.h"
diff --git a/ui/base/idle/idle_win.cc b/ui/base/idle/idle_win.cc
index 37bf70f..307c46b 100644
--- a/ui/base/idle/idle_win.cc
+++ b/ui/base/idle/idle_win.cc
@@ -4,9 +4,10 @@
#include "ui/base/idle/idle.h"
-#include <limits.h>
#include <windows.h>
+#include <limits.h>
+
#include "ui/base/idle/idle_internal.h"
#include "ui/base/win/lock_state.h"
diff --git a/ui/base/ime/win/on_screen_keyboard_display_manager_tab_tip.cc b/ui/base/ime/win/on_screen_keyboard_display_manager_tab_tip.cc
index b555d533..b54e91e 100644
--- a/ui/base/ime/win/on_screen_keyboard_display_manager_tab_tip.cc
+++ b/ui/base/ime/win/on_screen_keyboard_display_manager_tab_tip.cc
@@ -4,11 +4,11 @@
#include "ui/base/ime/win/on_screen_keyboard_display_manager_tab_tip.h"
+#include <shobjidl.h>
#include <windows.h>
#include <shellapi.h>
#include <shlobj.h>
-#include <shobjidl.h> // Must be before propkey.
#include "base/functional/bind.h"
#include "base/location.h"
diff --git a/ui/base/ime/win/tsf_bridge.h b/ui/base/ime/win/tsf_bridge.h
index 45c8f192..a4c1f368 100644
--- a/ui/base/ime/win/tsf_bridge.h
+++ b/ui/base/ime/win/tsf_bridge.h
@@ -5,8 +5,9 @@
#ifndef UI_BASE_IME_WIN_TSF_BRIDGE_H_
#define UI_BASE_IME_WIN_TSF_BRIDGE_H_
-#include <msctf.h>
#include <windows.h>
+
+#include <msctf.h>
#include <wrl/client.h>
#include <memory>
diff --git a/ui/base/ime/win/tsf_event_router.cc b/ui/base/ime/win/tsf_event_router.cc
index 7844e58..c297a18c 100644
--- a/ui/base/ime/win/tsf_event_router.cc
+++ b/ui/base/ime/win/tsf_event_router.cc
@@ -5,6 +5,7 @@
#include "ui/base/ime/win/tsf_event_router.h"
#include <msctf.h>
+
#include <set>
#include <utility>
diff --git a/ui/base/ime/win/tsf_input_scope.cc b/ui/base/ime/win/tsf_input_scope.cc
index 50f8c34..3f5687c 100644
--- a/ui/base/ime/win/tsf_input_scope.cc
+++ b/ui/base/ime/win/tsf_input_scope.cc
@@ -4,9 +4,10 @@
#include "ui/base/ime/win/tsf_input_scope.h"
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include "base/check.h"
#include "base/compiler_specific.h"
#include "base/containers/contains.h"
diff --git a/ui/base/resource/resource_data_dll_win.h b/ui/base/resource/resource_data_dll_win.h
index 07b50a82..bdeb4909 100644
--- a/ui/base/resource/resource_data_dll_win.h
+++ b/ui/base/resource/resource_data_dll_win.h
@@ -6,6 +6,7 @@
#define UI_BASE_RESOURCE_RESOURCE_DATA_DLL_WIN_H_
#include <windows.h>
+
#include <stdint.h>
#include <memory>
diff --git a/ui/base/win/event_creation_utils.cc b/ui/base/win/event_creation_utils.cc
index f5946e7a..c6cdb05 100644
--- a/ui/base/win/event_creation_utils.cc
+++ b/ui/base/win/event_creation_utils.cc
@@ -5,6 +5,7 @@
#include "ui/base/win/event_creation_utils.h"
#include <windows.h>
+
#include <winuser.h>
#include <algorithm>
diff --git a/ui/base/win/foreground_helper.h b/ui/base/win/foreground_helper.h
index 62946c5..391bcf0 100644
--- a/ui/base/win/foreground_helper.h
+++ b/ui/base/win/foreground_helper.h
@@ -5,12 +5,12 @@
#ifndef UI_BASE_WIN_FOREGROUND_HELPER_H_
#define UI_BASE_WIN_FOREGROUND_HELPER_H_
+#include <windows.h>
+
#include "base/component_export.h"
#include "base/notreached.h"
#include "ui/gfx/win/window_impl.h"
-#include <windows.h>
-
namespace ui {
// Helper class for moving a window to the foreground.
diff --git a/ui/base/win/lock_state.cc b/ui/base/win/lock_state.cc
index e2136ed9..7d1424d 100644
--- a/ui/base/win/lock_state.cc
+++ b/ui/base/win/lock_state.cc
@@ -5,6 +5,7 @@
#include "ui/base/win/lock_state.h"
#include <windows.h>
+
#include <wtsapi32.h>
#include "base/functional/bind.h"
diff --git a/ui/compositor/test/test_compositor_host_win.cc b/ui/compositor/test/test_compositor_host_win.cc
index bfa1d84..e9faacc 100644
--- a/ui/compositor/test/test_compositor_host_win.cc
+++ b/ui/compositor/test/test_compositor_host_win.cc
@@ -4,6 +4,8 @@
#include "ui/compositor/test/test_compositor_host.h"
+#include <windows.h>
+
#include <memory>
#include "base/compiler_specific.h"
@@ -12,8 +14,6 @@
#include "ui/compositor/compositor.h"
#include "ui/gfx/win/window_impl.h"
-#include <windows.h>
-
namespace ui {
class TestCompositorHostWin : public TestCompositorHost,
diff --git a/ui/display/win/audio_edid_scan.cc b/ui/display/win/audio_edid_scan.cc
index fe7a31a..8a9676b 100644
--- a/ui/display/win/audio_edid_scan.cc
+++ b/ui/display/win/audio_edid_scan.cc
@@ -5,6 +5,7 @@
#include "ui/display/win/audio_edid_scan.h"
#include <objbase.h>
+
#include <oleauto.h>
#include <string.h>
diff --git a/ui/display/win/color_profile_reader.cc b/ui/display/win/color_profile_reader.cc
index 763aae3..9530f11 100644
--- a/ui/display/win/color_profile_reader.cc
+++ b/ui/display/win/color_profile_reader.cc
@@ -4,9 +4,10 @@
#include "ui/display/win/color_profile_reader.h"
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include "base/files/file_util.h"
#include "base/functional/bind.h"
#include "base/task/thread_pool.h"
diff --git a/ui/display/win/display_info.h b/ui/display/win/display_info.h
index 404c432..e97ea41 100644
--- a/ui/display/win/display_info.h
+++ b/ui/display/win/display_info.h
@@ -6,6 +6,7 @@
#define UI_DISPLAY_WIN_DISPLAY_INFO_H_
#include <windows.h>
+
#include <stdint.h>
#include "ui/display/display.h"
diff --git a/ui/display/win/screen_win.cc b/ui/display/win/screen_win.cc
index 16dfe12..3a9a31032 100644
--- a/ui/display/win/screen_win.cc
+++ b/ui/display/win/screen_win.cc
@@ -4,9 +4,10 @@
#include "ui/display/win/screen_win.h"
-#include <shellscalingapi.h>
#include <windows.h>
+#include <shellscalingapi.h>
+
#include <algorithm>
#include <optional>
diff --git a/ui/display/win/screen_win_unittest.cc b/ui/display/win/screen_win_unittest.cc
index e96bf4d..1610484 100644
--- a/ui/display/win/screen_win_unittest.cc
+++ b/ui/display/win/screen_win_unittest.cc
@@ -5,6 +5,7 @@
#include "ui/display/win/screen_win.h"
#include <windows.h>
+
#include <inttypes.h>
#include <stddef.h>
diff --git a/ui/events/devices/input_device_observer_win.cc b/ui/events/devices/input_device_observer_win.cc
index 7eb7da4..3f57d5b 100644
--- a/ui/events/devices/input_device_observer_win.cc
+++ b/ui/events/devices/input_device_observer_win.cc
@@ -4,6 +4,8 @@
#include "ui/events/devices/input_device_observer_win.h"
+#include <windows.h>
+
#include <string>
#include <utility>
@@ -11,8 +13,6 @@
#include "base/functional/callback.h"
#include "base/memory/singleton.h"
-#include <windows.h>
-
// This macro provides the implementation for the observer notification methods.
#define WIN_NOTIFY_OBSERVERS(method_decl, input_device_types) \
void InputDeviceObserverWin::method_decl { \
diff --git a/ui/events/win/media_keyboard_hook_win_interactive_test.cc b/ui/events/win/media_keyboard_hook_win_interactive_test.cc
index 63d03291..60e23f1 100644
--- a/ui/events/win/media_keyboard_hook_win_interactive_test.cc
+++ b/ui/events/win/media_keyboard_hook_win_interactive_test.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/events/keyboard_hook.h"
-
#include <windows.h>
#include "base/functional/bind.h"
@@ -11,6 +9,7 @@
#include "base/test/task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/events/event.h"
+#include "ui/events/keyboard_hook.h"
namespace ui {
diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc
index 430f9928..98a2f844 100644
--- a/ui/gfx/color_utils.cc
+++ b/ui/gfx/color_utils.cc
@@ -24,6 +24,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "skia/ext/skia_utils_win.h"
#endif
diff --git a/ui/gfx/font_util_win.cc b/ui/gfx/font_util_win.cc
index d323c36..55f6082 100644
--- a/ui/gfx/font_util_win.cc
+++ b/ui/gfx/font_util_win.cc
@@ -5,6 +5,7 @@
#include "ui/gfx/font_util_win.h"
#include <windows.h>
+
#include <wrl/client.h>
#include "base/files/file_path.h"
diff --git a/ui/gfx/gpu_fence_handle.cc b/ui/gfx/gpu_fence_handle.cc
index 391341c..8a84e31 100644
--- a/ui/gfx/gpu_fence_handle.cc
+++ b/ui/gfx/gpu_fence_handle.cc
@@ -26,6 +26,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/process/process_handle.h"
#endif
diff --git a/ui/gfx/gpu_memory_buffer.cc b/ui/gfx/gpu_memory_buffer.cc
index 6517c720..f762ed9 100644
--- a/ui/gfx/gpu_memory_buffer.cc
+++ b/ui/gfx/gpu_memory_buffer.cc
@@ -10,6 +10,7 @@
#if BUILDFLAG(IS_WIN)
#include <windows.h>
+
#include "base/win/scoped_handle.h"
#endif
diff --git a/ui/gfx/icon_util.h b/ui/gfx/icon_util.h
index 88640e6..3f582a6 100644
--- a/ui/gfx/icon_util.h
+++ b/ui/gfx/icon_util.h
@@ -6,8 +6,10 @@
#define UI_GFX_ICON_UTIL_H_
#include <windows.h>
+
#include <stddef.h>
#include <stdint.h>
+
#include <memory>
#include <vector>
diff --git a/ui/gfx/win/hwnd_util.cc b/ui/gfx/win/hwnd_util.cc
index 3f924068..80bb6133 100644
--- a/ui/gfx/win/hwnd_util.cc
+++ b/ui/gfx/win/hwnd_util.cc
@@ -4,9 +4,10 @@
#include "ui/gfx/win/hwnd_util.h"
-#include <dwmapi.h> // DWMWA_CLOAKED
#include <windows.h>
+#include <dwmapi.h> // DWMWA_CLOAKED
+
#include "base/debug/gdi_debug_util_win.h"
#include "base/logging.h"
#include "base/notreached.h"
diff --git a/ui/gfx/win/hwnd_util.h b/ui/gfx/win/hwnd_util.h
index 600658f0..15c1677 100644
--- a/ui/gfx/win/hwnd_util.h
+++ b/ui/gfx/win/hwnd_util.h
@@ -5,8 +5,9 @@
#ifndef UI_GFX_WIN_HWND_UTIL_H_
#define UI_GFX_WIN_HWND_UTIL_H_
-#include <shobjidl.h> // Must be before propkey.
+#include <shobjidl.h>
#include <windows.h>
+
#include <wrl/client.h>
#include <optional>
diff --git a/ui/gfx/win/physical_size.cc b/ui/gfx/win/physical_size.cc
index 9b7c9dc..22b7785 100644
--- a/ui/gfx/win/physical_size.cc
+++ b/ui/gfx/win/physical_size.cc
@@ -5,6 +5,7 @@
#include "ui/gfx/win/physical_size.h"
#include <windows.h>
+
#include <setupapi.h>
#include <iostream>
diff --git a/ui/gl/child_window_win.h b/ui/gl/child_window_win.h
index f05a9e246..7b5be63 100644
--- a/ui/gl/child_window_win.h
+++ b/ui/gl/child_window_win.h
@@ -5,12 +5,12 @@
#ifndef UI_GL_CHILD_WINDOW_WIN_H_
#define UI_GL_CHILD_WINDOW_WIN_H_
+#include <windows.h>
+
#include "base/memory/ref_counted.h"
#include "base/task/task_runner.h"
#include "ui/gl/gl_export.h"
-#include <windows.h>
-
namespace gfx {
class Size;
}
diff --git a/ui/gl/dc_layer_overlay_image.cc b/ui/gl/dc_layer_overlay_image.cc
index febb652..2d1669e 100644
--- a/ui/gl/dc_layer_overlay_image.cc
+++ b/ui/gl/dc_layer_overlay_image.cc
@@ -4,9 +4,10 @@
#include "ui/gl/dc_layer_overlay_image.h"
+#include <unknwn.h>
+
#include <d3d11.h>
#include <dcomp.h>
-#include <unknwn.h>
#include "base/notreached.h"
diff --git a/ui/gl/dc_layer_tree.h b/ui/gl/dc_layer_tree.h
index 19dbde9..19bb8870 100644
--- a/ui/gl/dc_layer_tree.h
+++ b/ui/gl/dc_layer_tree.h
@@ -6,6 +6,7 @@
#define UI_GL_DC_LAYER_TREE_H_
#include <windows.h>
+
#include <d3d11.h>
#include <dcomp.h>
#include <wrl/client.h>
diff --git a/ui/gl/dcomp_presenter.h b/ui/gl/dcomp_presenter.h
index 67fc85c..45f688d 100644
--- a/ui/gl/dcomp_presenter.h
+++ b/ui/gl/dcomp_presenter.h
@@ -5,9 +5,10 @@
#ifndef UI_GL_DCOMP_PRESENTER_H_
#define UI_GL_DCOMP_PRESENTER_H_
+#include <windows.h>
+
#include <d3d11.h>
#include <dcomp.h>
-#include <windows.h>
#include <wrl/client.h>
#include "base/containers/circular_deque.h"
diff --git a/ui/gl/direct_composition_child_surface_win.h b/ui/gl/direct_composition_child_surface_win.h
index bce6f20..513f827 100644
--- a/ui/gl/direct_composition_child_surface_win.h
+++ b/ui/gl/direct_composition_child_surface_win.h
@@ -6,6 +6,7 @@
#define UI_GL_DIRECT_COMPOSITION_CHILD_SURFACE_WIN_H_
#include <windows.h>
+
#include <d3d11.h>
#include <dcomp.h>
#include <wrl/client.h>
diff --git a/ui/gl/direct_composition_support.h b/ui/gl/direct_composition_support.h
index 6b0e5fe..be49e8cf 100644
--- a/ui/gl/direct_composition_support.h
+++ b/ui/gl/direct_composition_support.h
@@ -5,9 +5,10 @@
#ifndef UI_GL_DIRECT_COMPOSITION_SUPPORT_H_
#define UI_GL_DIRECT_COMPOSITION_SUPPORT_H_
+#include <windows.h>
+
#include <d3d11.h>
#include <dcomp.h>
-#include <windows.h>
#include <wrl/client.h>
#include "base/no_destructor.h"
diff --git a/ui/gl/swap_chain_presenter.h b/ui/gl/swap_chain_presenter.h
index 22d20d3..ec1809b 100644
--- a/ui/gl/swap_chain_presenter.h
+++ b/ui/gl/swap_chain_presenter.h
@@ -5,9 +5,10 @@
#ifndef UI_GL_SWAP_CHAIN_PRESENTER_H_
#define UI_GL_SWAP_CHAIN_PRESENTER_H_
+#include <windows.h>
+
#include <d3d11.h>
#include <dcomp.h>
-#include <windows.h>
#include <wrl/client.h>
#include "base/containers/circular_deque.h"
diff --git a/ui/gl/vsync_thread_win.h b/ui/gl/vsync_thread_win.h
index 2bc0d2d..5a5c5a1 100644
--- a/ui/gl/vsync_thread_win.h
+++ b/ui/gl/vsync_thread_win.h
@@ -5,8 +5,9 @@
#ifndef UI_GL_VSYNC_THREAD_WIN_H_
#define UI_GL_VSYNC_THREAD_WIN_H_
-#include <d3d11.h>
#include <windows.h>
+
+#include <d3d11.h>
#include <wrl/client.h>
#include "base/containers/flat_set.h"
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index 848d7f500..4c922cce 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc
@@ -4,11 +4,12 @@
#include "ui/native_theme/native_theme_win.h"
+#include <windows.h>
+
#include <stddef.h>
#include <uxtheme.h>
#include <vsstyle.h>
#include <vssym32.h>
-#include <windows.h>
#include <optional>
#include <tuple>
diff --git a/ui/platform_window/win/win_window.h b/ui/platform_window/win/win_window.h
index ed60ad7d..32494cf1 100644
--- a/ui/platform_window/win/win_window.h
+++ b/ui/platform_window/win/win_window.h
@@ -5,6 +5,8 @@
#ifndef UI_PLATFORM_WINDOW_WIN_WIN_WINDOW_H_
#define UI_PLATFORM_WINDOW_WIN_WIN_WINDOW_H_
+#include <windows.h>
+
#include "base/memory/raw_ptr.h"
#include "base/memory/scoped_refptr.h"
#include "base/memory/weak_ptr.h"
@@ -14,8 +16,6 @@
#include "ui/platform_window/platform_window_delegate.h"
#include "ui/platform_window/win/win_window_export.h"
-#include <windows.h>
-
namespace ui {
class WinCursor;
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win_unittest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win_unittest.cc
index 72070c99..41c3bc8 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win_unittest.cc
@@ -4,9 +4,10 @@
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
-#include <oleacc.h>
#include <windows.h>
+#include <oleacc.h>
+
#include <utility>
#include "base/test/scoped_feature_list.h"
diff --git a/ui/views/win/fullscreen_handler.h b/ui/views/win/fullscreen_handler.h
index 629e543b..017f3c04 100644
--- a/ui/views/win/fullscreen_handler.h
+++ b/ui/views/win/fullscreen_handler.h
@@ -6,6 +6,7 @@
#define UI_VIEWS_WIN_FULLSCREEN_HANDLER_H_
#include <shobjidl.h>
+
#include <wrl/client.h>
#include "base/memory/weak_ptr.h"
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 4cac26e2..6d4dd467 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -4,10 +4,11 @@
#include "ui/views/win/hwnd_message_handler.h"
+#include <tchar.h>
+
#include <dwmapi.h>
#include <oleacc.h>
#include <shellapi.h>
-#include <tchar.h>
#include <wrl/client.h>
#include <utility>
diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
index df391b1b..24299f9 100644
--- a/ui/views/win/hwnd_message_handler.h
+++ b/ui/views/win/hwnd_message_handler.h
@@ -5,9 +5,10 @@
#ifndef UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_H_
#define UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_H_
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include <map>
#include <memory>
#include <optional>
diff --git a/ui/views/win/hwnd_message_handler_headless.h b/ui/views/win/hwnd_message_handler_headless.h
index 7e656b49..9421b1c7 100644
--- a/ui/views/win/hwnd_message_handler_headless.h
+++ b/ui/views/win/hwnd_message_handler_headless.h
@@ -5,9 +5,10 @@
#ifndef UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_HEADLESS_H_
#define UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_HEADLESS_H_
-#include <stddef.h>
#include <windows.h>
+#include <stddef.h>
+
#include <optional>
#include <string>
