Audit headers for overzealous inclusion reported by Visual Studio (#1273

)
microsoft · Nov 9, 2023 · dfb60db · dfb60db
1 parent c9e4be1
commit dfb60db
Show file tree

Hide file tree

Showing 149 changed files with 255 additions and 391 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/include/vcpkg/base/fwd/format.h → include/vcpkg/base/fwd/fmt.h b/include/vcpkg/base/fwd/format.h → include/vcpkg/base/fwd/fmt.h
diff --git a/include/vcpkg/base/fwd/graphs.h 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 {