iwyu shuffle

include/mapnik/expression_node.hpp

@@ -26,6 +26,7 @@
 // mapnik
 #include <mapnik/value_types.hpp>
 #include <mapnik/value.hpp>
+#include <mapnik/unicode.hpp>
 #include <mapnik/attribute.hpp>
 #include <mapnik/function_call.hpp>
 #include <mapnik/expression_node_types.hpp>

include/mapnik/renderer_common/process_polygon_symbolizer.hpp

@@ -23,7 +23,11 @@
 #ifndef MAPNIK_RENDERER_COMMON_PROCESS_POLYGON_SYMBOLIZER_HPP
 #define MAPNIK_RENDERER_COMMON_PROCESS_POLYGON_SYMBOLIZER_HPP
 
+#include <mapnik/renderer_common.hpp>
 #include <mapnik/vertex_converters.hpp>
+#include <mapnik/symbolizer.hpp>
+#include <mapnik/geometry.hpp>
+#include <mapnik/feature.hpp>
 
 namespace mapnik {
 

include/mapnik/unicode.hpp

@@ -26,15 +26,14 @@
 //mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/noncopyable.hpp>
-
-// icu
 #include <mapnik/value_types.hpp>
-#include <unicode/ucnv.h>
 
 // stl
 #include <cstdint>
 #include <string>
 
+struct UConverter;
+
 namespace mapnik {
 
 class MAPNIK_DECL transcoder : private mapnik::noncopyable
@@ -49,13 +48,4 @@ private:
 };
 }
 
-namespace U_ICU_NAMESPACE {
-
-inline std::size_t hash_value(mapnik::value_unicode_string const& val)
-{
-    return val.hashCode();
-}
-
-}
-
 #endif // MAPNIK_UNICODE_HPP

include/mapnik/value_hash.hpp

@@ -26,10 +26,13 @@
 // mapnik
 #include <mapnik/util/variant.hpp>
 #include <mapnik/value_types.hpp>
-#include <mapnik/unicode.hpp>
+
 // stl
 #include <functional>
 
+// icu
+#include <unicode/unistr.h>
+
 namespace mapnik { namespace detail {
 
 template <class T>
@@ -48,7 +51,7 @@ struct value_hasher: public util::static_visitor<std::size_t>
 
     std::size_t operator() (value_unicode_string const& val) const
     {
-        return hash_value(val);
+        return val.hashCode();
     }
 
     template <class T>

src/unicode.cpp

@@ -28,6 +28,9 @@
 #include <cstdlib>
 #include <string>
 
+// icu
+#include <unicode/ucnv.h>
+
 namespace mapnik {
 
 transcoder::transcoder (std::string const& encoding)