From 2f731d650f4b5810fede35adda304807daa034df Mon Sep 17 00:00:00 2001
From: Cengizhan Pasaoglu <cengizhanpasaoglu@gmail.com>
Date: Sun, 25 Oct 2020 07:59:05 +0300
Subject: Replace fwd header files to declarations (#13972)

---
 toolsrc/include/vcpkg/base/checks.h           |  1 -
 toolsrc/include/vcpkg/base/enums.h            |  4 ++--
 toolsrc/include/vcpkg/base/expected.h         |  1 +
 toolsrc/include/vcpkg/base/fwd/lineinfo.h     |  6 ++++++
 toolsrc/include/vcpkg/base/graphs.h           |  1 +
 toolsrc/include/vcpkg/base/optional.h         |  2 +-
 toolsrc/include/vcpkg/base/system.debug.h     |  1 +
 toolsrc/include/vcpkg/binarycaching.h         | 10 +++-------
 toolsrc/include/vcpkg/binarycaching.private.h |  9 +++++----
 toolsrc/include/vcpkg/cmakevars.h             |  3 ++-
 toolsrc/include/vcpkg/fwd/packagespec.h       |  6 ++++++
 toolsrc/include/vcpkg/paragraphs.h            |  9 +++++++--
 toolsrc/include/vcpkg/vcpkglib.h              |  3 ++-
 toolsrc/src/vcpkg-test/dependencies.cpp       |  1 +
 toolsrc/src/vcpkg-test/manifests.cpp          |  1 +
 toolsrc/src/vcpkg-test/optional.cpp           |  1 +
 toolsrc/src/vcpkg.cpp                         |  1 +
 toolsrc/src/vcpkg/build.cpp                   |  1 +
 toolsrc/src/vcpkg/cmakevars.cpp               |  1 +
 toolsrc/src/vcpkg/commands.buildexternal.cpp  |  1 +
 toolsrc/src/vcpkg/commands.cache.cpp          |  1 +
 toolsrc/src/vcpkg/commands.ci.cpp             |  1 +
 toolsrc/src/vcpkg/commands.dependinfo.cpp     |  1 +
 toolsrc/src/vcpkg/commands.edit.cpp           |  2 ++
 toolsrc/src/vcpkg/commands.env.cpp            |  1 +
 toolsrc/src/vcpkg/commands.list.cpp           |  1 +
 toolsrc/src/vcpkg/commands.portsdiff.cpp      |  1 +
 toolsrc/src/vcpkg/paragraphs.cpp              |  1 +
 toolsrc/src/vcpkg/portfileprovider.cpp        |  1 +
 toolsrc/src/vcpkg/vcpkglib.cpp                |  1 +
 30 files changed, 55 insertions(+), 19 deletions(-)
 create mode 100644 toolsrc/include/vcpkg/base/fwd/lineinfo.h
 create mode 100644 toolsrc/include/vcpkg/fwd/packagespec.h

diff --git a/toolsrc/include/vcpkg/base/checks.h b/toolsrc/include/vcpkg/base/checks.h
index 519ca58f4..da836a347 100644
--- a/toolsrc/include/vcpkg/base/checks.h
+++ b/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
diff --git a/toolsrc/include/vcpkg/base/enums.h b/toolsrc/include/vcpkg/base/enums.h
index 6eca2cfe1..4b77b3f6f 100644
--- a/toolsrc/include/vcpkg/base/enums.h
+++ b/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
 {
diff --git a/toolsrc/include/vcpkg/base/expected.h b/toolsrc/include/vcpkg/base/expected.h
index fcf37bcaf..12bb64727 100644
--- a/toolsrc/include/vcpkg/base/expected.h
+++ b/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>
diff --git a/toolsrc/include/vcpkg/base/fwd/lineinfo.h b/toolsrc/include/vcpkg/base/fwd/lineinfo.h
new file mode 100644
index 000000000..0d65da5cc
--- /dev/null
+++ b/toolsrc/include/vcpkg/base/fwd/lineinfo.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct LineInfo;
+}
diff --git a/toolsrc/include/vcpkg/base/graphs.h b/toolsrc/include/vcpkg/base/graphs.h
index ac5f953dc..fd51d666b 100644
--- a/toolsrc/include/vcpkg/base/graphs.h
+++ b/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>
diff --git a/toolsrc/include/vcpkg/base/optional.h b/toolsrc/include/vcpkg/base/optional.h
index caacf815e..606d60ce5 100644
--- a/toolsrc/include/vcpkg/base/optional.h
+++ b/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>
diff --git a/toolsrc/include/vcpkg/base/system.debug.h b/toolsrc/include/vcpkg/base/system.debug.h
index d9c50ac8e..d541b970a 100644
--- a/toolsrc/include/vcpkg/base/system.debug.h
+++ b/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>
diff --git a/toolsrc/include/vcpkg/binarycaching.h b/toolsrc/include/vcpkg/binarycaching.h
index d76d60370..9e77bc763 100644
--- a/toolsrc/include/vcpkg/binarycaching.h
+++ b/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
 {
diff --git a/toolsrc/include/vcpkg/binarycaching.private.h b/toolsrc/include/vcpkg/binarycaching.private.h
index 46d9d6741..209807ccc 100644
--- a/toolsrc/include/vcpkg/binarycaching.private.h
+++ b/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
 {
diff --git a/toolsrc/include/vcpkg/cmakevars.h b/toolsrc/include/vcpkg/cmakevars.h
index e92f50ab2..07c21bdfd 100644
--- a/toolsrc/include/vcpkg/cmakevars.h
+++ b/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
 {
diff --git a/toolsrc/include/vcpkg/fwd/packagespec.h b/toolsrc/include/vcpkg/fwd/packagespec.h
new file mode 100644
index 000000000..2f5719e1b
--- /dev/null
+++ b/toolsrc/include/vcpkg/fwd/packagespec.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct PackageSpec;
+}
diff --git a/toolsrc/include/vcpkg/paragraphs.h b/toolsrc/include/vcpkg/paragraphs.h
index 95726f913..f4ea36ede 100644
--- a/toolsrc/include/vcpkg/paragraphs.h
+++ b/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
 {
diff --git a/toolsrc/include/vcpkg/vcpkglib.h b/toolsrc/include/vcpkg/vcpkglib.h
index 0fd66e814..bb1d61c73 100644
--- a/toolsrc/include/vcpkg/vcpkglib.h
+++ b/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
 {
diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp
index ef39bd1ef..2f82d21b4 100644
--- a/toolsrc/src/vcpkg-test/dependencies.cpp
+++ b/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>
diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp
index be087584e..75b14771f 100644
--- a/toolsrc/src/vcpkg-test/manifests.cpp
+++ b/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>
 
diff --git a/toolsrc/src/vcpkg-test/optional.cpp b/toolsrc/src/vcpkg-test/optional.cpp
index 520867f2c..c2656d97e 100644
--- a/toolsrc/src/vcpkg-test/optional.cpp
+++ b/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>
 
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index 23796bb46..bba64bbbf 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/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>
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index c44de0c56..9b4e7b428 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/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>
diff --git a/toolsrc/src/vcpkg/cmakevars.cpp b/toolsrc/src/vcpkg/cmakevars.cpp
index ef9906a08..69326fffc 100644
--- a/toolsrc/src/vcpkg/cmakevars.cpp
+++ b/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;
diff --git a/toolsrc/src/vcpkg/commands.buildexternal.cpp b/toolsrc/src/vcpkg/commands.buildexternal.cpp
index bfd275542..25c3f9822 100644
--- 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/portfileprovider.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
index 3014f87a1..af851bc98 100644
--- a/toolsrc/src/vcpkg/commands.cache.cpp
+++ b/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
 {
diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp
index fe41860be..de3c522f8 100644
--- a/toolsrc/src/vcpkg/commands.ci.cpp
+++ b/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>
 
diff --git a/toolsrc/src/vcpkg/commands.dependinfo.cpp b/toolsrc/src/vcpkg/commands.dependinfo.cpp
index 3442e8c3d..bfd719df0 100644
--- a/toolsrc/src/vcpkg/commands.dependinfo.cpp
+++ b/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>
diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp
index 8dbebc4e5..8d6401df1 100644
--- a/toolsrc/src/vcpkg/commands.edit.cpp
+++ b/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>
 
diff --git a/toolsrc/src/vcpkg/commands.env.cpp b/toolsrc/src/vcpkg/commands.env.cpp
index 15c094e71..eadfd5bc0 100644
--- 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/portfileprovider.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Env
diff --git a/toolsrc/src/vcpkg/commands.list.cpp b/toolsrc/src/vcpkg/commands.list.cpp
index d315333c5..0af7c1f6c 100644
--- a/toolsrc/src/vcpkg/commands.list.cpp
+++ b/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>
diff --git a/toolsrc/src/vcpkg/commands.portsdiff.cpp b/toolsrc/src/vcpkg/commands.portsdiff.cpp
index 392ca70dd..63e0e0e24 100644
--- a/toolsrc/src/vcpkg/commands.portsdiff.cpp
+++ b/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
diff --git a/toolsrc/src/vcpkg/paragraphs.cpp b/toolsrc/src/vcpkg/paragraphs.cpp
index d14e0176e..90073317c 100644
--- a/toolsrc/src/vcpkg/paragraphs.cpp
+++ b/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;
diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp
index aaeda0bb1..085219d11 100644
--- a/toolsrc/src/vcpkg/portfileprovider.cpp
+++ b/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
 {
diff --git a/toolsrc/src/vcpkg/vcpkglib.cpp b/toolsrc/src/vcpkg/vcpkglib.cpp
index a158cf74b..d1e29c78b 100644
--- a/toolsrc/src/vcpkg/vcpkglib.cpp
+++ b/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
 {
-- 
cgit v1.2.3