From a9814f25f06c9bcb9a35e0859fe5af4bb9503320 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 29 Oct 2015 08:35:45 -0700
Subject: [PATCH] more test include gardening

---
 test/unit/core/box2d_test.cpp                | 1 -
 test/unit/core/comparison_test.cpp           | 1 -
 test/unit/core/conversions_test.cpp          | 2 --
 test/unit/core/copy_move_test.cpp            | 3 ---
 test/unit/core/params_test.cpp               | 2 --
 test/unit/imaging/image.cpp                  | 4 ++--
 test/unit/imaging/image_io_test.cpp          | 2 --
 test/unit/imaging/image_set_pixel.cpp        | 4 +---
 test/unit/imaging/image_view.cpp             | 2 +-
 test/unit/imaging/tiff_io.cpp                | 2 --
 test/unit/imaging/webp_io.cpp                | 3 +--
 test/unit/pixel/agg_blend_src_over_test.cpp  | 3 ---
 test/unit/serialization/wkb_formats_test.cpp | 3 ---
 test/unit/serialization/xml_parser_trim.cpp  | 4 +---
 test/unit/svg/svg_parser_test.cpp            | 4 +---
 test/unit/symbolizer/symbolizer_test.cpp     | 2 --
 16 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/test/unit/core/box2d_test.cpp b/test/unit/core/box2d_test.cpp
index 0ed32f851..87f2e1475 100644
--- a/test/unit/core/box2d_test.cpp
+++ b/test/unit/core/box2d_test.cpp
@@ -1,6 +1,5 @@
 #include "catch.hpp"
 
-#include <iostream>
 #include <mapnik/coord.hpp>
 #include <mapnik/box2d.hpp>
 
diff --git a/test/unit/core/comparison_test.cpp b/test/unit/core/comparison_test.cpp
index 2cfbc08fd..4916ae047 100644
--- a/test/unit/core/comparison_test.cpp
+++ b/test/unit/core/comparison_test.cpp
@@ -2,7 +2,6 @@
 
 #include <mapnik/value_types.hpp>
 #include <mapnik/value.hpp>
