diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp
index 2954e06b2..bf2c547ab 100644
--- a/include/mapnik/feature.hpp
+++ b/include/mapnik/feature.hpp
@@ -38,7 +38,7 @@
 
 // stl
 #include <vector>
-#include <unordered_map>
+#include <map>
 #include <ostream>                      // for basic_ostream, operator<<, etc
 #include <sstream>                      // for basic_stringstream
 #include <stdexcept>                    // for out_of_range
@@ -87,7 +87,7 @@ private:
     map_type mapping_;
 };
 
-typedef context<std::unordered_map<std::string,std::size_t> > context_type;
+typedef context<std::map<std::string,std::size_t> > context_type;
 typedef std::shared_ptr<context_type> context_ptr;
 
 static const value default_value;
diff --git a/include/mapnik/feature_kv_iterator.hpp b/include/mapnik/feature_kv_iterator.hpp
index 4d5f0f721..8018274db 100644
--- a/include/mapnik/feature_kv_iterator.hpp
+++ b/include/mapnik/feature_kv_iterator.hpp
@@ -35,7 +35,8 @@
 #include <boost/iterator/filter_iterator.hpp>
 
 // stl
-#include <unordered_map>
+#include <map>
+
 
 namespace mapnik {
 
@@ -60,7 +61,7 @@ private:
     value_type const& dereference() const;
 
     feature_impl const& f_;
-    std::unordered_map<std::string,std::size_t>::const_iterator itr_;
+    std::map<std::string,std::size_t>::const_iterator itr_;
     mutable value_type kv_;
 
 };
@@ -78,3 +79,4 @@ typedef boost::filter_iterator<value_not_null, feature_kv_iterator> feature_kv_i
 }
 
 #endif // MAPNIK_FEATURE_KV_ITERATOR_HPP
+