3 files changed, 4 insertions, 7 deletions
diff --git a/toolsrc/include/triplet.h b/toolsrc/include/triplet.h
index 23c1ea404..f9d1e9483 100644
--- a/toolsrc/include/triplet.h
+++ b/toolsrc/include/triplet.h
@@ -4,8 +4,6 @@
 
 namespace vcpkg
 {
-    struct vcpkg_paths;
-
     struct triplet
     {
         static const triplet X86_WINDOWS;
@@ -19,8 +17,6 @@ namespace vcpkg
         std::string architecture() const;
 
         std::string system() const;
-
-        bool validate(const vcpkg_paths& paths) const;
     };
 
     bool operator==(const triplet& left, const triplet& right);
diff --git a/toolsrc/include/vcpkg_Strings.h b/toolsrc/include/vcpkg_Strings.h
index f4b989292..93e1389f8 100644
--- a/toolsrc/include/vcpkg_Strings.h
+++ b/toolsrc/include/vcpkg_Strings.h
@@ -31,7 +31,7 @@ namespace vcpkg {namespace Strings {namespace details
         return s;
     }
 
-    std::wstring format_internal(const wchar_t* fmtstr, ...);
+    std::wstring wformat_internal(const wchar_t* fmtstr, ...);
 }}}
 
 namespace vcpkg {namespace Strings
@@ -44,10 +44,10 @@ namespace vcpkg {namespace Strings
     }
 
     template <class...Args>
-    std::wstring format(const wchar_t* fmtstr, const Args&...args)
+    std::wstring wformat(const wchar_t* fmtstr, const Args&...args)
     {
         using vcpkg::Strings::details::to_wprintf_arg;
-        return details::format_internal(fmtstr, to_wprintf_arg(to_wprintf_arg(args))...);
+        return details::wformat_internal(fmtstr, to_wprintf_arg(to_wprintf_arg(args))...);
     }
 
     std::wstring utf8_to_utf16(const std::string& s);
diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h
index 72cba01b7..d13c73b0b 100644
--- a/toolsrc/include/vcpkg_paths.h
+++ b/toolsrc/include/vcpkg_paths.h
@@ -13,6 +13,7 @@ namespace vcpkg
 
         fs::path package_dir(const package_spec& spec) const;
         fs::path port_dir(const package_spec& spec) const;
+        bool is_valid_triplet(const triplet& t) const;
 
         std::tr2::sys::path root;
         std::tr2::sys::path packages;