diff --git a/toolsrc/include/vcpkg/binaryparagraph.h b/toolsrc/include/vcpkg/binaryparagraph.h
index 8099367c2e..d75e4abb1d 100644
--- a/toolsrc/include/vcpkg/binaryparagraph.h
+++ b/toolsrc/include/vcpkg/binaryparagraph.h
@@ -3,7 +3,7 @@
 #include <vcpkg/packagespec.h>
 #include <vcpkg/sourceparagraph.h>
 
-#include <unordered_map>
+#include <map>
 
 namespace vcpkg
 {
@@ -40,7 +40,7 @@ namespace vcpkg
         std::vector<std::string> default_features;
         std::vector<std::string> depends;
         std::string abi;
-        std::unordered_map<std::string, std::string> external_files;
+        std::map<fs::path, std::string> external_files;
 
         mutable ConsistencyState consistency = ConsistencyState::UNKNOWN;
     };
diff --git a/toolsrc/src/vcpkg/binaryparagraph.cpp b/toolsrc/src/vcpkg/binaryparagraph.cpp
index 9b1a8e201f..f571e0e8e6 100644
--- a/toolsrc/src/vcpkg/binaryparagraph.cpp
+++ b/toolsrc/src/vcpkg/binaryparagraph.cpp
@@ -100,7 +100,9 @@ namespace vcpkg
                     this->spec);
         }
 
-        for (int i = 0; i < external_files_or_hashes.size(); i += 2)
+        for (decltype(external_files_or_hashes)::size_type i = 0;
+             i < external_files_or_hashes.size();
+             i += 2)
         {
             external_files.emplace(
                     std::move(external_files_or_hashes[i]),