4 files changed, 18 insertions, 4 deletions
diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index bac005144..5ae9b38b8 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -5,6 +5,16 @@
 
 namespace vcpkg
 {
+    struct triplet;
+
+    struct dependency
+    {
+        std::string name;
+        std::string qualifier;
+    };
+
+    std::ostream& operator<<(std::ostream& os, const dependency& p);
+
     struct SourceParagraph
     {
         SourceParagraph();
@@ -15,6 +25,11 @@ namespace vcpkg
         std::string version;
         std::string description;
         std::string maintainer;
-        std::vector<std::string> depends;
+        std::vector<dependency> depends;
     };
+
+    std::vector<std::string> filter_dependencies(const std::vector<vcpkg::dependency>& deps, const triplet& t);
+
+    std::vector<vcpkg::dependency> expand_qualified_dependencies(const std::vector<std::string>& depends);
+    std::vector<std::string> parse_depends(const std::string& depends_string);
 }
diff --git a/toolsrc/include/vcpkg.h b/toolsrc/include/vcpkg.h
index a4a0682cf..dc5933f10 100644
--- a/toolsrc/include/vcpkg.h
+++ b/toolsrc/include/vcpkg.h
@@ -21,6 +21,7 @@ namespace vcpkg
     StatusParagraphs database_load_check(const vcpkg_paths& paths);
 
     std::vector<std::string> get_unmet_package_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db);
+    std::vector<std::string> get_unmet_package_build_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db);
 
     void install_package(const vcpkg_paths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs& status_db);
     void deinstall_package(const vcpkg_paths& paths, const package_spec& spec, StatusParagraphs& status_db);
diff --git a/toolsrc/include/vcpkg_Dependencies.h b/toolsrc/include/vcpkg_Dependencies.h
index 9dc32fc41..94aa51f99 100644
--- a/toolsrc/include/vcpkg_Dependencies.h
+++ b/toolsrc/include/vcpkg_Dependencies.h
@@ -9,5 +9,5 @@ namespace vcpkg {namespace Dependencies
 {
     std::vector<package_spec> create_dependency_ordered_install_plan(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db);
 
-    std::unordered_set<package_spec> find_unmet_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db);
+    std::unordered_set<package_spec> find_unmet_dependencies(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db);
 }}
diff --git a/toolsrc/include/vcpkglib_helpers.h b/toolsrc/include/vcpkglib_helpers.h
index 05c9e17df..640fab555 100644
--- a/toolsrc/include/vcpkglib_helpers.h
+++ b/toolsrc/include/vcpkglib_helpers.h
@@ -9,6 +9,4 @@ namespace vcpkg {namespace details
 
     std::string required_field(const std::unordered_map<std::string, std::string>& fields, const std::string& fieldname);
     std::string remove_required_field(std::unordered_map<std::string, std::string>* fields, const std::string& fieldname);
-
-    std::vector<std::string> parse_depends(const std::string& depends_string);
 }}