[vcpkg formatting] Fix format regex (#12369)

* [vcpkg formatting] correct the header regexes

* format

46 files changed, 122 insertions, 103 deletions

diff --git a/toolsrc/include/vcpkg-test/util.h b/toolsrc/include/vcpkg-test/util.h
index f7d2f2a50..ce403c308 100644
--- a/toolsrc/include/vcpkg-test/util.h
+++ b/toolsrc/include/vcpkg-test/util.h
@@ -2,12 +2,13 @@
 
 #include <catch2/catch.hpp>
 
-#include <memory>
-
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/pragmas.h>
+
 #include <vcpkg/statusparagraph.h>
 
+#include <memory>
+
 #define CHECK_EC(ec)                                                                                                   \
     do                                                                                                                 \
     {                                                                                                                  \
diff --git a/toolsrc/include/vcpkg/archives.h b/toolsrc/include/vcpkg/archives.h
index 2298f9e1e..073217064 100644
--- a/toolsrc/include/vcpkg/archives.h
+++ b/toolsrc/include/vcpkg/archives.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/files.h>
+
 #include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg::Archives
diff --git a/toolsrc/include/vcpkg/base/chrono.h b/toolsrc/include/vcpkg/base/chrono.h
index b2865476a..0505192a0 100644
--- a/toolsrc/include/vcpkg/base/chrono.h
+++ b/toolsrc/include/vcpkg/base/chrono.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <chrono>
-#include <string>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/optional.h>
 
+#include <chrono>
+#include <string>
+
 namespace vcpkg::Chrono
 {
     class ElapsedTime
diff --git a/toolsrc/include/vcpkg/base/cofffilereader.h b/toolsrc/include/vcpkg/base/cofffilereader.h
index a135ba028..e0ad69b33 100644
--- a/toolsrc/include/vcpkg/base/cofffilereader.h
+++ b/toolsrc/include/vcpkg/base/cofffilereader.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <vector>
-
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/machinetype.h>
 
+#include <vector>
+
 namespace vcpkg::CoffFileReader
 {
     struct DllInfo
diff --git a/toolsrc/include/vcpkg/base/enums.h b/toolsrc/include/vcpkg/base/enums.h
index 77ca7194f..6eca2cfe1 100644
--- a/toolsrc/include/vcpkg/base/enums.h
+++ b/toolsrc/include/vcpkg/base/enums.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/lineinfo.h>
 
+#include <string>
+
 namespace vcpkg::Enums
 {
     std::string nullvalue_to_string(const CStringView enum_name);
diff --git a/toolsrc/include/vcpkg/base/expected.h b/toolsrc/include/vcpkg/base/expected.h
index 6381f1e89..d8a2cacaa 100644
--- a/toolsrc/include/vcpkg/base/expected.h
+++ b/toolsrc/include/vcpkg/base/expected.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <system_error>
-
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/stringliteral.h>
 
+#include <system_error>
+
 namespace vcpkg
 {
     template<class Err>
diff --git a/toolsrc/include/vcpkg/base/graphs.h b/toolsrc/include/vcpkg/base/graphs.h
index 957af0fba..ac5f953dc 100644
--- a/toolsrc/include/vcpkg/base/graphs.h
+++ b/toolsrc/include/vcpkg/base/graphs.h
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/system.print.h>
+
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <vcpkg/base/checks.h>
-#include <vcpkg/base/system.print.h>
-
 namespace vcpkg::Graphs
 {
     enum class ExplorationStatus
diff --git a/toolsrc/include/vcpkg/base/hash.h b/toolsrc/include/vcpkg/base/hash.h
index 2878807d4..d62fd3921 100644
--- a/toolsrc/include/vcpkg/base/hash.h
+++ b/toolsrc/include/vcpkg/base/hash.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/files.h>
 
+#include <string>
+
 namespace vcpkg::Hash
 {
     enum class Algorithm
diff --git a/toolsrc/include/vcpkg/base/json.h b/toolsrc/include/vcpkg/base/json.h
index 97c8be91f..3195c223a 100644
--- a/toolsrc/include/vcpkg/base/json.h
+++ b/toolsrc/include/vcpkg/base/json.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <vcpkg/base/expected.h>
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/parse.h>
+#include <vcpkg/base/stringview.h>
+
 #include <stddef.h>
 #include <stdint.h>
 
@@ -8,11 +13,6 @@
 #include <utility>
 #include <vector>
 
-#include <vcpkg/base/expected.h>
-#include <vcpkg/base/files.h>
-#include <vcpkg/base/parse.h>
-#include <vcpkg/base/stringview.h>
-
 namespace vcpkg::Json
 {
     struct JsonStyle
diff --git a/toolsrc/include/vcpkg/base/optional.h b/toolsrc/include/vcpkg/base/optional.h
index 842f72f95..091cd498e 100644
--- a/toolsrc/include/vcpkg/base/optional.h
+++ b/toolsrc/include/vcpkg/base/optional.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <type_traits>
-#include <utility>
-
 #include <vcpkg/base/lineinfo.h>
 #include <vcpkg/base/pragmas.h>
 
+#include <type_traits>
+#include <utility>
+
 namespace vcpkg
 {
     struct NullOpt
diff --git a/toolsrc/include/vcpkg/base/parse.h b/toolsrc/include/vcpkg/base/parse.h
index d63cf1ced..cc5db02d3 100644
--- a/toolsrc/include/vcpkg/base/parse.h
+++ b/toolsrc/include/vcpkg/base/parse.h
@@ -1,14 +1,15 @@
 #pragma once
 
-#include <memory>
-#include <string>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/stringview.h>
 #include <vcpkg/base/unicode.h>
+
 #include <vcpkg/textrowcol.h>
 
+#include <memory>
+#include <string>
+
 namespace vcpkg::Parse
 {
     struct IParseError
diff --git a/toolsrc/include/vcpkg/base/stringliteral.h b/toolsrc/include/vcpkg/base/stringliteral.h
index d0d5dc124..43d171829 100644
--- a/toolsrc/include/vcpkg/base/stringliteral.h
+++ b/toolsrc/include/vcpkg/base/stringliteral.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/zstringview.h>
 
+#include <string>
+
 namespace vcpkg
 {
     struct StringLiteral : ZStringView
diff --git a/toolsrc/include/vcpkg/base/strings.h b/toolsrc/include/vcpkg/base/strings.h
index 229bedb65..cd4838029 100644
--- a/toolsrc/include/vcpkg/base/strings.h
+++ b/toolsrc/include/vcpkg/base/strings.h
@@ -1,11 +1,5 @@
 #pragma once
 
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-
-#include <vector>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/pragmas.h>
@@ -13,6 +7,12 @@
 #include <vcpkg/base/stringview.h>
 #include <vcpkg/base/view.h>
 
+#include <errno.h>
+#include <inttypes.h>
+#include <limits.h>
+
+#include <vector>
+
 namespace vcpkg::Strings::details
 {
     template<class T>
diff --git a/toolsrc/include/vcpkg/base/stringview.h b/toolsrc/include/vcpkg/base/stringview.h
index a442964f8..6a5503e1c 100644
--- a/toolsrc/include/vcpkg/base/stringview.h
+++ b/toolsrc/include/vcpkg/base/stringview.h
@@ -1,11 +1,11 @@
 #pragma once
 
+#include <vcpkg/base/optional.h>
+
 #include <limits>
 #include <string>
 #include <vector>
 
-#include <vcpkg/base/optional.h>
-
 namespace vcpkg
 {
     struct StringView
diff --git a/toolsrc/include/vcpkg/base/system.debug.h b/toolsrc/include/vcpkg/base/system.debug.h
index c1f98a9e1..d9c50ac8e 100644
--- a/toolsrc/include/vcpkg/base/system.debug.h
+++ b/toolsrc/include/vcpkg/base/system.debug.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <atomic>
-
 #include <vcpkg/base/chrono.h>
 #include <vcpkg/base/system.print.h>
 
+#include <atomic>
+
 namespace vcpkg::Debug
 {
     extern std::atomic<bool> g_debugging;
diff --git a/toolsrc/include/vcpkg/base/system.process.h b/toolsrc/include/vcpkg/base/system.process.h
index 9dbb5d069..91faa5985 100644
--- a/toolsrc/include/vcpkg/base/system.process.h
+++ b/toolsrc/include/vcpkg/base/system.process.h
@@ -1,13 +1,13 @@
 #pragma once
 
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/zstringview.h>
+
 #include <functional>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <vcpkg/base/files.h>
-#include <vcpkg/base/zstringview.h>
-
 namespace vcpkg::System
 {
     struct CMakeVariable
diff --git a/toolsrc/include/vcpkg/base/zstringview.h b/toolsrc/include/vcpkg/base/zstringview.h
index 8aa0dbdaf..ab2c23251 100644
--- a/toolsrc/include/vcpkg/base/zstringview.h
+++ b/toolsrc/include/vcpkg/base/zstringview.h
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <vcpkg/base/stringview.h>
+
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
 #include <string>
 
-#include <vcpkg/base/stringview.h>
-
 namespace vcpkg
 {
     // A counted view of a null-terminated string
diff --git a/toolsrc/include/vcpkg/binarycaching.h b/toolsrc/include/vcpkg/binarycaching.h
index 8517c551a..44c223084 100644
--- a/toolsrc/include/vcpkg/binarycaching.h
+++ b/toolsrc/include/vcpkg/binarycaching.h
@@ -2,6 +2,7 @@
 

 #include <vcpkg/base/expected.h>

 #include <vcpkg/base/files.h>

+

 #include <vcpkg/packagespec.h>

 #include <vcpkg/vcpkgpaths.h>

 

diff --git a/toolsrc/include/vcpkg/binarycaching.private.h b/toolsrc/include/vcpkg/binarycaching.private.h
index 6f2fda9c0..040b34597 100644
--- a/toolsrc/include/vcpkg/binarycaching.private.h
+++ b/toolsrc/include/vcpkg/binarycaching.private.h
@@ -1,11 +1,11 @@
 #pragma once

 

-#include <string>

-

 #include <vcpkg/dependencies.h>

 #include <vcpkg/packagespec.h>

 #include <vcpkg/vcpkgpaths.h>

 

+#include <string>

+

 namespace vcpkg

 {

     std::string reformat_version(const std::string& version, const std::string& abi_tag);

diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index 5d29b0bc3..0fac8222c 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -1,14 +1,10 @@
 #pragma once
 
-#include <array>
-#include <map>
-#include <set>
-#include <vector>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/system.process.h>
+
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/statusparagraphs.h>
@@ -16,6 +12,11 @@
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <array>
+#include <map>
+#include <set>
+#include <vector>
+
 namespace vcpkg
 {
     struct IBinaryProvider;
diff --git a/toolsrc/include/vcpkg/buildenvironment.h b/toolsrc/include/vcpkg/buildenvironment.h
index fe5bbeaf7..921fb419d 100644
--- a/toolsrc/include/vcpkg/buildenvironment.h
+++ b/toolsrc/include/vcpkg/buildenvironment.h
@@ -1,9 +1,10 @@
-#include <string>

-#include <vector>

-

 #include <vcpkg/base/system.process.h>

+

 #include <vcpkg/vcpkgpaths.h>

 

+#include <string>

+#include <vector>

+

 namespace vcpkg

 {

     std::string make_cmake_cmd(const VcpkgPaths& paths,

diff --git a/toolsrc/include/vcpkg/cmakevars.h b/toolsrc/include/vcpkg/cmakevars.h
index e2f1df522..1c02376b9 100644
--- a/toolsrc/include/vcpkg/cmakevars.h
+++ b/toolsrc/include/vcpkg/cmakevars.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/optional.h>
+
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/vcpkgpaths.h>
 
diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h
index 2a8d88320..cec9237f5 100644
--- a/toolsrc/include/vcpkg/commands.h
+++ b/toolsrc/include/vcpkg/commands.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <array>
-#include <map>
-#include <vector>
-
 #include <vcpkg/build.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <array>
+#include <map>
+#include <vector>
+
 namespace vcpkg::Commands
 {
     using CommandTypeA = void (*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths, Triplet default_triplet);
diff --git a/toolsrc/include/vcpkg/dependencies.h b/toolsrc/include/vcpkg/dependencies.h
index 9e11d1c41..a9021355f 100644
--- a/toolsrc/include/vcpkg/dependencies.h
+++ b/toolsrc/include/vcpkg/dependencies.h
@@ -1,11 +1,8 @@
 #pragma once
 
-#include <functional>
-#include <map>
-#include <vector>
-
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/build.h>
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/packagespec.h>
@@ -13,6 +10,10 @@
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <functional>
+#include <map>
+#include <vector>
+
 namespace vcpkg::Graphs
 {
     struct Randomizer;
diff --git a/toolsrc/include/vcpkg/export.chocolatey.h b/toolsrc/include/vcpkg/export.chocolatey.h
index a6dde36db..7804108fd 100644
--- a/toolsrc/include/vcpkg/export.chocolatey.h
+++ b/toolsrc/include/vcpkg/export.chocolatey.h
@@ -1,10 +1,10 @@
 #pragma once

 

-#include <vector>

-

 #include <vcpkg/dependencies.h>

 #include <vcpkg/vcpkgpaths.h>

 

+#include <vector>

+

 namespace vcpkg::Export::Chocolatey

 {

     struct Options

diff --git a/toolsrc/include/vcpkg/export.ifw.h b/toolsrc/include/vcpkg/export.ifw.h
index ec01511aa..b1573924e 100644
--- a/toolsrc/include/vcpkg/export.ifw.h
+++ b/toolsrc/include/vcpkg/export.ifw.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <string>
-#include <vector>
-
 #include <vcpkg/dependencies.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <string>
+#include <vector>
+
 namespace vcpkg::Export::IFW
 {
     struct Options
diff --git a/toolsrc/include/vcpkg/export.prefab.h b/toolsrc/include/vcpkg/export.prefab.h
index cfd99bec7..8fa064e77 100644
--- a/toolsrc/include/vcpkg/export.prefab.h
+++ b/toolsrc/include/vcpkg/export.prefab.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <vector>
-
 #include <vcpkg/base/system.h>
+
 #include <vcpkg/dependencies.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <vector>
+
 namespace vcpkg::Export::Prefab
 {
     constexpr int kFragmentSize = 3;
diff --git a/toolsrc/include/vcpkg/globalstate.h b/toolsrc/include/vcpkg/globalstate.h
index a5bc46ec5..35ca71dbb 100644
--- a/toolsrc/include/vcpkg/globalstate.h
+++ b/toolsrc/include/vcpkg/globalstate.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <atomic>
-#include <string>
-
 #include <vcpkg/base/chrono.h>
 #include <vcpkg/base/util.h>
 
+#include <atomic>
+#include <string>
+
 namespace vcpkg
 {
     struct GlobalState
diff --git a/toolsrc/include/vcpkg/help.h b/toolsrc/include/vcpkg/help.h
index bebf91c64..97bc11864 100644
--- a/toolsrc/include/vcpkg/help.h
+++ b/toolsrc/include/vcpkg/help.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <string>
+
 namespace vcpkg::Help
 {
     extern const CommandStructure COMMAND_STRUCTURE;
diff --git a/toolsrc/include/vcpkg/install.h b/toolsrc/include/vcpkg/install.h
index 81beb8a15..2c674e7de 100644
--- a/toolsrc/include/vcpkg/install.h
+++ b/toolsrc/include/vcpkg/install.h
@@ -1,13 +1,14 @@
 #pragma once
 
-#include <vector>
-
 #include <vcpkg/base/chrono.h>
+
 #include <vcpkg/build.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <vector>
+
 namespace vcpkg::Install
 {
     enum class KeepGoing
diff --git a/toolsrc/include/vcpkg/metrics.h b/toolsrc/include/vcpkg/metrics.h
index 67fbfc00f..3ab1bc758 100644
--- a/toolsrc/include/vcpkg/metrics.h
+++ b/toolsrc/include/vcpkg/metrics.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/util.h>
 
+#include <string>
+
 namespace vcpkg::Metrics
 {
     struct Metrics : Util::ResourceBase
diff --git a/toolsrc/include/vcpkg/packagespec.h b/toolsrc/include/vcpkg/packagespec.h
index 014c1318d..495056884 100644
--- a/toolsrc/include/vcpkg/packagespec.h
+++ b/toolsrc/include/vcpkg/packagespec.h
@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/expected.h>
 #include <vcpkg/base/optional.h>
+
 #include <vcpkg/platform-expression.h>
 #include <vcpkg/triplet.h>
 
diff --git a/toolsrc/include/vcpkg/paragraphparser.h b/toolsrc/include/vcpkg/paragraphparser.h
index 1f48a720f..4403b3aea 100644
--- a/toolsrc/include/vcpkg/paragraphparser.h
+++ b/toolsrc/include/vcpkg/paragraphparser.h
@@ -1,15 +1,16 @@
 #pragma once
 
+#include <vcpkg/base/expected.h>
+
+#include <vcpkg/packagespec.h>
+#include <vcpkg/textrowcol.h>
+
 #include <map>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <vcpkg/base/expected.h>
-#include <vcpkg/packagespec.h>
-#include <vcpkg/textrowcol.h>
-
 namespace vcpkg::Parse
 {
     struct ParseControlErrorInfo
diff --git a/toolsrc/include/vcpkg/paragraphs.h b/toolsrc/include/vcpkg/paragraphs.h
index 67077f6c2..25d037591 100644
--- a/toolsrc/include/vcpkg/paragraphs.h
+++ b/toolsrc/include/vcpkg/paragraphs.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/expected.h>
+
 #include <vcpkg/binaryparagraph.h>
 #include <vcpkg/paragraphparser.h>
 #include <vcpkg/vcpkgpaths.h>
diff --git a/toolsrc/include/vcpkg/platform-expression.h b/toolsrc/include/vcpkg/platform-expression.h
index 8beb5d1d9..b9a6f6a88 100644
--- a/toolsrc/include/vcpkg/platform-expression.h
+++ b/toolsrc/include/vcpkg/platform-expression.h
@@ -1,11 +1,11 @@
 #pragma once

 

-#include <string>

-#include <unordered_map>

-

 #include <vcpkg/base/expected.h>

 #include <vcpkg/base/stringview.h>

 

+#include <string>

+#include <unordered_map>

+

 namespace vcpkg::PlatformExpression

 {

     // map of cmake variables and their values.

diff --git a/toolsrc/include/vcpkg/portfileprovider.h b/toolsrc/include/vcpkg/portfileprovider.h
index 50abbc8ca..e4b5d9cb5 100644
--- a/toolsrc/include/vcpkg/portfileprovider.h
+++ b/toolsrc/include/vcpkg/portfileprovider.h
@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/expected.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/sourceparagraph.h>
 #include <vcpkg/vcpkgpaths.h>
 
diff --git a/toolsrc/include/vcpkg/postbuildlint.buildtype.h b/toolsrc/include/vcpkg/postbuildlint.buildtype.h
index c99fe6084..4d6da1494 100644
--- a/toolsrc/include/vcpkg/postbuildlint.buildtype.h
+++ b/toolsrc/include/vcpkg/postbuildlint.buildtype.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <array>
-#include <regex>
-
 #include <vcpkg/base/cstringview.h>
+
 #include <vcpkg/build.h>
 
+#include <array>
+#include <regex>
+
 namespace vcpkg::PostBuildLint
 {
     struct BuildType
diff --git a/toolsrc/include/vcpkg/sourceparagraph.h b/toolsrc/include/vcpkg/sourceparagraph.h
index 00b847e64..b2743645c 100644
--- a/toolsrc/include/vcpkg/sourceparagraph.h
+++ b/toolsrc/include/vcpkg/sourceparagraph.h
@@ -5,6 +5,7 @@
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/system.h>
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/packagespec.h>
 #include <vcpkg/paragraphparser.h>
 #include <vcpkg/platform-expression.h>
diff --git a/toolsrc/include/vcpkg/statusparagraph.h b/toolsrc/include/vcpkg/statusparagraph.h
index 5228e2964..dde4ecb19 100644
--- a/toolsrc/include/vcpkg/statusparagraph.h
+++ b/toolsrc/include/vcpkg/statusparagraph.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <map>
-
 #include <vcpkg/binaryparagraph.h>
 
+#include <map>
+
 namespace vcpkg
 {
     enum class InstallState
diff --git a/toolsrc/include/vcpkg/statusparagraphs.h b/toolsrc/include/vcpkg/statusparagraphs.h
index bebb4a3e0..8fd85b4e0 100644
--- a/toolsrc/include/vcpkg/statusparagraphs.h
+++ b/toolsrc/include/vcpkg/statusparagraphs.h
@@ -1,9 +1,9 @@
 #pragma once
+#include <vcpkg/statusparagraph.h>
+
 #include <iterator>
 #include <memory>
 
-#include <vcpkg/statusparagraph.h>
-
 namespace vcpkg
 {
     /// <summary>Status paragraphs</summary>
diff --git a/toolsrc/include/vcpkg/tools.h b/toolsrc/include/vcpkg/tools.h
index 7c5ad0480..b57ca2918 100644
--- a/toolsrc/include/vcpkg/tools.h
+++ b/toolsrc/include/vcpkg/tools.h
@@ -1,10 +1,10 @@
 #pragma once
 
+#include <vcpkg/base/files.h>
+
 #include <string>
 #include <utility>
 
-#include <vcpkg/base/files.h>
-
 namespace vcpkg
 {
     struct VcpkgPaths;
diff --git a/toolsrc/include/vcpkg/triplet.h b/toolsrc/include/vcpkg/triplet.h
index d23887b47..736b22a2d 100644
--- a/toolsrc/include/vcpkg/triplet.h
+++ b/toolsrc/include/vcpkg/triplet.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/system.h>
+
 #include <vcpkg/vcpkgcmdarguments.h>
 
+#include <string>
+
 namespace vcpkg
 {
     struct TripletInstance;
diff --git a/toolsrc/include/vcpkg/userconfig.h b/toolsrc/include/vcpkg/userconfig.h
index 4a93472e2..74f8c876a 100644
--- a/toolsrc/include/vcpkg/userconfig.h
+++ b/toolsrc/include/vcpkg/userconfig.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/files.h>
 
+#include <string>
+
 namespace vcpkg
 {
     struct UserConfig
diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h
index bcbf10619..6973311b0 100644
--- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h
+++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/stringliteral.h>
 
+#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
 namespace vcpkg
 {
     struct ParsedArguments
diff --git a/toolsrc/include/vcpkg/vcpkglib.h b/toolsrc/include/vcpkg/vcpkglib.h
index 5674d30db..0fd66e814 100644
--- a/toolsrc/include/vcpkg/vcpkglib.h
+++ b/toolsrc/include/vcpkg/vcpkglib.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/sortedvector.h>
+
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgpaths.h>
 
diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h
index ba7b01e0e..c9168f149 100644
--- a/toolsrc/include/vcpkg/vcpkgpaths.h
+++ b/toolsrc/include/vcpkg/vcpkgpaths.h
@@ -5,6 +5,7 @@
 #include <vcpkg/base/lazy.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/binaryparagraph.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/tools.h>