Fix forward declarations & replace fwd header files

toolsrc/include/vcpkg/base/checks.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/base/cstringview.h>
-#include <vcpkg/base/lineinfo.h>
 #include <vcpkg/base/strings.h>
 
 namespace vcpkg::Checks

toolsrc/include/vcpkg/base/enums.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <vcpkg/base/lineinfo.h>
+#include <vcpkg/base/fwd/lineinfo.h>
 
-#include <string>
+#include <vcpkg/base/cstringview.h>
 
 namespace vcpkg::Enums
 {

toolsrc/include/vcpkg/base/expected.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/checks.h>
+#include <vcpkg/base/lineinfo.h>
 #include <vcpkg/base/stringliteral.h>
 
 #include <system_error>

toolsrc/include/vcpkg/base/fwd/lineinfo.h

@@ -0,0 +1,6 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct LineInfo;
+}

toolsrc/include/vcpkg/base/graphs.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/checks.h>
+#include <vcpkg/base/lineinfo.h>
 #include <vcpkg/base/system.print.h>
 
 #include <string>

toolsrc/include/vcpkg/base/optional.h

@@ -1,8 +1,8 @@
 #pragma once
 
+#include <vcpkg/base/fwd/lineinfo.h>
 #include <vcpkg/base/fwd/optional.h>
 
-#include <vcpkg/base/lineinfo.h>
 #include <vcpkg/base/pragmas.h>
 
 #include <type_traits>

toolsrc/include/vcpkg/base/system.debug.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/chrono.h>
+#include <vcpkg/base/lineinfo.h>
 #include <vcpkg/base/system.print.h>
 
 #include <atomic>

toolsrc/include/vcpkg/binarycaching.h

@@ -1,16 +1,12 @@
 #pragma once
 
+#include <vcpkg/fwd/dependencies.h>
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <vcpkg/base/expected.h>
 #include <vcpkg/base/files.h>
 
 #include <vcpkg/packagespec.h>
