diff --git a/include/mapnik/marker.hpp b/include/mapnik/marker.hpp
index ee24871bd..9a30ab67c 100644
--- a/include/mapnik/marker.hpp
+++ b/include/mapnik/marker.hpp
@@ -27,13 +27,9 @@
 #include <mapnik/image.hpp>
 #include <mapnik/svg/svg_storage.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
+#include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/util/variant.hpp>
 
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore_agg.hpp>
-#include "agg_array.h"
-#pragma GCC diagnostic pop
-
 // stl
 #include <deque>
 #include <memory>
@@ -42,10 +38,8 @@ namespace mapnik
 {
 
 struct image_any;
-namespace svg { struct path_attributes; }
 
 using svg::svg_path_adapter;
-
 using svg_attribute_type = std::deque<svg::path_attributes>;
 using svg_storage_type = svg::svg_storage<svg::svg_path_storage, svg_attribute_type>;
 using svg_path_ptr = std::shared_ptr<svg_storage_type>;