From 8ff987af6de5e7f6d8023f8af3df83d3b8287252 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Fri, 8 Aug 2014 21:58:08 -0700
Subject: [PATCH] iwyu

---
 bindings/python/python_to_value.hpp           | 1 +
 include/mapnik/evaluate_global_attributes.hpp | 1 +
 include/mapnik/label_collision_detector.hpp   | 3 +++
 include/mapnik/util/conversions.hpp           | 1 -
 include/mapnik/value.hpp                      | 5 ++++-
 include/mapnik/value_types.hpp                | 7 ++++++-
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bindings/python/python_to_value.hpp b/bindings/python/python_to_value.hpp
index fd2eb4da2..6d220b61f 100644
--- a/bindings/python/python_to_value.hpp
+++ b/bindings/python/python_to_value.hpp
@@ -27,6 +27,7 @@
 
 // mapnik
 #include <mapnik/value.hpp>
+#include <mapnik/unicode.hpp>
 #include <mapnik/attribute.hpp>
 
 
diff --git a/include/mapnik/evaluate_global_attributes.hpp b/include/mapnik/evaluate_global_attributes.hpp
index c2f6a75f2..9dedee2c4 100644
--- a/include/mapnik/evaluate_global_attributes.hpp
+++ b/include/mapnik/evaluate_global_attributes.hpp
@@ -30,6 +30,7 @@
 #include <mapnik/attribute.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/color_factory.hpp>
+#include <mapnik/noncopyable.hpp>
 
 // boost
 #include <boost/variant/static_visitor.hpp>
diff --git a/include/mapnik/label_collision_detector.hpp b/include/mapnik/label_collision_detector.hpp
index af5eef979..254704205 100644
--- a/include/mapnik/label_collision_detector.hpp
+++ b/include/mapnik/label_collision_detector.hpp
@@ -28,6 +28,9 @@
 #include <mapnik/noncopyable.hpp>
 #include <mapnik/value_types.hpp>
 
+// icu
+#include <unicode/unistr.h>
+
 // stl
 #include <vector>
 
diff --git a/include/mapnik/util/conversions.hpp b/include/mapnik/util/conversions.hpp
index e9bd716a8..22cafea52 100644
--- a/include/mapnik/util/conversions.hpp
+++ b/include/mapnik/util/conversions.hpp
@@ -30,7 +30,6 @@
 // stl
 #include <string>
 #include <algorithm>
-#include <locale>
 
 namespace mapnik { namespace util {
 
diff --git a/include/mapnik/value.hpp b/include/mapnik/value.hpp
index 5c96e257f..5869e35eb 100644
--- a/include/mapnik/value.hpp
+++ b/include/mapnik/value.hpp
@@ -38,6 +38,9 @@
 #include <string>
 #include <cmath>
 #include <memory>
+#include <iosfwd>
+#include <cstddef>
+#include <new>
 
 // icu
 #include <unicode/unistr.h>
@@ -118,7 +121,7 @@ struct equals
     }
 
     template <typename T, typename U>
-    bool operator() (T const& /*lhs*/, U const& /*rhs*/) const
+    bool operator() (T const&, U const&) const
     {
         return false;
     }
diff --git a/include/mapnik/value_types.hpp b/include/mapnik/value_types.hpp
index fb6e2d8c7..01709781a 100644
--- a/include/mapnik/value_types.hpp
+++ b/include/mapnik/value_types.hpp
@@ -27,10 +27,15 @@
 #include <mapnik/config.hpp>
 
 // icu
-#include <unicode/unistr.h>  // for UnicodeString
+#include <unicode/uversion.h> // for U_NAMESPACE_QUALIFIER
 
 // stl
 #include <iosfwd>
+#include <cstddef>
+
+namespace U_ICU_NAMESPACE {
+    class UnicodeString;
+}
 
 namespace mapnik  {