microsoft · BillyONeal · Aug 19, 2020 · Aug 9, 2020 · Aug 17, 2020 · Aug 17, 2020
diff --git a/toolsrc/.clang-format b/toolsrc/.clang-format
@@ -42,9 +42,11 @@ IncludeCategories:
     Priority: 1
   - Regex: '^<vcpkg/base/.*\.h>$'
     Priority: 2
-  - Regex: '^<vcpkg/.*\.h>$'
+  - Regex: '^<vcpkg/fwd/.*\.h>$'
     Priority: 3
-  - Regex: '^<[a-z0-9_]*\.h>$'
+  - Regex: '^<vcpkg/.*\.h>$'
     Priority: 4
-  - Regex: '^<[a-z0-9_]*>$' # C++ standard library
+  - Regex: '^<[a-z0-9_]*\.h>$'
     Priority: 5
+  - Regex: '^<[a-z0-9_]*>$' # C++ standard library
+    Priority: 6
diff --git a/toolsrc/include/vcpkg/archives.h b/toolsrc/include/vcpkg/archives.h
@@ -2,7 +2,7 @@
 
 #include <vcpkg/base/files.h>
 
-#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/fwd/vcpkgpaths.h>
 
 namespace vcpkg::Archives
 {

diff --git a/toolsrc/include/vcpkg/buildenvironment.h b/toolsrc/include/vcpkg/buildenvironment.h
@@ -1,6 +1,8 @@
+#pragma once
+
 #include <vcpkg/base/system.process.h>
 
-#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/fwd/vcpkgpaths.h>
 
 #include <string>
 #include <vector>

diff --git a/toolsrc/include/vcpkg/cmakevars.h b/toolsrc/include/vcpkg/cmakevars.h
@@ -2,8 +2,9 @@
 
 #include <vcpkg/base/optional.h>
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <vcpkg/portfileprovider.h>
-#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg::Dependencies
 {

diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h
@@ -1,13 +1,8 @@
 #pragma once
 
-#include <vcpkg/build.h>
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/dependencies.h>
-#include <vcpkg/statusparagraphs.h>
 
-#include <array>
-#include <map>
-#include <vector>
+#include <vcpkg/build.h>
 
 namespace vcpkg::Commands
 {

diff --git a/toolsrc/include/vcpkg/commands.interface.h b/toolsrc/include/vcpkg/commands.interface.h
@@ -1,7 +1,11 @@
 #pragma once
 
-#include <vcpkg/vcpkgcmdarguments.h>
-#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/triplet.h>
+
+#include <vcpkg/base/files.h>
+
+#include <vcpkg/fwd/vcpkgpaths.h>
+#include <vcpkg/fwd/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands
 {

diff --git a/toolsrc/include/vcpkg/commands.owns.h b/toolsrc/include/vcpkg/commands.owns.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Owns
 {

diff --git a/toolsrc/include/vcpkg/commands.search.h b/toolsrc/include/vcpkg/commands.search.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Search
 {

diff --git a/toolsrc/include/vcpkg/dependencies.h b/toolsrc/include/vcpkg/dependencies.h
@@ -4,11 +4,7 @@
 #include <vcpkg/base/util.h>
 
 #include <vcpkg/build.h>
-#include <vcpkg/cmakevars.h>
 #include <vcpkg/packagespec.h>
-#include <vcpkg/portfileprovider.h>
-#include <vcpkg/statusparagraphs.h>
-#include <vcpkg/vcpkgpaths.h>
 
 #include <functional>
 #include <map>
@@ -19,6 +15,21 @@ namespace vcpkg::Graphs
     struct Randomizer;
 }
 
+namespace vcpkg::CMakeVars
+{
+    struct CMakeVarProvider;
+}
+
+namespace vcpkg::PortFileProvider
+{
+    struct PortFileProvider;
+}
+
+namespace vcpkg
+{
+    struct StatusParagraphs;
+}
+
 namespace vcpkg::Dependencies
 {
     enum class RequestType

diff --git a/toolsrc/include/vcpkg/export.ifw.h b/toolsrc/include/vcpkg/export.ifw.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <vcpkg/dependencies.h>
-#include <vcpkg/vcpkgpaths.h>
+
+#include <vcpkg/fwd/vcpkgpaths.h>
 
 #include <string>
 #include <vector>

diff --git a/toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h
@@ -0,0 +1,13 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct ParsedArguments;
+    struct CommandSwitch;
+    struct CommandSetting;
+    struct CommandMultiSetting;
+    struct CommandOptionsStructure;
+    struct CommandStructure;
+    struct HelpTableFormatter;
+    struct VcpkgCmdArguments;
+}
diff --git a/toolsrc/include/vcpkg/fwd/vcpkgpaths.h b/toolsrc/include/vcpkg/fwd/vcpkgpaths.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct ToolsetArchOption;
+    struct Toolset;
+    struct VcpkgPaths;
+}
diff --git a/toolsrc/include/vcpkg/statusparagraph.h b/toolsrc/include/vcpkg/statusparagraph.h
@@ -2,6 +2,8 @@
 
 #include <vcpkg/binaryparagraph.h>
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <map>
 
 namespace vcpkg
@@ -62,5 +64,5 @@ namespace vcpkg
         std::vector<const StatusParagraph*> features;
     };
 
-    Json::Value serialize_ipv(const InstalledPackageView& ipv, const struct VcpkgPaths& paths);
+    Json::Value serialize_ipv(const InstalledPackageView& ipv, const VcpkgPaths& paths);
 }
diff --git a/toolsrc/include/vcpkg/tools.h b/toolsrc/include/vcpkg/tools.h
@@ -2,13 +2,13 @@
 
 #include <vcpkg/base/files.h>
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <string>
 #include <utility>
 
 namespace vcpkg
 {
-    struct VcpkgPaths;
-
     namespace Tools
     {
         static const std::string SEVEN_ZIP = "7zip";

diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h
@@ -5,6 +5,9 @@
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/stringliteral.h>
 
+#include <vcpkg/fwd/vcpkgcmdarguments.h>
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
@@ -19,8 +22,6 @@ namespace vcpkg
         std::unordered_map<std::string, std::vector<std::string>> multisettings;
     };
 
-    struct VcpkgPaths;
-
     struct CommandSwitch
     {
         constexpr CommandSwitch(const StringLiteral& name, const StringLiteral& short_help_text)

diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h
@@ -7,6 +7,8 @@
 #include <vcpkg/base/system.h>
 #include <vcpkg/base/util.h>
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 namespace vcpkg
 {
     struct ToolsetArchOption

diff --git a/toolsrc/src/vcpkg/archives.cpp b/toolsrc/src/vcpkg/archives.cpp
@@ -3,6 +3,7 @@
 #include <vcpkg/archives.h>
 #include <vcpkg/commands.h>
 #include <vcpkg/tools.h>
+#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg::Archives
 {

diff --git a/toolsrc/src/vcpkg/buildenvironment.cpp b/toolsrc/src/vcpkg/buildenvironment.cpp
@@ -1,5 +1,6 @@
 #include <vcpkg/buildenvironment.h>
 #include <vcpkg/tools.h>
+#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg
 {

diff --git a/toolsrc/src/vcpkg/commands.autocomplete.cpp b/toolsrc/src/vcpkg/commands.autocomplete.cpp
@@ -9,6 +9,7 @@
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/remove.h>
 #include <vcpkg/vcpkglib.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Autocomplete
 {

diff --git a/toolsrc/src/vcpkg/commands.buildexternal.cpp b/toolsrc/src/vcpkg/commands.buildexternal.cpp
@@ -4,6 +4,7 @@
 #include <vcpkg/commands.buildexternal.h>
 #include <vcpkg/help.h>
 #include <vcpkg/input.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::BuildExternal
 {

diff --git a/toolsrc/src/vcpkg/commands.cache.cpp b/toolsrc/src/vcpkg/commands.cache.cpp
@@ -5,6 +5,7 @@
 #include <vcpkg/commands.cache.h>
 #include <vcpkg/help.h>
 #include <vcpkg/paragraphs.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Cache
 {

diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp
@@ -16,6 +16,7 @@
 #include <vcpkg/packagespec.h>
 #include <vcpkg/platform-expression.h>
 #include <vcpkg/vcpkglib.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 using namespace vcpkg;
 

diff --git a/toolsrc/src/vcpkg/commands.ciclean.cpp b/toolsrc/src/vcpkg/commands.ciclean.cpp
@@ -4,6 +4,8 @@
 
 #include <vcpkg/commands.ciclean.h>
 #include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 using namespace vcpkg;
 

diff --git a/toolsrc/src/vcpkg/commands.contact.cpp b/toolsrc/src/vcpkg/commands.contact.cpp
@@ -1,10 +1,12 @@
 #include <vcpkg/base/chrono.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
+#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.contact.h>
 #include <vcpkg/help.h>
 #include <vcpkg/userconfig.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Contact
 {

diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp
@@ -1,9 +1,12 @@
 #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/help.h>
+#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Create
 {

diff --git a/toolsrc/src/vcpkg/commands.dependinfo.cpp b/toolsrc/src/vcpkg/commands.dependinfo.cpp
@@ -8,6 +8,7 @@
 #include <vcpkg/input.h>
 #include <vcpkg/install.h>
 #include <vcpkg/packagespec.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 #include <vector>
 

diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp
@@ -5,6 +5,7 @@
 #include <vcpkg/commands.edit.h>
 #include <vcpkg/help.h>
 #include <vcpkg/paragraphs.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 #include <limits.h>
 

diff --git a/toolsrc/src/vcpkg/commands.env.cpp b/toolsrc/src/vcpkg/commands.env.cpp
@@ -5,6 +5,7 @@
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/commands.env.h>
 #include <vcpkg/help.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Env
 {

diff --git a/toolsrc/src/vcpkg/commands.fetch.cpp b/toolsrc/src/vcpkg/commands.fetch.cpp
@@ -1,6 +1,9 @@
 #include <vcpkg/base/system.print.h>
 
 #include <vcpkg/commands.fetch.h>
+#include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Fetch
 {

diff --git a/toolsrc/src/vcpkg/commands.format-manifest.cpp b/toolsrc/src/vcpkg/commands.format-manifest.cpp
@@ -7,6 +7,7 @@
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/sourceparagraph.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace
 {

diff --git a/toolsrc/src/vcpkg/commands.hash.cpp b/toolsrc/src/vcpkg/commands.hash.cpp
@@ -1,7 +1,11 @@
 #include <vcpkg/base/hash.h>
 #include <vcpkg/base/system.print.h>
+#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.hash.h>
+#include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Hash
 {

diff --git a/toolsrc/src/vcpkg/commands.info.cpp b/toolsrc/src/vcpkg/commands.info.cpp
@@ -11,6 +11,7 @@
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkglib.h>
 #include <vcpkg/versiont.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Info
 {

diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp
@@ -9,6 +9,8 @@
 #include <vcpkg/metrics.h>
 #include <vcpkg/tools.h>
 #include <vcpkg/userconfig.h>
+#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Integrate
 {

diff --git a/toolsrc/src/vcpkg/commands.list.cpp b/toolsrc/src/vcpkg/commands.list.cpp
@@ -4,6 +4,7 @@
 #include <vcpkg/help.h>
 #include <vcpkg/vcpkglib.h>
 #include <vcpkg/versiont.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::List
 {

diff --git a/toolsrc/src/vcpkg/commands.owns.cpp b/toolsrc/src/vcpkg/commands.owns.cpp
@@ -3,6 +3,7 @@
 #include <vcpkg/commands.owns.h>
 #include <vcpkg/help.h>
 #include <vcpkg/vcpkglib.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Owns
 {

diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp
@@ -5,6 +5,8 @@
 #include <vcpkg/commands.porthistory.h>
 #include <vcpkg/help.h>
 #include <vcpkg/tools.h>
+#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::PortHistory
 {