4 files changed, 63 insertions, 56 deletions
diff --git a/toolsrc/include/PostBuildLint.h b/toolsrc/include/PostBuildLint.h
index b8afdd5a6..0ee47d0c1 100644
--- a/toolsrc/include/PostBuildLint.h
+++ b/toolsrc/include/PostBuildLint.h
@@ -1,8 +1,9 @@
 #pragma once
 #include "PackageSpec.h"
 #include "VcpkgPaths.h"
+#include "vcpkg_Build.h"
 
 namespace vcpkg::PostBuildLint
 {
-    size_t perform_all_checks(const PackageSpec& spec, const VcpkgPaths& paths);
+    size_t perform_all_checks(const PackageSpec& spec, const VcpkgPaths& paths, const Build::BuildInfo& build_info);
 }
diff --git a/toolsrc/include/PostBuildLint_BuildInfo.h b/toolsrc/include/PostBuildLint_BuildInfo.h
deleted file mode 100644
index 29fa09e6c..000000000
--- a/toolsrc/include/PostBuildLint_BuildInfo.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "PostBuildLint_BuildPolicies.h"
-#include "PostBuildLint_LinkageType.h"
-#include "filesystem_fs.h"
-#include "vcpkg_Files.h"
-
-namespace vcpkg::PostBuildLint
-{
-    struct BuildInfo
-    {
-        static BuildInfo create(std::unordered_map<std::string, std::string> pgh);
-
-        LinkageType crt_linkage;
-        LinkageType library_linkage;
-
-        std::map<BuildPolicies, bool> policies;
-    };
-
-    BuildInfo read_build_info(const Files::Filesystem& fs, const fs::path& filepath);
-}
diff --git a/toolsrc/include/vcpkg_Build.h b/toolsrc/include/vcpkg_Build.h
new file mode 100644
index 000000000..f4b9300c5
--- /dev/null
+++ b/toolsrc/include/vcpkg_Build.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include "PackageSpec.h"
+#include "PostBuildLint_BuildPolicies.h"
+#include "PostBuildLint_LinkageType.h"
+#include "StatusParagraphs.h"
+#include "VcpkgPaths.h"
+#include "vcpkg_Files.h"
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace vcpkg::Build
+{
+    enum class BuildResult
+    {
+        NULLVALUE = 0,
+        SUCCEEDED,
+        BUILD_FAILED,
+        POST_BUILD_CHECKS_FAILED,
+        CASCADED_DUE_TO_MISSING_DEPENDENCIES
+    };
+
+    static constexpr std::array<BuildResult, 4> BuildResult_values = {
+        BuildResult::SUCCEEDED,
+        BuildResult::BUILD_FAILED,
+        BuildResult::POST_BUILD_CHECKS_FAILED,
+        BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES};
+
+    const std::string& to_string(const BuildResult build_result);
+    std::string create_error_message(const BuildResult build_result, const PackageSpec& spec);
+    std::string create_user_troubleshooting_message(const PackageSpec& spec);
+
+    std::wstring make_build_env_cmd(const Triplet& triplet, const Toolset& toolset);
+
+    struct ExtendedBuildResult
+    {
+        BuildResult code;
+        std::vector<PackageSpec> unmet_dependencies;
+    };
+
+    ExtendedBuildResult build_package(const SourceParagraph& source_paragraph,
+                                      const PackageSpec& spec,
+                                      const VcpkgPaths& paths,
+                                      const fs::path& port_dir,
+                                      const StatusParagraphs& status_db);
+
+    struct BuildInfo
+    {
+        static BuildInfo create(std::unordered_map<std::string, std::string> pgh);
+
+        PostBuildLint::LinkageType crt_linkage;
+        PostBuildLint::LinkageType library_linkage;
+
+        std::map<PostBuildLint::BuildPolicies, bool> policies;
+    };
+
+    BuildInfo read_build_info(const Files::Filesystem& fs, const fs::path& filepath);
+}
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index 6099918ce..14d468352 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -14,41 +14,8 @@ namespace vcpkg::Commands
     using CommandTypeB = void (*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
     using CommandTypeC = void (*)(const VcpkgCmdArguments& args);
 
-    namespace Build
+    namespace BuildCommand
     {
-        enum class BuildResult
-        {
-            NULLVALUE = 0,
-            SUCCEEDED,
-            BUILD_FAILED,
-            POST_BUILD_CHECKS_FAILED,
-            CASCADED_DUE_TO_MISSING_DEPENDENCIES
-        };
-
-        static constexpr std::array<BuildResult, 4> BuildResult_values = {
-            BuildResult::SUCCEEDED,
-            BuildResult::BUILD_FAILED,
-            BuildResult::POST_BUILD_CHECKS_FAILED,
-            BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES};
-
-        const std::string& to_string(const BuildResult build_result);
-        std::string create_error_message(const BuildResult build_result, const PackageSpec& spec);
-        std::string create_user_troubleshooting_message(const PackageSpec& spec);
-
-        std::wstring make_build_env_cmd(const Triplet& triplet, const Toolset& toolset);
-
-        struct ExtendedBuildResult
-        {
-            BuildResult code;
-            std::vector<PackageSpec> unmet_dependencies;
-        };
-
-        ExtendedBuildResult build_package(const SourceParagraph& source_paragraph,
-                                          const PackageSpec& spec,
-                                          const VcpkgPaths& paths,
-                                          const fs::path& port_dir,
-                                          const StatusParagraphs& status_db);
-
         void perform_and_exit(const PackageSpec& spec,
                               const fs::path& port_dir,
                               const std::unordered_set<std::string>& options,