From dfb60db5b9453d221dd585b8387c551b26c27dc7 Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Thu, 9 Nov 2023 15:06:33 -0800
Subject: [PATCH] Audit headers for overzealous inclusion reported by Visual
 Studio (#1273)

---
 include/vcpkg-test/util.h                     |  2 +-
 include/vcpkg/base/chrono.h                   |  2 +-
 include/vcpkg/base/files.h                    |  2 +-
 include/vcpkg/base/fmt.h                      |  2 +
 include/vcpkg/base/format.h                   | 17 ---------
 include/vcpkg/base/fwd/{format.h => fmt.h}    |  0
 include/vcpkg/base/fwd/graphs.h               | 20 ++++++++++
 include/vcpkg/base/graphs.h                   | 14 +------
 include/vcpkg/base/lineinfo.h                 |  2 +-
 include/vcpkg/base/messages.h                 |  1 -
 include/vcpkg/base/stringview.h               |  2 +-
 include/vcpkg/base/system.h                   |  8 ++--
 include/vcpkg/base/system.process.h           |  1 -
 include/vcpkg/base/system.proxy.h             |  2 +-
 include/vcpkg/buildenvironment.h              |  1 -
 include/vcpkg/bundlesettings.h                | 11 +++---
 include/vcpkg/cmakevars.h                     | 11 +++---
 include/vcpkg/commands.depend-info.h          |  4 ++
 include/vcpkg/commands.find.h                 |  6 +--
 include/vcpkg/commands.h                      |  5 +--
 include/vcpkg/commands.integrate.h            |  2 +
 include/vcpkg/commands.remove.h               |  2 +-
 include/vcpkg/commands.set-installed.h        |  5 ++-
 include/vcpkg/commands.update.h               |  4 +-
 include/vcpkg/commands.z-extract.h            |  3 +-
 .../vcpkg/commands.z-generate-message-map.h   |  6 ++-
 include/vcpkg/configuration.h                 |  4 ++
 include/vcpkg/configure-environment.h         |  5 +--
 include/vcpkg/dependencies.h                  | 34 ++---------------
 include/vcpkg/export.chocolatey.h             |  4 +-
 include/vcpkg/export.ifw.h                    |  3 +-
 include/vcpkg/export.prefab.h                 |  5 ++-
 include/vcpkg/fwd/dependencies.h              | 37 ++++++++++++++++++-
 include/vcpkg/fwd/statusparagraph.h           | 25 +++++++++++++
 include/vcpkg/fwd/statusparagraphs.h          |  6 +++
 include/vcpkg/globalstate.h                   | 10 -----
 include/vcpkg/input.h                         |  7 +++-
 include/vcpkg/packagespec.h                   |  7 +++-
 include/vcpkg/paragraphparser.h               |  5 +--
 include/vcpkg/paragraphs.h                    |  6 +--
 include/vcpkg/portfileprovider.h              |  8 ++--
 include/vcpkg/postbuildlint.h                 |  2 +
 include/vcpkg/registries.h                    |  5 +--
 include/vcpkg/sourceparagraph.h               |  6 +--
 include/vcpkg/spdx.h                          |  2 +
 include/vcpkg/statusparagraph.h               | 21 ++---------
 include/vcpkg/statusparagraphs.h              |  2 +
 include/vcpkg/tools.h                         |  3 +-
 include/vcpkg/triplet.h                       |  4 +-
 include/vcpkg/vcpkglib.h                      |  5 ++-
 include/vcpkg/vcpkgpaths.h                    |  3 +-
 include/vcpkg/versiondeserializers.h          |  3 +-
 include/vcpkg/versions.h                      |  2 +-
 include/vcpkg/visualstudio.h                  |  4 +-
 src/vcpkg-test/binarycaching.cpp              |  3 --
 src/vcpkg-test/bundlesettings.cpp             |  3 +-
 src/vcpkg-test/catch.cpp                      |  2 -
 src/vcpkg-test/cgroup-parser.cpp              |  3 --
 src/vcpkg-test/ci-baseline.cpp                |  2 -
 src/vcpkg-test/commands.extract.cpp           |  6 ---
 src/vcpkg-test/configmetadata.cpp             |  1 -
 src/vcpkg-test/dependencies.cpp               |  8 ----
 src/vcpkg-test/json.cpp                       |  4 --
 src/vcpkg-test/manifests.cpp                  |  4 --
 src/vcpkg-test/messages.cpp                   |  1 -
 src/vcpkg-test/plan.cpp                       |  1 -
 src/vcpkg-test/strings.cpp                    |  2 -
 src/vcpkg-test/system.cpp                     |  1 -
 src/vcpkg-test/system.mac.cpp                 |  1 -
 src/vcpkg-test/system.process.cpp             |  1 -
 src/vcpkg-test/tools.cpp                      |  2 -
 src/vcpkg-test/xunitwriter.cpp                |  4 --
 src/vcpkg.cpp                                 | 18 ++++-----
 src/vcpkg/archives.cpp                        |  3 +-
 src/vcpkg/base/chrono.cpp                     |  4 +-
 src/vcpkg/base/cofffilereader.cpp             |  2 -
 src/vcpkg/base/downloads.cpp                  |  3 --
 src/vcpkg/base/files.cpp                      |  1 -
 src/vcpkg/base/hash.cpp                       |  4 +-
 src/vcpkg/base/json.cpp                       |  5 +--
 src/vcpkg/base/messages.cpp                   |  2 -
 src/vcpkg/base/parse.cpp                      |  2 +-
 src/vcpkg/base/strings.cpp                    |  1 -
 src/vcpkg/base/system.cpp                     |  7 +---
 src/vcpkg/base/system.process.cpp             |  3 +-
 src/vcpkg/base/system.proxy.cpp               |  1 +
 src/vcpkg/binarycaching.cpp                   |  6 +--
 src/vcpkg/buildenvironment.cpp                |  1 -
 src/vcpkg/bundlesettings.cpp                  |  3 +-
 src/vcpkg/cgroup-parser.cpp                   |  2 +-
 src/vcpkg/ci-baseline.cpp                     |  1 -
 src/vcpkg/cmakevars.cpp                       |  2 -
 src/vcpkg/commands.acquire-project.cpp        |  1 -
 src/vcpkg/commands.activate.cpp               |  1 -
 src/vcpkg/commands.add-version.cpp            |  4 +-
 src/vcpkg/commands.autocomplete.cpp           |  3 +-
 src/vcpkg/commands.bootstrap-standalone.cpp   |  2 -
 src/vcpkg/commands.build-external.cpp         |  4 +-
 src/vcpkg/commands.build.cpp                  |  3 --
 src/vcpkg/commands.check-support.cpp          |  1 -
 src/vcpkg/commands.ci-verify-versions.cpp     |  5 +--
 src/vcpkg/commands.ci.cpp                     |  8 +---
 src/vcpkg/commands.create.cpp                 |  4 +-
 src/vcpkg/commands.depend-info.cpp            |  7 +---
 src/vcpkg/commands.download.cpp               |  2 +-
 src/vcpkg/commands.edit.cpp                   |  3 --
 src/vcpkg/commands.env.cpp                    |  1 -
 src/vcpkg/commands.export.cpp                 |  4 --
 src/vcpkg/commands.find.cpp                   |  8 ++--
 src/vcpkg/commands.format-manifest.cpp        |  2 +-
 src/vcpkg/commands.hash.cpp                   |  2 -
 src/vcpkg/commands.install.cpp                |  2 -
 src/vcpkg/commands.integrate.cpp              |  3 +-
 src/vcpkg/commands.list.cpp                   |  3 +-
 src/vcpkg/commands.new.cpp                    |  1 -
 src/vcpkg/commands.owns.cpp                   |  3 +-
 src/vcpkg/commands.package-info.cpp           |  6 +--
 src/vcpkg/commands.portsdiff.cpp              |  2 -
 src/vcpkg/commands.regenerate.cpp             |  1 -
 src/vcpkg/commands.remove.cpp                 |  4 --
 src/vcpkg/commands.search.cpp                 |  1 -
 src/vcpkg/commands.set-installed.cpp          |  4 --
 src/vcpkg/commands.update.cpp                 |  4 +-
 src/vcpkg/commands.upgrade.cpp                |  2 -
 src/vcpkg/commands.version.cpp                |  3 --
 src/vcpkg/commands.z-changelog.cpp            |  2 +-
 src/vcpkg/commands.z-extract.cpp              |  1 -
 src/vcpkg/configuration.cpp                   |  2 -
 src/vcpkg/configure-environment.cpp           |  3 +-
 src/vcpkg/dependencies.cpp                    |  4 --
 src/vcpkg/export.chocolatey.cpp               |  2 -
 src/vcpkg/export.ifw.cpp                      |  1 -
 src/vcpkg/export.prefab.cpp                   |  4 +-
 src/vcpkg/globalstate.cpp                     |  8 ----
 src/vcpkg/input.cpp                           |  2 -
 src/vcpkg/metrics.cpp                         |  2 -
 src/vcpkg/packagespec.cpp                     |  5 +--
 src/vcpkg/paragraphs.cpp                      |  1 -
 src/vcpkg/portfileprovider.cpp                |  5 +--
 src/vcpkg/sourceparagraph.cpp                 |  2 +-
 src/vcpkg/statusparagraphs.cpp                |  1 -
 src/vcpkg/tools.cpp                           |  1 -
 src/vcpkg/triplet.cpp                         |  1 -
 src/vcpkg/vcpkgcmdarguments.cpp               |  4 --
 src/vcpkg/vcpkglib.cpp                        |  2 +-
 src/vcpkg/vcpkgpaths.cpp                      |  1 -
 src/vcpkg/versiondeserializers.cpp            |  2 +-
 src/vcpkg/versions.cpp                        |  2 +-
 src/vcpkg/visualstudio.cpp                    |  1 -
 149 files changed, 255 insertions(+), 391 deletions(-)
 delete mode 100644 include/vcpkg/base/format.h
 rename include/vcpkg/base/fwd/{format.h => fmt.h} (100%)
 create mode 100644 include/vcpkg/base/fwd/graphs.h
 create mode 100644 include/vcpkg/fwd/statusparagraph.h
 create mode 100644 include/vcpkg/fwd/statusparagraphs.h
 delete mode 100644 include/vcpkg/globalstate.h
 delete mode 100644 src/vcpkg/globalstate.cpp

diff --git a/include/vcpkg-test/util.h b/include/vcpkg-test/util.h
index 85487cfcfe..9a6159d966 100644
--- a/include/vcpkg-test/util.h
+++ b/include/vcpkg-test/util.h
@@ -9,7 +9,7 @@
 #include <vcpkg/fwd/tools.h>
 
 #include <vcpkg/base/files.h>
-#include <vcpkg/base/format.h>
+#include <vcpkg/base/fmt.h>
 #include <vcpkg/base/messages.h>
 #include <vcpkg/base/pragmas.h>
 #include <vcpkg/base/strings.h>
diff --git a/include/vcpkg/base/chrono.h b/include/vcpkg/base/chrono.h
index 7bfe91507b..dbd6f86d1c 100644
--- a/include/vcpkg/base/chrono.h
+++ b/include/vcpkg/base/chrono.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <vcpkg/base/fwd/format.h>
+#include <vcpkg/base/fwd/fmt.h>
 
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/stringview.h>
diff --git a/include/vcpkg/base/files.h b/include/vcpkg/base/files.h
index d7ffd92f8b..2a6791f9d6 100644
--- a/include/vcpkg/base/files.h
+++ b/include/vcpkg/base/files.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/fwd/files.h>
-#include <vcpkg/base/fwd/format.h>
+#include <vcpkg/base/fwd/fmt.h>
 #include <vcpkg/base/fwd/message_sinks.h>
 #include <vcpkg/base/fwd/span.h>
 
diff --git a/include/vcpkg/base/fmt.h b/include/vcpkg/base/fmt.h
index b1fc499f87..a6c72959f5 100644
--- a/include/vcpkg/base/fmt.h
+++ b/include/vcpkg/base/fmt.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vcpkg/base/fwd/fmt.h>
+
 #include <vcpkg/base/pragmas.h>
 
 VCPKG_MSVC_WARNING(push)
diff --git a/include/vcpkg/base/format.h b/include/vcpkg/base/format.h
deleted file mode 100644
index f6198e57c8..0000000000
--- a/include/vcpkg/base/format.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <vcpkg/base/fwd/format.h>
-
-#include <vcpkg/base/fmt.h>
-
-#include <system_error>
-
-template<class Char>
-struct fmt::formatter<std::error_code, Char> : formatter<std::string, Char>
-{
-    template<class FormatContext>
-    auto format(const std::error_code& ec, FormatContext& ctx) const -> decltype(ctx.out())
-    {
-        return formatter<std::string, Char>::format(ec.message(), ctx);
-    }
-};
diff --git a/include/vcpkg/base/fwd/format.h b/include/vcpkg/base/fwd/fmt.h
similarity index 100%
rename from include/vcpkg/base/fwd/format.h
rename to include/vcpkg/base/fwd/fmt.h
diff --git a/include/vcpkg/base/fwd/graphs.h b/include/vcpkg/base/fwd/graphs.h
new file mode 100644
index 0000000000..6199c882d6
--- /dev/null
+++ b/include/vcpkg/base/fwd/graphs.h
@@ -0,0 +1,20 @@
+#pragma once
+
+namespace vcpkg
+{
+    enum class ExplorationStatus
+    {
+        // We have not visited this vertex
+        NOT_EXPLORED,
+
+        // We have visited this vertex but haven't visited all vertices in its subtree
+        PARTIALLY_EXPLORED,
+
+        // We have visited this vertex and all vertices in its subtree
+        FULLY_EXPLORED
+    };
+
+    template<class V, class U>
+    struct AdjacencyProvider;
+    struct GraphRandomizer;
+}
diff --git a/include/vcpkg/base/graphs.h b/include/vcpkg/base/graphs.h
index 10ff000f38..8c10236efd 100644
--- a/include/vcpkg/base/graphs.h
+++ b/include/vcpkg/base/graphs.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vcpkg/base/fwd/graphs.h>
+
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/lineinfo.h>
 #include <vcpkg/base/messages.h>
@@ -10,18 +12,6 @@
 
 namespace vcpkg
 {
-    enum class ExplorationStatus
-    {
-        // We have not visited this vertex
-        NOT_EXPLORED,
-
-        // We have visited this vertex but haven't visited all vertices in its subtree
-        PARTIALLY_EXPLORED,
-
-        // We have visited this vertex and all vertices in its subtree
-        FULLY_EXPLORED
-    };
-
     template<class V, class U>
     struct AdjacencyProvider
     {
diff --git a/include/vcpkg/base/lineinfo.h b/include/vcpkg/base/lineinfo.h
index 94f812e10f..3645b86d5f 100644
--- a/include/vcpkg/base/lineinfo.h
+++ b/include/vcpkg/base/lineinfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <vcpkg/base/fwd/format.h>
+#include <vcpkg/base/fwd/fmt.h>
 
 #include <string>
 
diff --git a/include/vcpkg/base/messages.h b/include/vcpkg/base/messages.h
index 0d75a69e0f..e87c672ce8 100644
--- a/include/vcpkg/base/messages.h
+++ b/include/vcpkg/base/messages.h
@@ -3,7 +3,6 @@
 #include <vcpkg/base/fwd/messages.h>
 
 #include <vcpkg/base/fmt.h>
-#include <vcpkg/base/format.h>
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/stringview.h>
 
diff --git a/include/vcpkg/base/stringview.h b/include/vcpkg/base/stringview.h
index 5c6f53ad7f..b65ac62c4f 100644
--- a/include/vcpkg/base/stringview.h
+++ b/include/vcpkg/base/stringview.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <vcpkg/base/fwd/format.h>
+#include <vcpkg/base/fwd/fmt.h>
 #include <vcpkg/base/fwd/stringview.h>
 
 #include <stddef.h>
diff --git a/include/vcpkg/base/system.h b/include/vcpkg/base/system.h
index 8d90ff7fd4..c8b45cc489 100644
--- a/include/vcpkg/base/system.h
+++ b/include/vcpkg/base/system.h
@@ -1,13 +1,11 @@
 #pragma once
 
+#include <vcpkg/base/fwd/expected.h>
 #include <vcpkg/base/fwd/files.h>
+#include <vcpkg/base/fwd/optional.h>
+#include <vcpkg/base/fwd/stringview.h>
 #include <vcpkg/base/fwd/system.h>
 
-#include <vcpkg/base/expected.h>
-#include <vcpkg/base/messages.h>
-#include <vcpkg/base/optional.h>
-#include <vcpkg/base/stringview.h>
-
 #include <string>
 #include <vector>
 
diff --git a/include/vcpkg/base/system.process.h b/include/vcpkg/base/system.process.h
index 7b287734e3..4a93139063 100644
--- a/include/vcpkg/base/system.process.h
+++ b/include/vcpkg/base/system.process.h
@@ -9,7 +9,6 @@
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/stringview.h>
 
-#include <functional>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/include/vcpkg/base/system.proxy.h b/include/vcpkg/base/system.proxy.h
index 71b9d8e810..5dbdbc6e8b 100644
--- a/include/vcpkg/base/system.proxy.h
+++ b/include/vcpkg/base/system.proxy.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <vcpkg/base/optional.h>
+#include <vcpkg/base/fwd/optional.h>
 
 #include <string>
 
diff --git a/include/vcpkg/buildenvironment.h b/include/vcpkg/buildenvironment.h
index 90c9f0bc82..6631cbe0c9 100644
--- a/include/vcpkg/buildenvironment.h
+++ b/include/vcpkg/buildenvironment.h
@@ -4,7 +4,6 @@
 
 #include <vcpkg/base/system.process.h>
 
-#include <string>
 #include <vector>
 
 namespace vcpkg
diff --git a/include/vcpkg/bundlesettings.h b/include/vcpkg/bundlesettings.h
index 197a376c6f..313f759b59 100644
--- a/include/vcpkg/bundlesettings.h
+++ b/include/vcpkg/bundlesettings.h
@@ -1,14 +1,13 @@
 #pragma once
 
-#include <vcpkg/base/fwd/format.h>
+#include <vcpkg/base/fwd/expected.h>
+#include <vcpkg/base/fwd/file-contents.h>
+#include <vcpkg/base/fwd/fmt.h>
+#include <vcpkg/base/fwd/optional.h>
+#include <vcpkg/base/fwd/stringview.h>
 
 #include <vcpkg/fwd/bundlesettings.h>
 
-#include <vcpkg/base/expected.h>
-#include <vcpkg/base/file-contents.h>
-#include <vcpkg/base/optional.h>
-#include <vcpkg/base/stringview.h>
-
 #include <string>
 
 namespace vcpkg
diff --git a/include/vcpkg/cmakevars.h b/include/vcpkg/cmakevars.h
index 097cd99f3c..7e490edb34 100644
--- a/include/vcpkg/cmakevars.h
+++ b/include/vcpkg/cmakevars.h
@@ -1,14 +1,15 @@
 #pragma once
 
+#include <vcpkg/base/fwd/optional.h>
+#include <vcpkg/base/fwd/span.h>
+
 #include <vcpkg/fwd/dependencies.h>
+#include <vcpkg/fwd/packagespec.h>
 #include <vcpkg/fwd/portfileprovider.h>
+#include <vcpkg/fwd/triplet.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
-#include <vcpkg/base/optional.h>
-#include <vcpkg/base/span.h>
-
-#include <vcpkg/packagespec.h>
-
+#include <memory>
 #include <string>
 #include <unordered_map>
 
diff --git a/include/vcpkg/commands.depend-info.h b/include/vcpkg/commands.depend-info.h
index c0198f398f..2ecaca8abd 100644
--- a/include/vcpkg/commands.depend-info.h
+++ b/include/vcpkg/commands.depend-info.h
@@ -6,6 +6,10 @@
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
+#include <string>
+#include <unordered_set>
+#include <vector>
+
 namespace vcpkg
 {
     struct PackageDependInfo
diff --git a/include/vcpkg/commands.find.h b/include/vcpkg/commands.find.h
index 6d20209eb1..9b85cddaf1 100644
--- a/include/vcpkg/commands.find.h
+++ b/include/vcpkg/commands.find.h
@@ -1,11 +1,11 @@
 #pragma once
 
+#include <vcpkg/base/fwd/optional.h>
+#include <vcpkg/base/fwd/stringview.h>
+
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
-#include <vcpkg/base/optional.h>
-#include <vcpkg/base/stringview.h>
-
 #include <string>
 
 namespace vcpkg
diff --git a/include/vcpkg/commands.h b/include/vcpkg/commands.h
index 80b3d23e22..12e6c5c30e 100644
--- a/include/vcpkg/commands.h
+++ b/include/vcpkg/commands.h
@@ -1,14 +1,13 @@
 #pragma once
 
 #include <vcpkg/base/fwd/files.h>
+#include <vcpkg/base/fwd/span.h>
+#include <vcpkg/base/fwd/stringview.h>
 
 #include <vcpkg/fwd/triplet.h>
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
-#include <vcpkg/base/span.h>
-#include <vcpkg/base/stringview.h>
-
 #include <string>
 
 namespace vcpkg
diff --git a/include/vcpkg/commands.integrate.h b/include/vcpkg/commands.integrate.h
index 5c65bf3805..7e71468d1c 100644
--- a/include/vcpkg/commands.integrate.h
+++ b/include/vcpkg/commands.integrate.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vcpkg/base/fwd/optional.h>
+
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
diff --git a/include/vcpkg/commands.remove.h b/include/vcpkg/commands.remove.h
index 35b62efb74..2078c40bce 100644
--- a/include/vcpkg/commands.remove.h
+++ b/include/vcpkg/commands.remove.h
@@ -2,9 +2,9 @@
 
 #include <vcpkg/base/fwd/files.h>
 
-#include <vcpkg/fwd/dependencies.h>
 #include <vcpkg/fwd/installedpaths.h>
 #include <vcpkg/fwd/packagespec.h>
+#include <vcpkg/fwd/statusparagraphs.h>
 #include <vcpkg/fwd/triplet.h>
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
diff --git a/include/vcpkg/commands.set-installed.h b/include/vcpkg/commands.set-installed.h
index 40f43a8779..396496252f 100644
--- a/include/vcpkg/commands.set-installed.h
+++ b/include/vcpkg/commands.set-installed.h
@@ -3,16 +3,17 @@
 #include <vcpkg/base/fwd/json.h>
 #include <vcpkg/base/fwd/optional.h>
 
-#include <vcpkg/fwd/binarycaching.h>
 #include <vcpkg/fwd/build.h>
 #include <vcpkg/fwd/cmakevars.h>
 #include <vcpkg/fwd/commands.install.h>
 #include <vcpkg/fwd/dependencies.h>
-#include <vcpkg/fwd/portfileprovider.h>
+#include <vcpkg/fwd/statusparagraphs.h>
 #include <vcpkg/fwd/triplet.h>
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
+#include <set>
+
 namespace vcpkg
 {
     enum class DryRun : bool
diff --git a/include/vcpkg/commands.update.h b/include/vcpkg/commands.update.h
index 8e2e811950..e23f70380b 100644
--- a/include/vcpkg/commands.update.h
+++ b/include/vcpkg/commands.update.h
@@ -1,13 +1,15 @@
 #pragma once
 
-#include <vcpkg/fwd/dependencies.h>
 #include <vcpkg/fwd/portfileprovider.h>
+#include <vcpkg/fwd/statusparagraphs.h>
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
 #include <vcpkg/packagespec.h>
 #include <vcpkg/versions.h>
 
+#include <vector>
+
 namespace vcpkg
 {
     struct OutdatedPackage
diff --git a/include/vcpkg/commands.z-extract.h b/include/vcpkg/commands.z-extract.h
index 49670fd463..fed76b78fd 100644
--- a/include/vcpkg/commands.z-extract.h
+++ b/include/vcpkg/commands.z-extract.h
@@ -1,9 +1,10 @@
 #pragma once
 
+#include <vcpkg/base/fwd/expected.h>
+
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
-#include <vcpkg/base/expected.h>
 #include <vcpkg/base/path.h>
 
 #include <stddef.h>
diff --git a/include/vcpkg/commands.z-generate-message-map.h b/include/vcpkg/commands.z-generate-message-map.h
index b7c9f51cef..ce010ddc4a 100644
--- a/include/vcpkg/commands.z-generate-message-map.h
+++ b/include/vcpkg/commands.z-generate-message-map.h
@@ -1,10 +1,14 @@
 #pragma once
 
+#include <vcpkg/base/fwd/messages.h>
+
 #include <vcpkg/base/files.h>
-#include <vcpkg/base/messages.h>
+#include <vcpkg/base/stringview.h>
 
 #include <vcpkg/vcpkgcmdarguments.h>
 
+#include <vector>
+
 namespace vcpkg
 {
     struct FormatArgMismatches
diff --git a/include/vcpkg/configuration.h b/include/vcpkg/configuration.h
index f208387921..79d4d0fe9f 100644
--- a/include/vcpkg/configuration.h
+++ b/include/vcpkg/configuration.h
@@ -11,6 +11,10 @@
 
 #include <vcpkg/registries.h>
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace vcpkg
 {
     /// <summary>
diff --git a/include/vcpkg/configure-environment.h b/include/vcpkg/configure-environment.h
index abb6441b54..597d7f6333 100644
--- a/include/vcpkg/configure-environment.h
+++ b/include/vcpkg/configure-environment.h
@@ -1,18 +1,17 @@
 #pragma once
 
 #include <vcpkg/base/fwd/downloads.h>
+#include <vcpkg/base/fwd/expected.h>
 #include <vcpkg/base/fwd/files.h>
 
 #include <vcpkg/fwd/vcpkgpaths.h>
 
-#include <vcpkg/base/expected.h>
-#include <vcpkg/base/span.h>
 #include <vcpkg/base/stringview.h>
-#include <vcpkg/base/util.h>
 
 #include <vcpkg/vcpkgcmdarguments.h>
 
 #include <string>
+#include <vector>
 
 namespace vcpkg
 {
diff --git a/include/vcpkg/dependencies.h b/include/vcpkg/dependencies.h
index 303d5c493c..2d40bc5bfa 100644
--- a/include/vcpkg/dependencies.h
+++ b/include/vcpkg/dependencies.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vcpkg/base/fwd/graphs.h>
+
 #include <vcpkg/fwd/cmakevars.h>
 #include <vcpkg/fwd/portfileprovider.h>
 
@@ -9,37 +11,14 @@
 #include <vcpkg/packagespec.h>
 #include <vcpkg/statusparagraph.h>
 
-#include <functional>
 #include <map>
+#include <string>
 #include <vector>
 
 namespace vcpkg
 {
-    struct GraphRandomizer;
-
-    enum class UnsupportedPortAction : bool
-    {
-        Warn,
-        Error,
-    };
-
-    enum class RequestType
-    {
-        UNKNOWN,
-        USER_REQUESTED,
-        AUTO_SELECTED
-    };
-
     [[nodiscard]] StringLiteral request_type_indent(RequestType request_type);
 
-    enum class InstallPlanType
-    {
-        UNKNOWN,
-        BUILD_AND_INSTALL,
-        ALREADY_INSTALLED,
-        EXCLUDED
-    };
-
     struct BasicAction
     {
         static bool compare_by_name(const BasicAction* left, const BasicAction* right);
@@ -120,13 +99,6 @@ namespace vcpkg
         std::map<FeatureSpec, PlatformExpression::Expr> unsupported_features;
     };
 
-    enum class ExportPlanType
-    {
-        UNKNOWN,
-        NOT_BUILT,
-        ALREADY_BUILT
-    };
-
     struct ExportPlanAction : BasicAction
     {
         ExportPlanAction(const ExportPlanAction&) = delete;
diff --git a/include/vcpkg/export.chocolatey.h b/include/vcpkg/export.chocolatey.h
index 9417d7e4ca..59ef3e5bb0 100644
--- a/include/vcpkg/export.chocolatey.h
+++ b/include/vcpkg/export.chocolatey.h
@@ -1,9 +1,11 @@
 #pragma once
 
+#include <vcpkg/fwd/dependencies.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
-#include <vcpkg/dependencies.h>
+#include <vcpkg/base/optional.h>
 
+#include <string>
 #include <vector>
 
 namespace vcpkg::Chocolatey
diff --git a/include/vcpkg/export.ifw.h b/include/vcpkg/export.ifw.h
index a8965ec285..24468a5371 100644
--- a/include/vcpkg/export.ifw.h
+++ b/include/vcpkg/export.ifw.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include <vcpkg/fwd/dependencies.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
-#include <vcpkg/dependencies.h>
+#include <vcpkg/base/optional.h>
 
 #include <string>
 #include <vector>
diff --git a/include/vcpkg/export.prefab.h b/include/vcpkg/export.prefab.h
index 2f68fefb7f..1a7ea00092 100644
--- a/include/vcpkg/export.prefab.h
+++ b/include/vcpkg/export.prefab.h
@@ -1,11 +1,12 @@
 #pragma once
 
+#include <vcpkg/fwd/dependencies.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
+#include <vcpkg/base/optional.h>
 #include <vcpkg/base/system.h>
 
-#include <vcpkg/dependencies.h>
-
+#include <string>
 #include <vector>
 
 // glibc defines major and minor in sys/types.h, and should not
diff --git a/include/vcpkg/fwd/dependencies.h b/include/vcpkg/fwd/dependencies.h
index b578994cda..0a142ec4fe 100644
--- a/include/vcpkg/fwd/dependencies.h
+++ b/include/vcpkg/fwd/dependencies.h
@@ -2,8 +2,43 @@
 
 namespace vcpkg
 {
+    enum class UnsupportedPortAction : bool
+    {
+        Warn,
+        Error,
+    };
+
+    enum class RequestType
+    {
+        UNKNOWN,
+        USER_REQUESTED,
+        AUTO_SELECTED
+    };
+
+    enum class InstallPlanType
+    {
+        UNKNOWN,
+        BUILD_AND_INSTALL,
+        ALREADY_INSTALLED,
+        EXCLUDED
+    };
+
+    enum class ExportPlanType
+    {
+        UNKNOWN,
+        NOT_BUILT,
+        ALREADY_BUILT
+    };
+
+    struct BasicAction;
+    struct PackageAction;
     struct InstallPlanAction;
-    struct ActionPlan;
+    struct NotInstalledAction;
     struct RemovePlanAction;
+    struct ActionPlan;
+    struct ExportPlanAction;
+    struct CreateInstallPlanOptions;
+    struct RemovePlan;
+    struct FormattedPlan;
     struct StatusParagraphs;
 }
diff --git a/include/vcpkg/fwd/statusparagraph.h b/include/vcpkg/fwd/statusparagraph.h
new file mode 100644
index 0000000000..5dd5567e89
--- /dev/null
+++ b/include/vcpkg/fwd/statusparagraph.h
@@ -0,0 +1,25 @@
+#pragma once
+
+namespace vcpkg
+{
+    enum class InstallState
+    {
+        ERROR_STATE,
+        NOT_INSTALLED,
+        HALF_INSTALLED,
+        INSTALLED,
+    };
+
+    enum class Want
+    {
+        ERROR_STATE,
+        UNKNOWN,
+        INSTALL,
+        HOLD,
+        DEINSTALL,
+        PURGE
+    };
+
+    struct StatusParagraph;
+    struct InstalledPackageView;
+}
diff --git a/include/vcpkg/fwd/statusparagraphs.h b/include/vcpkg/fwd/statusparagraphs.h
new file mode 100644
index 0000000000..cd9656e68e
--- /dev/null
+++ b/include/vcpkg/fwd/statusparagraphs.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct StatusParagraphs;
+}
diff --git a/include/vcpkg/globalstate.h b/include/vcpkg/globalstate.h
deleted file mode 100644
index 180da88522..0000000000
--- a/include/vcpkg/globalstate.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include <atomic>
-
-namespace vcpkg
-{
-    extern std::atomic<int> g_init_console_cp;
-    extern std::atomic<int> g_init_console_output_cp;
-    extern std::atomic<bool> g_init_console_initialized;
-}
diff --git a/include/vcpkg/input.h b/include/vcpkg/input.h
index 310acd29eb..84d5762107 100644
--- a/include/vcpkg/input.h
+++ b/include/vcpkg/input.h
@@ -1,8 +1,11 @@
 #pragma once
 
-#include <vcpkg/fwd/vcpkgpaths.h>
+#include <vcpkg/base/fwd/messages.h>
+#include <vcpkg/base/fwd/stringview.h>
 
-#include <vcpkg/packagespec.h>
+#include <vcpkg/fwd/packagespec.h>
+#include <vcpkg/fwd/triplet.h>
+#include <vcpkg/fwd/vcpkgpaths.h>
 
 namespace vcpkg
 {
diff --git a/include/vcpkg/packagespec.h b/include/vcpkg/packagespec.h
index 26d9951f4e..a7917ec027 100644
--- a/include/vcpkg/packagespec.h
+++ b/include/vcpkg/packagespec.h
@@ -1,17 +1,20 @@
 #pragma once
 
-#include <vcpkg/base/fwd/format.h>
+#include <vcpkg/base/fwd/fmt.h>
 #include <vcpkg/base/fwd/parse.h>
+#include <vcpkg/base/fwd/span.h>
 
 #include <vcpkg/fwd/packagespec.h>
 
 #include <vcpkg/base/expected.h>
 #include <vcpkg/base/optional.h>
-#include <vcpkg/base/span.h>
 
 #include <vcpkg/platform-expression.h>
 #include <vcpkg/triplet.h>
 
+#include <string>
+#include <vector>
+
 namespace vcpkg
 {
     ///
diff --git a/include/vcpkg/paragraphparser.h b/include/vcpkg/paragraphparser.h
index 984e594275..1624b2a3e2 100644
--- a/include/vcpkg/paragraphparser.h
+++ b/include/vcpkg/paragraphparser.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <vcpkg/base/fwd/messages.h>
-
 #include <vcpkg/fwd/paragraphparser.h>
 
 #include <vcpkg/base/expected.h>
+#include <vcpkg/base/messages.h>
+#include <vcpkg/base/stringview.h>
 
 #include <vcpkg/packagespec.h>
 #include <vcpkg/textrowcol.h>
@@ -12,7 +12,6 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 namespace vcpkg
diff --git a/include/vcpkg/paragraphs.h b/include/vcpkg/paragraphs.h
index c1f7e69d22..8e749fafb7 100644
--- a/include/vcpkg/paragraphs.h
+++ b/include/vcpkg/paragraphs.h
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <vcpkg/base/fwd/expected.h>
+#include <vcpkg/base/fwd/stringview.h>
+
 #include <vcpkg/fwd/binaryparagraph.h>
 #include <vcpkg/fwd/paragraphparser.h>
 #include <vcpkg/fwd/registries.h>
 
-#include <vcpkg/base/expected.h>
-#include <vcpkg/base/stringview.h>
-
 #include <vcpkg/sourceparagraph.h>
 
 #include <utility>
diff --git a/include/vcpkg/portfileprovider.h b/include/vcpkg/portfileprovider.h
index 3a00860443..a2056aaf4a 100644
--- a/include/vcpkg/portfileprovider.h
+++ b/include/vcpkg/portfileprovider.h
@@ -1,13 +1,13 @@
 #pragma once
 
+#include <vcpkg/base/fwd/expected.h>
+#include <vcpkg/base/fwd/span.h>
+
 #include <vcpkg/fwd/portfileprovider.h>
 #include <vcpkg/fwd/registries.h>
-
-#include <vcpkg/base/expected.h>
-#include <vcpkg/base/util.h>
+#include <vcpkg/fwd/versions.h>
 
 #include <vcpkg/sourceparagraph.h>
-#include <vcpkg/versions.h>
 
 namespace vcpkg
 {
diff --git a/include/vcpkg/postbuildlint.h b/include/vcpkg/postbuildlint.h
index c63f97a7c1..bc21639cf7 100644
--- a/include/vcpkg/postbuildlint.h
+++ b/include/vcpkg/postbuildlint.h
@@ -7,6 +7,8 @@
 #include <vcpkg/fwd/packagespec.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
+#include <stddef.h>
+
 namespace vcpkg
 {
     size_t perform_post_build_lint_checks(const PackageSpec& spec,
diff --git a/include/vcpkg/registries.h b/include/vcpkg/registries.h
index 00c4996d90..9710450044 100644
--- a/include/vcpkg/registries.h
+++ b/include/vcpkg/registries.h
@@ -1,14 +1,14 @@
 #pragma once
 
+#include <vcpkg/base/fwd/expected.h>
 #include <vcpkg/base/fwd/files.h>
 #include <vcpkg/base/fwd/json.h>
+#include <vcpkg/base/fwd/optional.h>
 
 #include <vcpkg/fwd/configuration.h>
 #include <vcpkg/fwd/registries.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
-#include <vcpkg/base/expected.h>
-#include <vcpkg/base/optional.h>
 #include <vcpkg/base/path.h>
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/stringview.h>
@@ -18,7 +18,6 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <system_error>
 #include <vector>
 
 namespace vcpkg
diff --git a/include/vcpkg/sourceparagraph.h b/include/vcpkg/sourceparagraph.h
index f36ab18642..45015036e8 100644
--- a/include/vcpkg/sourceparagraph.h
+++ b/include/vcpkg/sourceparagraph.h
@@ -1,15 +1,15 @@
 #pragma once
 
+#include <vcpkg/base/fwd/expected.h>
+#include <vcpkg/base/fwd/span.h>
+
 #include <vcpkg/fwd/configuration.h>
 #include <vcpkg/fwd/packagespec.h>
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 
-#include <vcpkg/base/expected.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/path.h>
-#include <vcpkg/base/span.h>
 
-#include <vcpkg/packagespec.h>
 #include <vcpkg/paragraphparser.h>
 #include <vcpkg/platform-expression.h>
 #include <vcpkg/versions.h>
diff --git a/include/vcpkg/spdx.h b/include/vcpkg/spdx.h
index fe093311e0..902b731872 100644
--- a/include/vcpkg/spdx.h
+++ b/include/vcpkg/spdx.h
@@ -2,12 +2,14 @@
 
 #include <vcpkg/base/fwd/files.h>
 #include <vcpkg/base/fwd/json.h>
+#include <vcpkg/base/fwd/stringview.h>
 
 #include <vcpkg/fwd/dependencies.h>
 
 #include <vcpkg/base/span.h>
 
 #include <string>
+#include <vector>
 
 namespace vcpkg
 {
diff --git a/include/vcpkg/statusparagraph.h b/include/vcpkg/statusparagraph.h
index 1d03eb4390..89a92b38c4 100644
--- a/include/vcpkg/statusparagraph.h
+++ b/include/vcpkg/statusparagraph.h
@@ -1,6 +1,9 @@
 #pragma once
 
+#include <vcpkg/base/fwd/json.h>
+
 #include <vcpkg/fwd/installedpaths.h>
+#include <vcpkg/fwd/statusparagraph.h>
 
 #include <vcpkg/binaryparagraph.h>
 
@@ -10,24 +13,6 @@
 
 namespace vcpkg
 {
-    enum class InstallState
-    {
-        ERROR_STATE,
-        NOT_INSTALLED,
-        HALF_INSTALLED,
-        INSTALLED,
-    };
-
-    enum class Want
-    {
-        ERROR_STATE,
-        UNKNOWN,
-        INSTALL,
-        HOLD,
-        DEINSTALL,
-        PURGE
-    };
-
     /// <summary>
     /// Installed package metadata
     /// </summary>
diff --git a/include/vcpkg/statusparagraphs.h b/include/vcpkg/statusparagraphs.h
index bbf70f7b04..320e3c4fc0 100644
--- a/include/vcpkg/statusparagraphs.h
+++ b/include/vcpkg/statusparagraphs.h
@@ -1,4 +1,6 @@
 #pragma once
+#include <vcpkg/fwd/statusparagraphs.h>
+
 #include <vcpkg/statusparagraph.h>
 
 #include <iterator>
diff --git a/include/vcpkg/tools.h b/include/vcpkg/tools.h
index d3719da83b..9e0e6b0b6e 100644
--- a/include/vcpkg/tools.h
+++ b/include/vcpkg/tools.h
@@ -1,15 +1,14 @@
 #pragma once
 
 #include <vcpkg/base/fwd/downloads.h>
+#include <vcpkg/base/fwd/expected.h>
 #include <vcpkg/base/fwd/files.h>
 
 #include <vcpkg/fwd/tools.h>
 
-#include <vcpkg/base/expected.h>
 #include <vcpkg/base/stringview.h>
 
 #include <string>
-#include <utility>
 
 namespace vcpkg
 {
diff --git a/include/vcpkg/triplet.h b/include/vcpkg/triplet.h
index 3c2328f0ec..c605d3e324 100644
--- a/include/vcpkg/triplet.h
+++ b/include/vcpkg/triplet.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <vcpkg/base/fwd/format.h>
+#include <vcpkg/base/fwd/fmt.h>
+#include <vcpkg/base/fwd/optional.h>
 #include <vcpkg/base/fwd/system.h>
 
 #include <vcpkg/fwd/triplet.h>
 #include <vcpkg/fwd/vcpkgcmdarguments.h>
 
-#include <vcpkg/base/optional.h>
 #include <vcpkg/base/path.h>
 #include <vcpkg/base/stringview.h>
 
diff --git a/include/vcpkg/vcpkglib.h b/include/vcpkg/vcpkglib.h
index f85139a763..7621d8526b 100644
--- a/include/vcpkg/vcpkglib.h
+++ b/include/vcpkg/vcpkglib.h
@@ -3,10 +3,13 @@
 #include <vcpkg/base/fwd/files.h>
 
 #include <vcpkg/fwd/installedpaths.h>
+#include <vcpkg/fwd/statusparagraphs.h>
 
 #include <vcpkg/base/sortedvector.h>
 
-#include <vcpkg/statusparagraphs.h>
+#include <vcpkg/statusparagraph.h>
+
+#include <string>
 
 namespace vcpkg
 {
diff --git a/include/vcpkg/vcpkgpaths.h b/include/vcpkg/vcpkgpaths.h
index 05c8e34a85..90fd4d093c 100644
--- a/include/vcpkg/vcpkgpaths.h
+++ b/include/vcpkg/vcpkgpaths.h
@@ -3,6 +3,7 @@
 #include <vcpkg/base/fwd/downloads.h>
 #include <vcpkg/base/fwd/files.h>
 #include <vcpkg/base/fwd/git.h>
+#include <vcpkg/base/fwd/system.h>
 #include <vcpkg/base/fwd/system.process.h>
 
 #include <vcpkg/fwd/build.h>
@@ -20,8 +21,6 @@
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/path.h>
 
-#include <vcpkg/triplet.h>
-
 #include <map>
 #include <string>
 #include <utility>
diff --git a/include/vcpkg/versiondeserializers.h b/include/vcpkg/versiondeserializers.h
index 4d327717ad..1564099f7a 100644
--- a/include/vcpkg/versiondeserializers.h
+++ b/include/vcpkg/versiondeserializers.h
@@ -1,13 +1,12 @@
 #pragma once
 
+#include <vcpkg/base/fwd/messages.h>
 #include <vcpkg/base/fwd/stringview.h>
 
 #include <vcpkg/fwd/versions.h>
 
 #include <vcpkg/base/jsonreader.h>
 
-#include <vcpkg/versions.h>
-
 namespace vcpkg
 {
     const Json::IDeserializer<Version>& get_version_deserializer_instance();
diff --git a/include/vcpkg/versions.h b/include/vcpkg/versions.h
index aa00010d51..ace6e5ec0e 100644
--- a/include/vcpkg/versions.h
+++ b/include/vcpkg/versions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <vcpkg/base/fwd/format.h>
+#include <vcpkg/base/fwd/fmt.h>
 #include <vcpkg/base/fwd/optional.h>
 #include <vcpkg/base/fwd/stringview.h>
 
diff --git a/include/vcpkg/visualstudio.h b/include/vcpkg/visualstudio.h
index b9d8f258c2..9c3c67bd70 100644
--- a/include/vcpkg/visualstudio.h
+++ b/include/vcpkg/visualstudio.h
@@ -1,10 +1,12 @@
 #pragma once
 
-#include <vcpkg/base/fwd/files.h>
 #include <vcpkg/base/fwd/messages.h>
 
 #include <vcpkg/fwd/vcpkgpaths.h>
 
+#include <vcpkg/base/files.h>
+
+#include <string>
 #include <vector>
 
 namespace vcpkg
diff --git a/src/vcpkg-test/binarycaching.cpp b/src/vcpkg-test/binarycaching.cpp
index 0532d26d9e..46a55884e9 100644
--- a/src/vcpkg-test/binarycaching.cpp
+++ b/src/vcpkg-test/binarycaching.cpp
@@ -1,6 +1,5 @@
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/base/files.h>
 #include <vcpkg/base/xmlserializer.h>
 
 #include <vcpkg/binarycaching.h>
@@ -8,8 +7,6 @@
 #include <vcpkg/dependencies.h>
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/sourceparagraph.h>
-#include <vcpkg/tools.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 #include <string>
 
diff --git a/src/vcpkg-test/bundlesettings.cpp b/src/vcpkg-test/bundlesettings.cpp
index 9009be614d..8805e746d8 100644
--- a/src/vcpkg-test/bundlesettings.cpp
+++ b/src/vcpkg-test/bundlesettings.cpp
@@ -1,7 +1,6 @@
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/base/format.h>
-#include <vcpkg/base/strings.h>
+#include <vcpkg/base/fmt.h>
 
 #include <vcpkg/bundlesettings.h>
 
diff --git a/src/vcpkg-test/catch.cpp b/src/vcpkg-test/catch.cpp
index 0cf4eb0bc3..f296f80bc5 100644
--- a/src/vcpkg-test/catch.cpp
+++ b/src/vcpkg-test/catch.cpp
@@ -1,8 +1,6 @@
 #define CATCH_CONFIG_RUNNER
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/base/checks.h>
-#include <vcpkg/base/messages.h>
 #include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/system.h>
 
diff --git a/src/vcpkg-test/cgroup-parser.cpp b/src/vcpkg-test/cgroup-parser.cpp
index 5bbeaa7fda..46f3297958 100644
--- a/src/vcpkg-test/cgroup-parser.cpp
+++ b/src/vcpkg-test/cgroup-parser.cpp
@@ -1,8 +1,5 @@
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/base/files.h>
-#include <vcpkg/base/optional.h>
-#include <vcpkg/base/stringview.h>
 #include <vcpkg/base/system.process.h>
 
 #include <vcpkg/cgroup-parser.h>
diff --git a/src/vcpkg-test/ci-baseline.cpp b/src/vcpkg-test/ci-baseline.cpp
index 32a038b5a4..e89c883b4a 100644
--- a/src/vcpkg-test/ci-baseline.cpp
+++ b/src/vcpkg-test/ci-baseline.cpp
@@ -4,8 +4,6 @@
 #include <vcpkg/base/parse.h>
 
 #include <vcpkg/ci-baseline.h>
-#include <vcpkg/commands.build.h>
-#include <vcpkg/triplet.h>
 
 #include <ostream>
 #include <utility>
diff --git a/src/vcpkg-test/commands.extract.cpp b/src/vcpkg-test/commands.extract.cpp
index fbeae95516..85ed401587 100644
--- a/src/vcpkg-test/commands.extract.cpp
+++ b/src/vcpkg-test/commands.extract.cpp
@@ -1,12 +1,6 @@
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/base/files.h>
-
 #include <vcpkg/commands.z-extract.h>
-#include <vcpkg/vcpkgcmdarguments.h>
-#include <vcpkg/vcpkgpaths.h>
-
-#include <limits.h>
 
 using namespace vcpkg;
 
diff --git a/src/vcpkg-test/configmetadata.cpp b/src/vcpkg-test/configmetadata.cpp
index b794cb2deb..cbcc94e61a 100644
--- a/src/vcpkg-test/configmetadata.cpp
+++ b/src/vcpkg-test/configmetadata.cpp
@@ -5,7 +5,6 @@
 #include <vcpkg/base/stringview.h>
 
 #include <vcpkg/configuration.h>
-#include <vcpkg/registries.h>
 
 using namespace vcpkg;
 
diff --git a/src/vcpkg-test/dependencies.cpp b/src/vcpkg-test/dependencies.cpp
index 7f035e34fc..c00c221fde 100644
--- a/src/vcpkg-test/dependencies.cpp
+++ b/src/vcpkg-test/dependencies.cpp
@@ -1,19 +1,11 @@
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/fwd/packagespec.h>
-
-#include <vcpkg/base/files.h>
-#include <vcpkg/base/graphs.h>
-
 #include <vcpkg/commands.set-installed.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/sourceparagraph.h>
-#include <vcpkg/triplet.h>
 
 #include <memory>
-#include <numeric>
-#include <unordered_map>
 #include <vector>
 
 #include <vcpkg-test/mockcmakevarprovider.h>
diff --git a/src/vcpkg-test/json.cpp b/src/vcpkg-test/json.cpp
index 854cbdef54..97d36c8d18 100644
--- a/src/vcpkg-test/json.cpp
+++ b/src/vcpkg-test/json.cpp
@@ -1,13 +1,9 @@
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/base/files.h>
 #include <vcpkg/base/json.h>
-#include <vcpkg/base/unicode.h>
 
 #include <iostream>
 
-#include "math.h"
-
 // TODO: remove this once we switch to C++20 completely
 // This is the worst, but we also can't really deal with it any other way.
 #if __cpp_char8_t
diff --git a/src/vcpkg-test/manifests.cpp b/src/vcpkg-test/manifests.cpp
index e98ce45498..d4a717f280 100644
--- a/src/vcpkg-test/manifests.cpp
+++ b/src/vcpkg-test/manifests.cpp
@@ -3,15 +3,11 @@
 #include <vcpkg/base/fwd/message_sinks.h>
 
 #include <vcpkg/base/json.h>
-#include <vcpkg/base/util.h>
 
-#include <vcpkg/paragraphs.h>
 #include <vcpkg/sourceparagraph.h>
 #include <vcpkg/vcpkgcmdarguments.h>
-#include <vcpkg/vcpkgpaths.h>
 
 using namespace vcpkg;
-using namespace vcpkg::Paragraphs;
 using namespace vcpkg::Test;
 
 static Json::Object parse_json_object(StringView sv)
diff --git a/src/vcpkg-test/messages.cpp b/src/vcpkg-test/messages.cpp
index 3171bbce27..842b354e08 100644
--- a/src/vcpkg-test/messages.cpp
+++ b/src/vcpkg-test/messages.cpp
@@ -1,6 +1,5 @@
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/base/json.h>
 #include <vcpkg/base/setup-messages.h>
 
 #include <vcpkg/commands.z-generate-message-map.h>
diff --git a/src/vcpkg-test/plan.cpp b/src/vcpkg-test/plan.cpp
index 0f2cc8c6b3..e293408da4 100644
--- a/src/vcpkg-test/plan.cpp
+++ b/src/vcpkg-test/plan.cpp
@@ -8,7 +8,6 @@
 #include <vcpkg/triplet.h>
 
 #include <memory>
-#include <unordered_map>
 #include <vector>
 
 #include <vcpkg-test/mockcmakevarprovider.h>
diff --git a/src/vcpkg-test/strings.cpp b/src/vcpkg-test/strings.cpp
index 6313e7113e..2bcb5dc445 100644
--- a/src/vcpkg-test/strings.cpp
+++ b/src/vcpkg-test/strings.cpp
@@ -1,8 +1,6 @@
 #include <vcpkg-test/util.h>
 
 #include <vcpkg/base/api-stable-format.h>
-#include <vcpkg/base/expected.h>
-#include <vcpkg/base/span.h>
 #include <vcpkg/base/strings.h>
 
 #include <stdint.h>
diff --git a/src/vcpkg-test/system.cpp b/src/vcpkg-test/system.cpp
index f10bf65c32..dff7017393 100644
--- a/src/vcpkg-test/system.cpp
+++ b/src/vcpkg-test/system.cpp
@@ -3,7 +3,6 @@
 #include <vcpkg-test/util.h>
 
 #include <vcpkg/base/optional.h>
-#include <vcpkg/base/strings.h>
 #include <vcpkg/base/stringview.h>
 #include <vcpkg/base/system.h>
 #include <vcpkg/base/system.process.h>
diff --git a/src/vcpkg-test/system.mac.cpp b/src/vcpkg-test/system.mac.cpp
index 938de0dbe3..48f982592b 100644
--- a/src/vcpkg-test/system.mac.cpp
+++ b/src/vcpkg-test/system.mac.cpp
@@ -1,6 +1,5 @@
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/base/span.h>
 #include <vcpkg/base/stringview.h>
 #include <vcpkg/base/system.mac.h>
 
diff --git a/src/vcpkg-test/system.process.cpp b/src/vcpkg-test/system.process.cpp
index bce6c2d050..476a99dd5d 100644
--- a/src/vcpkg-test/system.process.cpp
+++ b/src/vcpkg-test/system.process.cpp
@@ -1,6 +1,5 @@
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/base/strings.h>
 #include <vcpkg/base/system.process.h>
 
 using namespace vcpkg;
diff --git a/src/vcpkg-test/tools.cpp b/src/vcpkg-test/tools.cpp
index 434e0d674f..eeeef4dc28 100644
--- a/src/vcpkg-test/tools.cpp
+++ b/src/vcpkg-test/tools.cpp
@@ -1,7 +1,5 @@
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/base/expected.h>
-
 #include <vcpkg/tools.h>
 #include <vcpkg/tools.test.h>
 
diff --git a/src/vcpkg-test/xunitwriter.cpp b/src/vcpkg-test/xunitwriter.cpp
index 6358be980e..7b71409696 100644
--- a/src/vcpkg-test/xunitwriter.cpp
+++ b/src/vcpkg-test/xunitwriter.cpp
@@ -1,11 +1,7 @@
 #include <vcpkg-test/util.h>
 
-#include <vcpkg/commands.build.h>
 #include <vcpkg/xunitwriter.h>
 
-#include <ostream>
-#include <utility>
-
 using namespace vcpkg;
 
 TEST_CASE ("Simple XunitWriter", "[xunitwriter]")
diff --git a/src/vcpkg.cpp b/src/vcpkg.cpp
index d0e298413c..4a7ac2fa36 100644
--- a/src/vcpkg.cpp
+++ b/src/vcpkg.cpp
@@ -14,26 +14,18 @@
 
 #include <vcpkg/bundlesettings.h>
 #include <vcpkg/cgroup-parser.h>
-#include <vcpkg/commands.contact.h>
 #include <vcpkg/commands.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.version.h>
-#include <vcpkg/globalstate.h>
-#include <vcpkg/input.h>
 #include <vcpkg/metrics.h>
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/vcpkgcmdarguments.h>
-#include <vcpkg/vcpkglib.h>
 #include <vcpkg/vcpkgpaths.h>
 
 #include <locale.h>
 
-#include <cassert>
-#include <clocale>
-#include <memory>
-#include <random>
-
 #if defined(_WIN32)
+#include <atomic>
+
 #pragma comment(lib, "ole32")
 #pragma comment(lib, "shell32")
 #endif
@@ -42,6 +34,12 @@ using namespace vcpkg;
 
 namespace
 {
+#if defined(_WIN32)
+    std::atomic<int> g_init_console_cp(0);
+    std::atomic<int> g_init_console_output_cp(0);
+    std::atomic<bool> g_init_console_initialized(false);
+#endif // ^^^ _WIN32
+
     void invalid_command(const VcpkgCmdArguments& args)
     {
         msg::println_error(msgVcpkgInvalidCommand, msg::command_name = args.get_command());
diff --git a/src/vcpkg/archives.cpp b/src/vcpkg/archives.cpp
index 97037712fb..a49061af8d 100644
--- a/src/vcpkg/archives.cpp
+++ b/src/vcpkg/archives.cpp
@@ -1,12 +1,11 @@
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/parse.h>
-#include <vcpkg/base/system.debug.h>
+#include <vcpkg/base/strings.h>
 #include <vcpkg/base/system.h>
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
 
 #include <vcpkg/archives.h>
-#include <vcpkg/commands.h>
 #include <vcpkg/tools.h>
 
 namespace
diff --git a/src/vcpkg/base/chrono.cpp b/src/vcpkg/base/chrono.cpp
index b24ebc1001..9b674e477a 100644
--- a/src/vcpkg/base/chrono.cpp
+++ b/src/vcpkg/base/chrono.cpp
@@ -1,6 +1,6 @@
-#include <vcpkg/base/checks.h>
 #include <vcpkg/base/chrono.h>
-#include <vcpkg/base/format.h>
+#include <vcpkg/base/fmt.h>
+#include <vcpkg/base/optional.h>
 
 namespace vcpkg
 {
diff --git a/src/vcpkg/base/cofffilereader.cpp b/src/vcpkg/base/cofffilereader.cpp
index 62354ff5c9..757fd7028e 100644
--- a/src/vcpkg/base/cofffilereader.cpp
+++ b/src/vcpkg/base/cofffilereader.cpp
@@ -7,8 +7,6 @@
 #include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/util.h>
 
-#include <stdio.h>
-
 namespace
 {
     using namespace vcpkg;
diff --git a/src/vcpkg/base/downloads.cpp b/src/vcpkg/base/downloads.cpp
index 3baa677c76..608e210698 100644
--- a/src/vcpkg/base/downloads.cpp
+++ b/src/vcpkg/base/downloads.cpp
@@ -1,5 +1,4 @@
 #include <vcpkg/base/api-stable-format.h>
-#include <vcpkg/base/cache.h>
 #include <vcpkg/base/downloads.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/hash.h>
@@ -11,10 +10,8 @@
 #include <vcpkg/base/system.h>
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/system.proxy.h>
-#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.version.h>
-#include <vcpkg/metrics.h>
 
 namespace vcpkg
 {
diff --git a/src/vcpkg/base/files.cpp b/src/vcpkg/base/files.cpp
index 2e307bc75a..376677025e 100644
--- a/src/vcpkg/base/files.cpp
+++ b/src/vcpkg/base/files.cpp
@@ -7,7 +7,6 @@
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/system.h>
-#include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
 
 #include <assert.h>
diff --git a/src/vcpkg/base/hash.cpp b/src/vcpkg/base/hash.cpp
index 39117ad46b..68799c62a0 100644
--- a/src/vcpkg/base/hash.cpp
+++ b/src/vcpkg/base/hash.cpp
@@ -1,13 +1,11 @@
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/expected.h>
 #include <vcpkg/base/files.h>
-#include <vcpkg/base/format.h>
+#include <vcpkg/base/fmt.h>
 #include <vcpkg/base/hash.h>
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/system.debug.h>
-#include <vcpkg/base/system.process.h>
 #include <vcpkg/base/uint128.h>
-#include <vcpkg/base/util.h>
 
 #if defined(_WIN32)
 #include <bcrypt.h>
diff --git a/src/vcpkg/base/json.cpp b/src/vcpkg/base/json.cpp
index 66059f31c0..9a0152812e 100644
--- a/src/vcpkg/base/json.cpp
+++ b/src/vcpkg/base/json.cpp
@@ -7,9 +7,8 @@
 
 #include <vcpkg/documentation.h>
 
-#include <inttypes.h>
-
-#include <memory>
+#include <atomic>
+#include <type_traits>
 
 namespace vcpkg::Json
 {
diff --git a/src/vcpkg/base/messages.cpp b/src/vcpkg/base/messages.cpp
index 7091ec6d76..ccd10c9431 100644
--- a/src/vcpkg/base/messages.cpp
+++ b/src/vcpkg/base/messages.cpp
@@ -2,9 +2,7 @@
 #include <vcpkg/base/messages.h>
 #include <vcpkg/base/setup-messages.h>
 #include <vcpkg/base/system.debug.h>
-#include <vcpkg/base/util.h>
 
-#include <iterator>
 #include <vector>
 
 #include <cmrc/cmrc.hpp>
diff --git a/src/vcpkg/base/parse.cpp b/src/vcpkg/base/parse.cpp
index 89e1b7fde3..bdadabf937 100644
--- a/src/vcpkg/base/parse.cpp
+++ b/src/vcpkg/base/parse.cpp
@@ -2,7 +2,7 @@
 #include <vcpkg/base/parse.h>
 #include <vcpkg/base/util.h>
 
-#include <algorithm>
+#include <memory>
 #include <utility>
 
 namespace vcpkg
diff --git a/src/vcpkg/base/strings.cpp b/src/vcpkg/base/strings.cpp
index e846780f97..373869cd77 100644
--- a/src/vcpkg/base/strings.cpp
+++ b/src/vcpkg/base/strings.cpp
@@ -8,7 +8,6 @@
 #include <vcpkg/base/util.h>
 
 #include <ctype.h>
-#include <stdarg.h>
 
 #include <algorithm>
 #include <iterator>
diff --git a/src/vcpkg/base/system.cpp b/src/vcpkg/base/system.cpp
index 034903bdb6..82326a466c 100644
--- a/src/vcpkg/base/system.cpp
+++ b/src/vcpkg/base/system.cpp
@@ -1,12 +1,9 @@
 #include <vcpkg/base/checks.h>
-#include <vcpkg/base/chrono.h>
+#include <vcpkg/base/expected.h>
 #include <vcpkg/base/messages.h>
+#include <vcpkg/base/path.h>
 #include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/system.h>
-#include <vcpkg/base/system.process.h>
-#include <vcpkg/base/util.h>
-
-#include <ctime>
 
 #if defined(__APPLE__)
 #include <sys/sysctl.h>
diff --git a/src/vcpkg/base/system.process.cpp b/src/vcpkg/base/system.process.cpp
index df72e80a30..462f7d6690 100644
--- a/src/vcpkg/base/system.process.cpp
+++ b/src/vcpkg/base/system.process.cpp
@@ -11,8 +11,7 @@
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
 
-#include <ctime>
-#include <future>
+#include <map>
 #include <set>
 
 #if defined(__APPLE__)
diff --git a/src/vcpkg/base/system.proxy.cpp b/src/vcpkg/base/system.proxy.cpp
index 3b891e9b39..934220da44 100644
--- a/src/vcpkg/base/system.proxy.cpp
+++ b/src/vcpkg/base/system.proxy.cpp
@@ -1,3 +1,4 @@
+#include <vcpkg/base/optional.h>
 #include <vcpkg/base/system.proxy.h>
 
 vcpkg::Optional<vcpkg::IEProxySetting> vcpkg::get_windows_ie_proxy_server()
diff --git a/src/vcpkg/binarycaching.cpp b/src/vcpkg/binarycaching.cpp
index 0e1e9e191c..46b8f27ae9 100644
--- a/src/vcpkg/binarycaching.cpp
+++ b/src/vcpkg/binarycaching.cpp
@@ -4,7 +4,6 @@
 #include <vcpkg/base/downloads.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/json.h>
-#include <vcpkg/base/lazy.h>
 #include <vcpkg/base/message_sinks.h>
 #include <vcpkg/base/messages.h>
 #include <vcpkg/base/parse.h>
@@ -18,15 +17,14 @@
 #include <vcpkg/archives.h>
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/binarycaching.private.h>
-#include <vcpkg/commands.build.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/documentation.h>
 #include <vcpkg/metrics.h>
 #include <vcpkg/tools.h>
 #include <vcpkg/vcpkgpaths.h>
 
-#include <iterator>
-#include <numeric>
+#include <memory>
+#include <utility>
 
 using namespace vcpkg;
 
diff --git a/src/vcpkg/buildenvironment.cpp b/src/vcpkg/buildenvironment.cpp
index 47c88999a6..490b8c5c95 100644
--- a/src/vcpkg/buildenvironment.cpp
+++ b/src/vcpkg/buildenvironment.cpp
@@ -3,7 +3,6 @@
 #include <vcpkg/buildenvironment.h>
 #include <vcpkg/installedpaths.h>
 #include <vcpkg/tools.h>
-#include <vcpkg/triplet.h>
 #include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg
diff --git a/src/vcpkg/bundlesettings.cpp b/src/vcpkg/bundlesettings.cpp
index 47dd6ec976..3d5fca9a1f 100644
--- a/src/vcpkg/bundlesettings.cpp
+++ b/src/vcpkg/bundlesettings.cpp
@@ -1,4 +1,5 @@
-#include <vcpkg/base/format.h>
+#include <vcpkg/base/file-contents.h>
+#include <vcpkg/base/fmt.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/messages.h>
 
diff --git a/src/vcpkg/cgroup-parser.cpp b/src/vcpkg/cgroup-parser.cpp
index 5ed6b85928..c3f930c5ba 100644
--- a/src/vcpkg/cgroup-parser.cpp
+++ b/src/vcpkg/cgroup-parser.cpp
@@ -1,6 +1,6 @@
 #include <vcpkg/base/parse.h>
+#include <vcpkg/base/strings.h>
 #include <vcpkg/base/stringview.h>
-#include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/util.h>
 
 #include <vcpkg/cgroup-parser.h>
diff --git a/src/vcpkg/ci-baseline.cpp b/src/vcpkg/ci-baseline.cpp
index 3d1d1a6eaf..f4df2b1156 100644
--- a/src/vcpkg/ci-baseline.cpp
+++ b/src/vcpkg/ci-baseline.cpp
@@ -1,5 +1,4 @@
 #include <vcpkg/base/parse.h>
-#include <vcpkg/base/util.h>
 
 #include <vcpkg/ci-baseline.h>
 #include <vcpkg/commands.build.h>
diff --git a/src/vcpkg/cmakevars.cpp b/src/vcpkg/cmakevars.cpp
index 5d1c199b5e..bb1aade71d 100644
--- a/src/vcpkg/cmakevars.cpp
+++ b/src/vcpkg/cmakevars.cpp
@@ -1,4 +1,3 @@
-#include <vcpkg/base/hash.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/strings.h>
@@ -9,7 +8,6 @@
 #include <vcpkg/buildenvironment.h>
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/dependencies.h>
-#include <vcpkg/portfileprovider.h>
 #include <vcpkg/vcpkgpaths.h>
 
 using namespace vcpkg;
diff --git a/src/vcpkg/commands.acquire-project.cpp b/src/vcpkg/commands.acquire-project.cpp
index 098b5fb681..bee23eb8a9 100644
--- a/src/vcpkg/commands.acquire-project.cpp
+++ b/src/vcpkg/commands.acquire-project.cpp
@@ -1,5 +1,4 @@
 #include <vcpkg/base/checks.h>
-#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.acquire-project.h>
 #include <vcpkg/configure-environment.h>
diff --git a/src/vcpkg/commands.activate.cpp b/src/vcpkg/commands.activate.cpp
index 521bf98cc5..643569e17d 100644
--- a/src/vcpkg/commands.activate.cpp
+++ b/src/vcpkg/commands.activate.cpp
@@ -1,5 +1,4 @@
 #include <vcpkg/base/checks.h>
-#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.activate.h>
 #include <vcpkg/configure-environment.h>
diff --git a/src/vcpkg/commands.add-version.cpp b/src/vcpkg/commands.add-version.cpp
index 857cec2033..f756f90493 100644
--- a/src/vcpkg/commands.add-version.cpp
+++ b/src/vcpkg/commands.add-version.cpp
@@ -1,15 +1,13 @@
 
 #include <vcpkg/base/checks.h>
-#include <vcpkg/base/expected.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/git.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/strings.h>
+#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.add-version.h>
-#include <vcpkg/configuration.h>
 #include <vcpkg/paragraphs.h>
-#include <vcpkg/portfileprovider.h>
 #include <vcpkg/registries.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
diff --git a/src/vcpkg/commands.autocomplete.cpp b/src/vcpkg/commands.autocomplete.cpp
index a51bfa3df6..364360e965 100644
--- a/src/vcpkg/commands.autocomplete.cpp
+++ b/src/vcpkg/commands.autocomplete.cpp
@@ -1,6 +1,7 @@
+#include <vcpkg/base/fwd/messages.h>
+
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/lineinfo.h>
-#include <vcpkg/base/messages.h>
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/util.h>
 
diff --git a/src/vcpkg/commands.bootstrap-standalone.cpp b/src/vcpkg/commands.bootstrap-standalone.cpp
index 4e08625733..6663836108 100644
--- a/src/vcpkg/commands.bootstrap-standalone.cpp
+++ b/src/vcpkg/commands.bootstrap-standalone.cpp
@@ -1,10 +1,8 @@
 #include <vcpkg/base/downloads.h>
 #include <vcpkg/base/files.h>
-#include <vcpkg/base/optional.h>
 
 #include <vcpkg/archives.h>
 #include <vcpkg/commands.bootstrap-standalone.h>
-#include <vcpkg/commands.version.h>
 #include <vcpkg/configure-environment.h>
 #include <vcpkg/tools.h>
 #include <vcpkg/vcpkgcmdarguments.h>
diff --git a/src/vcpkg/commands.build-external.cpp b/src/vcpkg/commands.build-external.cpp
index 02ea0d3e3e..cb3ce55c68 100644
--- a/src/vcpkg/commands.build-external.cpp
+++ b/src/vcpkg/commands.build-external.cpp
@@ -1,12 +1,10 @@
-#include <vcpkg/binarycaching.h>
-#include <vcpkg/cmakevars.h>
 #include <vcpkg/commands.build-external.h>
 #include <vcpkg/commands.build.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/input.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/registries.h>
 #include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg
 {
diff --git a/src/vcpkg/commands.build.cpp b/src/vcpkg/commands.build.cpp
index 491dbe4fb9..8ee58f4ffe 100644
--- a/src/vcpkg/commands.build.cpp
+++ b/src/vcpkg/commands.build.cpp
@@ -18,12 +18,9 @@
 #include <vcpkg/buildenvironment.h>
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/commands.build.h>
-#include <vcpkg/commands.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.version.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/documentation.h>
-#include <vcpkg/globalstate.h>
 #include <vcpkg/input.h>
 #include <vcpkg/installedpaths.h>
 #include <vcpkg/metrics.h>
diff --git a/src/vcpkg/commands.check-support.cpp b/src/vcpkg/commands.check-support.cpp
index eae5ded56c..883e218895 100644
--- a/src/vcpkg/commands.check-support.cpp
+++ b/src/vcpkg/commands.check-support.cpp
@@ -1,4 +1,3 @@
-#include <vcpkg/base/checks.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/util.h>
diff --git a/src/vcpkg/commands.ci-verify-versions.cpp b/src/vcpkg/commands.ci-verify-versions.cpp
index 8f5171346a..32aeddfc19 100644
--- a/src/vcpkg/commands.ci-verify-versions.cpp
+++ b/src/vcpkg/commands.ci-verify-versions.cpp
@@ -2,17 +2,14 @@
 
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/files.h>
-#include <vcpkg/base/json.h>
-#include <vcpkg/base/system.debug.h>
+#include <vcpkg/base/strings.h>
 #include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.ci-verify-versions.h>
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/registries.h>
-#include <vcpkg/sourceparagraph.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
-#include <vcpkg/versiondeserializers.h>
 
 using namespace vcpkg;
 
diff --git a/src/vcpkg/commands.ci.cpp b/src/vcpkg/commands.ci.cpp
index 6ffc09830d..9adf16a674 100644
--- a/src/vcpkg/commands.ci.cpp
+++ b/src/vcpkg/commands.ci.cpp
@@ -1,25 +1,19 @@
-#include <vcpkg/base/cache.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/graphs.h>
 #include <vcpkg/base/sortedvector.h>
 #include <vcpkg/base/span.h>
+#include <vcpkg/base/strings.h>
 #include <vcpkg/base/stringview.h>
-#include <vcpkg/base/system.debug.h>
-#include <vcpkg/base/system.h>
 #include <vcpkg/base/util.h>
-#include <vcpkg/base/xmlserializer.h>
 
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/ci-baseline.h>
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/commands.build.h>
 #include <vcpkg/commands.ci.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.install.h>
 #include <vcpkg/commands.set-installed.h>
 #include <vcpkg/dependencies.h>
-#include <vcpkg/globalstate.h>
-#include <vcpkg/input.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/platform-expression.h>
diff --git a/src/vcpkg/commands.create.cpp b/src/vcpkg/commands.create.cpp
index 3bc94c8d25..c7c317bc80 100644
--- a/src/vcpkg/commands.create.cpp
+++ b/src/vcpkg/commands.create.cpp
@@ -1,14 +1,14 @@
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/files.h>
-#include <vcpkg/base/util.h>
 
 #include <vcpkg/buildenvironment.h>
 #include <vcpkg/commands.create.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.version.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <algorithm>
+
 using namespace vcpkg;
 
 namespace
diff --git a/src/vcpkg/commands.depend-info.cpp b/src/vcpkg/commands.depend-info.cpp
index a0c0d85d51..1f730ded00 100644
--- a/src/vcpkg/commands.depend-info.cpp
+++ b/src/vcpkg/commands.depend-info.cpp
@@ -1,23 +1,20 @@
+#include <vcpkg/base/expected.h>
 #include <vcpkg/base/strings.h>
-#include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/util.h>
 #include <vcpkg/base/xmlserializer.h>
 
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/commands.depend-info.h>
-#include <vcpkg/commands.help.h>
-#include <vcpkg/commands.install.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/input.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/registries.h>
+#include <vcpkg/triplet.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 
 #include <limits.h>
 
-#include <vector>
-
 using namespace vcpkg;
 
 namespace
diff --git a/src/vcpkg/commands.download.cpp b/src/vcpkg/commands.download.cpp
index aeac703691..13eb046a6b 100644
--- a/src/vcpkg/commands.download.cpp
+++ b/src/vcpkg/commands.download.cpp
@@ -4,7 +4,7 @@
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/hash.h>
 #include <vcpkg/base/parse.h>
-#include <vcpkg/base/system.debug.h>
+#include <vcpkg/base/strings.h>
 #include <vcpkg/base/util.h>
 
 #include <vcpkg/binarycaching.h>
diff --git a/src/vcpkg/commands.edit.cpp b/src/vcpkg/commands.edit.cpp
index 9bacec7088..5d8aa2ed9b 100644
--- a/src/vcpkg/commands.edit.cpp
+++ b/src/vcpkg/commands.edit.cpp
@@ -5,9 +5,6 @@
 #include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.edit.h>
-#include <vcpkg/commands.help.h>
-#include <vcpkg/paragraphs.h>
-#include <vcpkg/registries.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
diff --git a/src/vcpkg/commands.env.cpp b/src/vcpkg/commands.env.cpp
index 3d2e06a5ef..2d28130e7c 100644
--- a/src/vcpkg/commands.env.cpp
+++ b/src/vcpkg/commands.env.cpp
@@ -5,7 +5,6 @@
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/commands.build.h>
 #include <vcpkg/commands.env.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/installedpaths.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/registries.h>
diff --git a/src/vcpkg/commands.export.cpp b/src/vcpkg/commands.export.cpp
index 1be849645d..62b883ab20 100644
--- a/src/vcpkg/commands.export.cpp
+++ b/src/vcpkg/commands.export.cpp
@@ -1,14 +1,11 @@
 #include <vcpkg/base/fwd/message_sinks.h>
 
 #include <vcpkg/base/stringview.h>
-#include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
 #include <vcpkg/base/xmlserializer.h>
 
 #include <vcpkg/commands.export.h>
-#include <vcpkg/commands.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.install.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/export.chocolatey.h>
@@ -16,7 +13,6 @@
 #include <vcpkg/export.prefab.h>
 #include <vcpkg/input.h>
 #include <vcpkg/installedpaths.h>
-#include <vcpkg/paragraphs.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/registries.h>
 #include <vcpkg/tools.h>
diff --git a/src/vcpkg/commands.find.cpp b/src/vcpkg/commands.find.cpp
index 7767ecf7cc..18132dcae2 100644
--- a/src/vcpkg/commands.find.cpp
+++ b/src/vcpkg/commands.find.cpp
@@ -1,20 +1,18 @@
+#include <vcpkg/base/files.h>
 #include <vcpkg/base/hash.h>
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/strings.h>
+#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.find.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/configure-environment.h>
-#include <vcpkg/dependencies.h>
-#include <vcpkg/globalstate.h>
 #include <vcpkg/metrics.h>
-#include <vcpkg/paragraphs.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/registries.h>
 #include <vcpkg/sourceparagraph.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkglib.h>
-#include <vcpkg/versions.h>
+#include <vcpkg/vcpkgpaths.h>
 
 using namespace vcpkg;
 
diff --git a/src/vcpkg/commands.format-manifest.cpp b/src/vcpkg/commands.format-manifest.cpp
index f4d04a031a..a50add8b71 100644
--- a/src/vcpkg/commands.format-manifest.cpp
+++ b/src/vcpkg/commands.format-manifest.cpp
@@ -4,10 +4,10 @@
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/system.debug.h>
+#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.format-manifest.h>
 #include <vcpkg/paragraphs.h>
-#include <vcpkg/portfileprovider.h>
 #include <vcpkg/sourceparagraph.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
diff --git a/src/vcpkg/commands.hash.cpp b/src/vcpkg/commands.hash.cpp
index 282f7f416d..8fe90fceac 100644
--- a/src/vcpkg/commands.hash.cpp
+++ b/src/vcpkg/commands.hash.cpp
@@ -1,10 +1,8 @@
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/hash.h>
-#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.hash.h>
 #include <vcpkg/vcpkgcmdarguments.h>
-#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg
 {
diff --git a/src/vcpkg/commands.install.cpp b/src/vcpkg/commands.install.cpp
index eaed2ae8bc..f076398b41 100644
--- a/src/vcpkg/commands.install.cpp
+++ b/src/vcpkg/commands.install.cpp
@@ -10,14 +10,12 @@
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/commands.build.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.install.h>
 #include <vcpkg/commands.remove.h>
 #include <vcpkg/commands.set-installed.h>
 #include <vcpkg/configuration.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/documentation.h>
-#include <vcpkg/globalstate.h>
 #include <vcpkg/input.h>
 #include <vcpkg/installedpaths.h>
 #include <vcpkg/metrics.h>
diff --git a/src/vcpkg/commands.integrate.cpp b/src/vcpkg/commands.integrate.cpp
index e1492297b7..8020d54e33 100644
--- a/src/vcpkg/commands.integrate.cpp
+++ b/src/vcpkg/commands.integrate.cpp
@@ -1,10 +1,9 @@
 #include <vcpkg/base/fwd/message_sinks.h>
 
 #include <vcpkg/base/checks.h>
-#include <vcpkg/base/expected.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/parse.h>
-#include <vcpkg/base/system.debug.h>
+#include <vcpkg/base/strings.h>
 #include <vcpkg/base/system.h>
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
diff --git a/src/vcpkg/commands.list.cpp b/src/vcpkg/commands.list.cpp
index 0c49f8ae4e..745ae26760 100644
--- a/src/vcpkg/commands.list.cpp
+++ b/src/vcpkg/commands.list.cpp
@@ -1,12 +1,11 @@
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/util.h>
 
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.list.h>
+#include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkglib.h>
 #include <vcpkg/vcpkgpaths.h>
-#include <vcpkg/versions.h>
 
 using namespace vcpkg;
 
diff --git a/src/vcpkg/commands.new.cpp b/src/vcpkg/commands.new.cpp
index e124a96670..28ff6d902f 100644
--- a/src/vcpkg/commands.new.cpp
+++ b/src/vcpkg/commands.new.cpp
@@ -6,7 +6,6 @@
 #include <vcpkg/commands.new.h>
 #include <vcpkg/configuration.h>
 #include <vcpkg/registries.h>
-#include <vcpkg/tools.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 #include <vcpkg/versions.h>
diff --git a/src/vcpkg/commands.owns.cpp b/src/vcpkg/commands.owns.cpp
index d0bea99929..16ecd80676 100644
--- a/src/vcpkg/commands.owns.cpp
+++ b/src/vcpkg/commands.owns.cpp
@@ -1,5 +1,5 @@
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.owns.h>
+#include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkglib.h>
 #include <vcpkg/vcpkgpaths.h>
@@ -47,7 +47,6 @@ namespace vcpkg
     void command_owns_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
     {
         const auto parsed = args.parse_arguments(CommandOwnsMetadata);
-
         const StatusParagraphs status_db = database_load_check(paths.get_filesystem(), paths.installed());
         search_file(paths.get_filesystem(), paths.installed(), parsed.command_arguments[0], status_db);
         Checks::exit_success(VCPKG_LINE_INFO);
diff --git a/src/vcpkg/commands.package-info.cpp b/src/vcpkg/commands.package-info.cpp
index d5108eb9d9..8991fa9bbf 100644
--- a/src/vcpkg/commands.package-info.cpp
+++ b/src/vcpkg/commands.package-info.cpp
@@ -1,16 +1,16 @@
+#include <vcpkg/base/files.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/parse.h>
 #include <vcpkg/base/stringview.h>
+#include <vcpkg/base/util.h>
 
-#include <vcpkg/commands.install.h>
 #include <vcpkg/commands.package-info.h>
-#include <vcpkg/input.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/registries.h>
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkglib.h>
-#include <vcpkg/versions.h>
+#include <vcpkg/vcpkgpaths.h>
 
 using namespace vcpkg;
 
diff --git a/src/vcpkg/commands.portsdiff.cpp b/src/vcpkg/commands.portsdiff.cpp
index fa570f4f22..df51da8e82 100644
--- a/src/vcpkg/commands.portsdiff.cpp
+++ b/src/vcpkg/commands.portsdiff.cpp
@@ -2,10 +2,8 @@
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
 
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.portsdiff.h>
 #include <vcpkg/paragraphs.h>
-#include <vcpkg/tools.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 #include <vcpkg/versions.h>
diff --git a/src/vcpkg/commands.regenerate.cpp b/src/vcpkg/commands.regenerate.cpp
index 56d8f6d7a8..1657094db9 100644
--- a/src/vcpkg/commands.regenerate.cpp
+++ b/src/vcpkg/commands.regenerate.cpp
@@ -6,7 +6,6 @@
 #include <vcpkg/configure-environment.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 
-#include <array>
 #include <string>
 #include <vector>
 
diff --git a/src/vcpkg/commands.remove.cpp b/src/vcpkg/commands.remove.cpp
index b2e77821e9..15def992a4 100644
--- a/src/vcpkg/commands.remove.cpp
+++ b/src/vcpkg/commands.remove.cpp
@@ -1,14 +1,10 @@
-#include <vcpkg/base/strings.h>
 #include <vcpkg/base/util.h>
 
-#include <vcpkg/commands.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.remove.h>
 #include <vcpkg/commands.update.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/input.h>
 #include <vcpkg/installedpaths.h>
-#include <vcpkg/paragraphs.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/registries.h>
 #include <vcpkg/vcpkglib.h>
diff --git a/src/vcpkg/commands.search.cpp b/src/vcpkg/commands.search.cpp
index fe809200fa..7d1d3323d4 100644
--- a/src/vcpkg/commands.search.cpp
+++ b/src/vcpkg/commands.search.cpp
@@ -1,7 +1,6 @@
 #include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.find.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.search.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
diff --git a/src/vcpkg/commands.set-installed.cpp b/src/vcpkg/commands.set-installed.cpp
index 71992c2430..126dcc18db 100644
--- a/src/vcpkg/commands.set-installed.cpp
+++ b/src/vcpkg/commands.set-installed.cpp
@@ -1,15 +1,11 @@
 #include <vcpkg/base/downloads.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/system.debug.h>
-#include <vcpkg/base/system.h>
 
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/cmakevars.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.install.h>
-#include <vcpkg/commands.remove.h>
 #include <vcpkg/commands.set-installed.h>
-#include <vcpkg/globalstate.h>
 #include <vcpkg/input.h>
 #include <vcpkg/metrics.h>
 #include <vcpkg/portfileprovider.h>
diff --git a/src/vcpkg/commands.update.cpp b/src/vcpkg/commands.update.cpp
index df2be61b59..d576a9cf0a 100644
--- a/src/vcpkg/commands.update.cpp
+++ b/src/vcpkg/commands.update.cpp
@@ -1,11 +1,9 @@
 #include <vcpkg/base/files.h>
 
-#include <vcpkg/commands.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.update.h>
-#include <vcpkg/paragraphs.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/registries.h>
+#include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkglib.h>
 #include <vcpkg/vcpkgpaths.h>
diff --git a/src/vcpkg/commands.upgrade.cpp b/src/vcpkg/commands.upgrade.cpp
index 539b67bda3..f9cf3202eb 100644
--- a/src/vcpkg/commands.upgrade.cpp
+++ b/src/vcpkg/commands.upgrade.cpp
@@ -3,12 +3,10 @@
 
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/cmakevars.h>
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.install.h>
 #include <vcpkg/commands.update.h>
 #include <vcpkg/commands.upgrade.h>
 #include <vcpkg/dependencies.h>
-#include <vcpkg/globalstate.h>
 #include <vcpkg/input.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/registries.h>
diff --git a/src/vcpkg/commands.version.cpp b/src/vcpkg/commands.version.cpp
index db142ed816..ed28f43729 100644
--- a/src/vcpkg/commands.version.cpp
+++ b/src/vcpkg/commands.version.cpp
@@ -1,8 +1,5 @@
-#include <vcpkg/commands.help.h>
 #include <vcpkg/commands.version.h>
-#include <vcpkg/metrics.h>
 #include <vcpkg/vcpkgcmdarguments.h>
-#include <vcpkg/vcpkgpaths.h>
 
 using namespace vcpkg;
 
diff --git a/src/vcpkg/commands.z-changelog.cpp b/src/vcpkg/commands.z-changelog.cpp
index d149144e43..548f807ef7 100644
--- a/src/vcpkg/commands.z-changelog.cpp
+++ b/src/vcpkg/commands.z-changelog.cpp
@@ -1,5 +1,5 @@
 #include <vcpkg/base/files.h>
-#include <vcpkg/base/format.h>
+#include <vcpkg/base/fmt.h>
 
 #include <vcpkg/commands.portsdiff.h>
 #include <vcpkg/commands.z-changelog.h>
diff --git a/src/vcpkg/commands.z-extract.cpp b/src/vcpkg/commands.z-extract.cpp
index 8135cdb508..d09f96d8a4 100644
--- a/src/vcpkg/commands.z-extract.cpp
+++ b/src/vcpkg/commands.z-extract.cpp
@@ -4,7 +4,6 @@
 #include <vcpkg/base/strings.h>
 
 #include <vcpkg/archives.h>
-#include <vcpkg/commands.h>
 #include <vcpkg/commands.z-extract.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
diff --git a/src/vcpkg/configuration.cpp b/src/vcpkg/configuration.cpp
index b81a948c7a..6489362691 100644
--- a/src/vcpkg/configuration.cpp
+++ b/src/vcpkg/configuration.cpp
@@ -6,8 +6,6 @@
 
 #include <vcpkg/configuration.h>
 #include <vcpkg/documentation.h>
-#include <vcpkg/metrics.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
 namespace
diff --git a/src/vcpkg/configure-environment.cpp b/src/vcpkg/configure-environment.cpp
index 0360d6a8af..579a437abb 100644
--- a/src/vcpkg/configure-environment.cpp
+++ b/src/vcpkg/configure-environment.cpp
@@ -6,12 +6,11 @@
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/setup-messages.h>
 #include <vcpkg/base/system.debug.h>
-#include <vcpkg/base/system.h>
 #include <vcpkg/base/system.process.h>
+#include <vcpkg/base/util.h>
 #include <vcpkg/base/uuid.h>
 
 #include <vcpkg/archives.h>
-#include <vcpkg/commands.version.h>
 #include <vcpkg/configure-environment.h>
 #include <vcpkg/metrics.h>
 #include <vcpkg/tools.h>
diff --git a/src/vcpkg/dependencies.cpp b/src/vcpkg/dependencies.cpp
index ff1faa328d..25be4f6b06 100644
--- a/src/vcpkg/dependencies.cpp
+++ b/src/vcpkg/dependencies.cpp
@@ -1,4 +1,3 @@
-#include <vcpkg/base/files.h>
 #include <vcpkg/base/graphs.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/strings.h>
@@ -7,13 +6,10 @@
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/documentation.h>
-#include <vcpkg/metrics.h>
 #include <vcpkg/packagespec.h>
-#include <vcpkg/paragraphs.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkglib.h>
-#include <vcpkg/vcpkgpaths.h>
 
 #include <unordered_map>
 #include <unordered_set>
diff --git a/src/vcpkg/export.chocolatey.cpp b/src/vcpkg/export.chocolatey.cpp
index f305070951..0a06632aaf 100644
--- a/src/vcpkg/export.chocolatey.cpp
+++ b/src/vcpkg/export.chocolatey.cpp
@@ -3,8 +3,6 @@
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/system.process.h>
 
-#include <vcpkg/commands.export.h>
-#include <vcpkg/commands.h>
 #include <vcpkg/commands.install.h>
 #include <vcpkg/export.chocolatey.h>
 #include <vcpkg/installedpaths.h>
diff --git a/src/vcpkg/export.ifw.cpp b/src/vcpkg/export.ifw.cpp
index 73129566c5..8892810d7c 100644
--- a/src/vcpkg/export.ifw.cpp
+++ b/src/vcpkg/export.ifw.cpp
@@ -5,7 +5,6 @@
 #include <vcpkg/base/system.process.h>
 
 #include <vcpkg/commands.export.h>
-#include <vcpkg/commands.h>
 #include <vcpkg/commands.install.h>
 #include <vcpkg/export.ifw.h>
 #include <vcpkg/installedpaths.h>
diff --git a/src/vcpkg/export.prefab.cpp b/src/vcpkg/export.prefab.cpp
index c80b1a881a..a5d7b3750b 100644
--- a/src/vcpkg/export.prefab.cpp
+++ b/src/vcpkg/export.prefab.cpp
@@ -9,9 +9,7 @@
 #include <vcpkg/archives.h>
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/commands.build.h>
-#include <vcpkg/commands.export.h>
-#include <vcpkg/commands.h>
-#include <vcpkg/commands.install.h>
+#include <vcpkg/dependencies.h>
 #include <vcpkg/export.prefab.h>
 #include <vcpkg/installedpaths.h>
 #include <vcpkg/tools.h>
diff --git a/src/vcpkg/globalstate.cpp b/src/vcpkg/globalstate.cpp
deleted file mode 100644
index 15db60d8f0..0000000000
--- a/src/vcpkg/globalstate.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <vcpkg/globalstate.h>
-
-namespace vcpkg
-{
-    std::atomic<int> g_init_console_cp(0);
-    std::atomic<int> g_init_console_output_cp(0);
-    std::atomic<bool> g_init_console_initialized(false);
-}
diff --git a/src/vcpkg/input.cpp b/src/vcpkg/input.cpp
index f0c1e9285c..bc1d9e889a 100644
--- a/src/vcpkg/input.cpp
+++ b/src/vcpkg/input.cpp
@@ -2,13 +2,11 @@
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/messages.h>
 #include <vcpkg/base/strings.h>
-#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.help.h>
 #include <vcpkg/input.h>
 #include <vcpkg/packagespec.h>
 
-#include <string>
 #include <utility>
 
 namespace vcpkg
diff --git a/src/vcpkg/metrics.cpp b/src/vcpkg/metrics.cpp
index bcb25447bc..8f2b4453e9 100644
--- a/src/vcpkg/metrics.cpp
+++ b/src/vcpkg/metrics.cpp
@@ -2,7 +2,6 @@
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/hash.h>
 #include <vcpkg/base/json.h>
-#include <vcpkg/base/span.h>
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/system.h>
@@ -10,7 +9,6 @@
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/uuid.h>
 
-#include <vcpkg/commands.h>
 #include <vcpkg/commands.version.h>
 #include <vcpkg/metrics.h>
 #include <vcpkg/paragraphs.h>
diff --git a/src/vcpkg/packagespec.cpp b/src/vcpkg/packagespec.cpp
index e0358f9b4a..266c44e49c 100644
--- a/src/vcpkg/packagespec.cpp
+++ b/src/vcpkg/packagespec.cpp
@@ -1,11 +1,8 @@
-#include <vcpkg/base/checks.h>
-#include <vcpkg/base/format.h>
+#include <vcpkg/base/fmt.h>
 #include <vcpkg/base/messages.h>
 #include <vcpkg/base/parse.h>
-#include <vcpkg/base/util.h>
 
 #include <vcpkg/packagespec.h>
-#include <vcpkg/paragraphparser.h>
 
 namespace
 {
diff --git a/src/vcpkg/paragraphs.cpp b/src/vcpkg/paragraphs.cpp
index cfc39bd66c..99e734a7dc 100644
--- a/src/vcpkg/paragraphs.cpp
+++ b/src/vcpkg/paragraphs.cpp
@@ -8,7 +8,6 @@
 #include <vcpkg/base/util.h>
 
 #include <vcpkg/binaryparagraph.h>
-#include <vcpkg/configuration.h>
 #include <vcpkg/paragraphparser.h>
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/registries.h>
diff --git a/src/vcpkg/portfileprovider.cpp b/src/vcpkg/portfileprovider.cpp
index fbd788e7fa..7fe9301a1d 100644
--- a/src/vcpkg/portfileprovider.cpp
+++ b/src/vcpkg/portfileprovider.cpp
@@ -2,16 +2,13 @@
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/messages.h>
 #include <vcpkg/base/system.debug.h>
+#include <vcpkg/base/util.h>
 
-#include <vcpkg/configuration.h>
 #include <vcpkg/metrics.h>
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/registries.h>
 #include <vcpkg/sourceparagraph.h>
-#include <vcpkg/vcpkgcmdarguments.h>
-#include <vcpkg/vcpkgpaths.h>
-#include <vcpkg/versiondeserializers.h>
 
 using namespace vcpkg;
 
diff --git a/src/vcpkg/sourceparagraph.cpp b/src/vcpkg/sourceparagraph.cpp
index a3f6b2b527..2e6a297ac9 100644
--- a/src/vcpkg/sourceparagraph.cpp
+++ b/src/vcpkg/sourceparagraph.cpp
@@ -3,8 +3,8 @@
 #include <vcpkg/base/jsonreader.h>
 #include <vcpkg/base/message_sinks.h>
 #include <vcpkg/base/span.h>
+#include <vcpkg/base/strings.h>
 #include <vcpkg/base/stringview.h>
-#include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/util.h>
 
 #include <vcpkg/configuration.h>
diff --git a/src/vcpkg/statusparagraphs.cpp b/src/vcpkg/statusparagraphs.cpp
index a3eb66b527..1bb9bd90a9 100644
--- a/src/vcpkg/statusparagraphs.cpp
+++ b/src/vcpkg/statusparagraphs.cpp
@@ -3,7 +3,6 @@
 #include <vcpkg/commands.install.h>
 #include <vcpkg/installedpaths.h>
 #include <vcpkg/statusparagraphs.h>
-#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg
 {
diff --git a/src/vcpkg/tools.cpp b/src/vcpkg/tools.cpp
index be6ca6245b..2bc7924a4e 100644
--- a/src/vcpkg/tools.cpp
+++ b/src/vcpkg/tools.cpp
@@ -10,7 +10,6 @@
 #include <vcpkg/base/stringview.h>
 #include <vcpkg/base/system.h>
 #include <vcpkg/base/system.process.h>
-#include <vcpkg/base/util.h>
 
 #include <vcpkg/archives.h>
 #include <vcpkg/tools.h>
diff --git a/src/vcpkg/triplet.cpp b/src/vcpkg/triplet.cpp
index 1958cd7d1d..8647395406 100644
--- a/src/vcpkg/triplet.cpp
+++ b/src/vcpkg/triplet.cpp
@@ -3,7 +3,6 @@
 #include <vcpkg/base/util.h>
 
 #include <vcpkg/input.h>
-#include <vcpkg/packagespec.h>
 #include <vcpkg/triplet.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 
diff --git a/src/vcpkg/vcpkgcmdarguments.cpp b/src/vcpkg/vcpkgcmdarguments.cpp
index bda11c57f4..5518a6af06 100644
--- a/src/vcpkg/vcpkgcmdarguments.cpp
+++ b/src/vcpkg/vcpkgcmdarguments.cpp
@@ -1,12 +1,8 @@
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/system.h>
-#include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
 
-#include <vcpkg/commands.h>
-#include <vcpkg/commands.integrate.h>
-#include <vcpkg/globalstate.h>
 #include <vcpkg/metrics.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 
diff --git a/src/vcpkg/vcpkglib.cpp b/src/vcpkg/vcpkglib.cpp
index fd8bb5a86a..efaa523f48 100644
--- a/src/vcpkg/vcpkglib.cpp
+++ b/src/vcpkg/vcpkglib.cpp
@@ -5,8 +5,8 @@
 #include <vcpkg/installedpaths.h>
 #include <vcpkg/metrics.h>
 #include <vcpkg/paragraphs.h>
+#include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkglib.h>
-#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg
 {
diff --git a/src/vcpkg/vcpkgpaths.cpp b/src/vcpkg/vcpkgpaths.cpp
index dc8cba2bb0..9c8888f248 100644
--- a/src/vcpkg/vcpkgpaths.cpp
+++ b/src/vcpkg/vcpkgpaths.cpp
@@ -22,7 +22,6 @@
 #include <vcpkg/commands.version.h>
 #include <vcpkg/configuration.h>
 #include <vcpkg/documentation.h>
-#include <vcpkg/globalstate.h>
 #include <vcpkg/installedpaths.h>
 #include <vcpkg/metrics.h>
 #include <vcpkg/packagespec.h>
diff --git a/src/vcpkg/versiondeserializers.cpp b/src/vcpkg/versiondeserializers.cpp
index 8d976f8906..7b34fee66f 100644
--- a/src/vcpkg/versiondeserializers.cpp
+++ b/src/vcpkg/versiondeserializers.cpp
@@ -1,7 +1,7 @@
 #include <vcpkg/base/strings.h>
-#include <vcpkg/base/util.h>
 
 #include <vcpkg/versiondeserializers.h>
+#include <vcpkg/versions.h>
 
 using namespace vcpkg;
 
diff --git a/src/vcpkg/versions.cpp b/src/vcpkg/versions.cpp
index 25c8a8b9d2..396d22db0a 100644
--- a/src/vcpkg/versions.cpp
+++ b/src/vcpkg/versions.cpp
@@ -1,4 +1,4 @@
-#include <vcpkg/base/format.h>
+#include <vcpkg/base/fmt.h>
 #include <vcpkg/base/messages.h>
 #include <vcpkg/base/parse.h>
 #include <vcpkg/base/strings.h>
diff --git a/src/vcpkg/visualstudio.cpp b/src/vcpkg/visualstudio.cpp
index 0fd06cbd91..1f9934177a 100644
--- a/src/vcpkg/visualstudio.cpp
+++ b/src/vcpkg/visualstudio.cpp
@@ -4,7 +4,6 @@
 #include <vcpkg/base/sortedvector.h>
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/stringview.h>
-#include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/system.h>
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>