-#include <mapnik/unicode.hpp>
 
 TEST_CASE("comparison")
 {
diff --git a/test/unit/core/conversions_test.cpp b/test/unit/core/conversions_test.cpp
index 0b42d8512..ba0c22371 100644
--- a/test/unit/core/conversions_test.cpp
+++ b/test/unit/core/conversions_test.cpp
@@ -6,8 +6,6 @@
 #include <mapnik/util/conversions.hpp>
 
 #include <iostream>
-#include <vector>
-#include <algorithm>
 #include <unordered_map>
 #include <sstream>
 
diff --git a/test/unit/core/copy_move_test.cpp b/test/unit/core/copy_move_test.cpp
index a219178a9..c4c48cfaa 100644
--- a/test/unit/core/copy_move_test.cpp
+++ b/test/unit/core/copy_move_test.cpp
@@ -6,9 +6,6 @@
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/util/fs.hpp>
 
-#include <vector>
-#include <algorithm>
-
 #include "catch.hpp"
 
 
diff --git a/test/unit/core/params_test.cpp b/test/unit/core/params_test.cpp
index 879b86177..677de7ad0 100644
--- a/test/unit/core/params_test.cpp
+++ b/test/unit/core/params_test.cpp
@@ -4,8 +4,6 @@
 #include <mapnik/value_types.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/boolean.hpp>
-#include <vector>
-#include <algorithm>
 
 #include <ostream>
 
diff --git a/test/unit/imaging/image.cpp b/test/unit/imaging/image.cpp
index 23f02c216..5044d942f 100644
--- a/test/unit/imaging/image.cpp
+++ b/test/unit/imaging/image.cpp
@@ -1,10 +1,10 @@
 #include "catch.hpp"
 
 // mapnik
-#include <mapnik/value.hpp>
+#include <mapnik/image.hpp>
+#include <mapnik/image_view.hpp>
 #include <mapnik/image_any.hpp>
 #include <mapnik/color.hpp>
-#include <mapnik/image_view_any.hpp>
 #include <mapnik/image_util.hpp>
 
 TEST_CASE("image class") {
diff --git a/test/unit/imaging/image_io_test.cpp b/test/unit/imaging/image_io_test.cpp
index 8a5150211..37f8fee89 100644
--- a/test/unit/imaging/image_io_test.cpp
+++ b/test/unit/imaging/image_io_test.cpp
@@ -6,8 +6,6 @@
 #include <mapnik/image_util.hpp>
 #include <mapnik/image_util_jpeg.hpp>
 #include <mapnik/util/fs.hpp>
-#include <vector>
-#include <algorithm>
 #if defined(HAVE_CAIRO)
 #include <mapnik/cairo/cairo_context.hpp>
 #include <mapnik/cairo/cairo_image_util.hpp>
diff --git a/test/unit/imaging/image_set_pixel.cpp b/test/unit/imaging/image_set_pixel.cpp
index ed7ceaffc..3488e0005 100644
--- a/test/unit/imaging/image_set_pixel.cpp
+++ b/test/unit/imaging/image_set_pixel.cpp
@@ -1,9 +1,7 @@
 #include "catch.hpp"
 
 // mapnik
-#include <mapnik/image_any.hpp>
-#include <mapnik/image_view_any.hpp>
-#include <mapnik/color.hpp>
+#include <mapnik/image.hpp>
 #include <mapnik/image_util.hpp>
 
 
diff --git a/test/unit/imaging/image_view.cpp b/test/unit/imaging/image_view.cpp
index dac76449b..25dbacfd9 100644
--- a/test/unit/imaging/image_view.cpp
+++ b/test/unit/imaging/image_view.cpp
@@ -1,7 +1,7 @@
 #include "catch.hpp"
 
 // mapnik
-#include <mapnik/image_any.hpp>
+#include <mapnik/image.hpp>
 #include <mapnik/color.hpp>
 #include <mapnik/image_view_any.hpp>
 #include <mapnik/image_util.hpp>
diff --git a/test/unit/imaging/tiff_io.cpp b/test/unit/imaging/tiff_io.cpp
index 2e31d566d..1ace38fa1 100644
--- a/test/unit/imaging/tiff_io.cpp
+++ b/test/unit/imaging/tiff_io.cpp
@@ -7,10 +7,8 @@
 #include "catch.hpp"
 
 #include <mapnik/image_reader.hpp>
-#include <mapnik/image_util.hpp>
 #include <mapnik/util/file_io.hpp>
 
-#include <mapnik/tiff_io.hpp>
 #include "../../../src/tiff_reader.cpp"
 
 #define TIFF_ASSERT(filename) \
diff --git a/test/unit/imaging/webp_io.cpp b/test/unit/imaging/webp_io.cpp
index 6f580a42f..8f6d23be6 100644
--- a/test/unit/imaging/webp_io.cpp
+++ b/test/unit/imaging/webp_io.cpp
@@ -3,8 +3,7 @@
 
 #include "catch.hpp"
 
-#include <mapnik/image_util.hpp>
-#include <mapnik/image_view_any.hpp>
+#include <mapnik/image_view.hpp>
 #include <mapnik/webp_io.hpp>
 
 TEST_CASE("webp io") {
diff --git a/test/unit/pixel/agg_blend_src_over_test.cpp b/test/unit/pixel/agg_blend_src_over_test.cpp
index 235a23047..60846f7a2 100644
--- a/test/unit/pixel/agg_blend_src_over_test.cpp
+++ b/test/unit/pixel/agg_blend_src_over_test.cpp
@@ -1,12 +1,9 @@
 #include "catch.hpp"
 
 #include <iostream>
-#include <cstdio>
 #include <cstring>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <algorithm>
 #include "agg_color_rgba.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_rendering_buffer.h"
diff --git a/test/unit/serialization/wkb_formats_test.cpp b/test/unit/serialization/wkb_formats_test.cpp
index ff72a1c0b..1f3a82e2f 100644
--- a/test/unit/serialization/wkb_formats_test.cpp
+++ b/test/unit/serialization/wkb_formats_test.cpp
@@ -1,15 +1,12 @@
 #include "catch.hpp"
 
 #include <iostream>
-#include <mapnik/params.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/geometry_is_valid.hpp>
 #include <mapnik/geometry_is_simple.hpp>
 #include <mapnik/geometry_correct.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <vector>
-#include <algorithm>
 #include <boost/version.hpp>
 
 TEST_CASE("geometry formats") {
diff --git a/test/unit/serialization/xml_parser_trim.cpp b/test/unit/serialization/xml_parser_trim.cpp
index f79c75502..afd282416 100644
--- a/test/unit/serialization/xml_parser_trim.cpp
+++ b/test/unit/serialization/xml_parser_trim.cpp
@@ -1,10 +1,8 @@
 #include "catch.hpp"
 
-#include <mapnik/debug.hpp>
-#include <mapnik/value.hpp>
 #include <mapnik/xml_tree.hpp>
 #include <mapnik/xml_loader.hpp>
-#include <mapnik/attribute.hpp>
+#include <mapnik/attribute.hpp> // needed due to fwd declare in value_types.hpp
 
 TEST_CASE("xml parser") {
 
diff --git a/test/unit/svg/svg_parser_test.cpp b/test/unit/svg/svg_parser_test.cpp
index 6dfb0bd7f..c92b79756 100644
--- a/test/unit/svg/svg_parser_test.cpp
+++ b/test/unit/svg/svg_parser_test.cpp
@@ -22,20 +22,18 @@
 
 #include "catch.hpp"
 
-#include <mapnik/version.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/vertex.hpp>
 #include <mapnik/svg/svg_parser.hpp>
-#include <mapnik/svg/svg_storage.hpp>
 #include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
 
 #include <cmath>
 #include <fstream>
-#include <streambuf>
+#include <iterator>
 
 namespace detail {
 
diff --git a/test/unit/symbolizer/symbolizer_test.cpp b/test/unit/symbolizer/symbolizer_test.cpp
index 582613ddf..3af053251 100644
--- a/test/unit/symbolizer/symbolizer_test.cpp
+++ b/test/unit/symbolizer/symbolizer_test.cpp
@@ -2,8 +2,6 @@
 
 #include <iostream>
 #include <mapnik/symbolizer.hpp>
-#include <vector>
-#include <algorithm>
 
 using namespace mapnik;