-#include <vcpkg/vcpkgpaths.h>
-
-namespace vcpkg::Dependencies
-{
-    struct InstallPlanAction;
-    struct ActionPlan;
-}
 
 namespace vcpkg
 {

toolsrc/include/vcpkg/binarycaching.private.h

@@ -1,10 +1,11 @@
 #pragma once
 
-#include <vcpkg/dependencies.h>
-#include <vcpkg/packagespec.h>
-#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/fwd/packagespec.h>
+#include <vcpkg/fwd/vcpkgpaths.h>
+
+#include <vcpkg/base/strings.h>
 
-#include <string>
+#include <vcpkg/dependencies.h>
 
 namespace vcpkg
 {

toolsrc/include/vcpkg/cmakevars.h

@@ -1,11 +1,12 @@
 #pragma once
 
 #include <vcpkg/fwd/dependencies.h>
+#include <vcpkg/fwd/portfileprovider.h>
 #include <vcpkg/fwd/vcpkgpaths.h>
 
 #include <vcpkg/base/optional.h>
 
-#include <vcpkg/portfileprovider.h>
+#include <vcpkg/packagespec.h>
 
 namespace vcpkg::CMakeVars
 {

toolsrc/include/vcpkg/fwd/packagespec.h

@@ -0,0 +1,6 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct PackageSpec;
+}

toolsrc/include/vcpkg/paragraphs.h

@@ -1,10 +1,15 @@
 #pragma once
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <vcpkg/base/expected.h>
 
 #include <vcpkg/binaryparagraph.h>
-#include <vcpkg/paragraphparser.h>
-#include <vcpkg/vcpkgpaths.h>
+
+namespace vckpg::Parse
+{
+    struct ParseControlErrorInfo;
+}
 
 namespace vcpkg::Paragraphs
 {

toolsrc/include/vcpkg/vcpkglib.h

@@ -1,9 +1,10 @@
 #pragma once
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <vcpkg/base/sortedvector.h>
 
 #include <vcpkg/statusparagraphs.h>
-#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg
 {

toolsrc/src/vcpkg-test/dependencies.cpp

@@ -2,6 +2,7 @@
 
 #include <vcpkg/dependencies.h>
 #include <vcpkg/paragraphparser.h>
+#include <vcpkg/portfileprovider.h>
 #include <vcpkg/sourceparagraph.h>
 
 #include <vcpkg-test/mockcmakevarprovider.h>

toolsrc/src/vcpkg-test/manifests.cpp

@@ -6,6 +6,7 @@
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/sourceparagraph.h>
 #include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
 
 #include <vcpkg-test/util.h>
 

toolsrc/src/vcpkg-test/optional.cpp

@@ -1,5 +1,6 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/lineinfo.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/util.h>
 

toolsrc/src/vcpkg.cpp

@@ -19,6 +19,7 @@
 #include <vcpkg/userconfig.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkglib.h>
+#include <vcpkg/vcpkgpaths.h>
 
 #include <cassert>
 #include <fstream>

toolsrc/src/vcpkg/build.cpp

@@ -22,6 +22,7 @@
 #include <vcpkg/input.h>
 #include <vcpkg/metrics.h>
 #include <vcpkg/paragraphs.h>
+#include <vcpkg/portfileprovider.h>
 #include <vcpkg/postbuildlint.h>
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/tools.h>

toolsrc/src/vcpkg/cmakevars.cpp

@@ -7,6 +7,7 @@
 #include <vcpkg/buildenvironment.h>
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/dependencies.h>
+#include <vcpkg/portfileprovider.h>
 
 using namespace vcpkg;
 using vcpkg::Optional;

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/portfileprovider.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::BuildExternal

toolsrc/src/vcpkg/commands.cache.cpp

@@ -6,6 +6,7 @@
 #include <vcpkg/help.h>
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg::Commands::Cache
 {

toolsrc/src/vcpkg/commands.ci.cpp

@@ -17,6 +17,7 @@
 #include <vcpkg/packagespec.h>
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/platform-expression.h>
+#include <vcpkg/portfileprovider.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkglib.h>
 

toolsrc/src/vcpkg/commands.dependinfo.cpp

@@ -9,6 +9,7 @@
 #include <vcpkg/input.h>
 #include <vcpkg/install.h>
 #include <vcpkg/packagespec.h>
+#include <vcpkg/portfileprovider.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 
 #include <vector>

toolsrc/src/vcpkg/commands.edit.cpp

@@ -1,11 +1,13 @@
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
+#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.edit.h>
 #include <vcpkg/help.h>
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
 
 #include <limits.h>
 

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/portfileprovider.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Env

toolsrc/src/vcpkg/commands.list.cpp

@@ -1,4 +1,5 @@
 #include <vcpkg/base/system.print.h>
+#include <vcpkg/base/util.h>
 
 #include <vcpkg/commands.list.h>
 #include <vcpkg/help.h>

toolsrc/src/vcpkg/commands.portsdiff.cpp

@@ -8,6 +8,7 @@
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/tools.h>
 #include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
 #include <vcpkg/versiont.h>
 
 namespace vcpkg::Commands::PortsDiff

toolsrc/src/vcpkg/paragraphs.cpp

@@ -9,6 +9,7 @@
 #include <vcpkg/paragraphparser.h>
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/registries.h>
+#include <vcpkg/vcpkgpaths.h>
 
 using namespace vcpkg::Parse;
 using namespace vcpkg;

toolsrc/src/vcpkg/portfileprovider.cpp

@@ -6,6 +6,7 @@
 #include <vcpkg/registries.h>
 #include <vcpkg/sourceparagraph.h>
 #include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg::PortFileProvider
 {

toolsrc/src/vcpkg/vcpkglib.cpp

@@ -5,6 +5,7 @@
 #include <vcpkg/metrics.h>
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/vcpkglib.h>
+#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg
 {