diff --git a/include/filter_parser.hpp b/include/filter_parser.hpp
index bb1521dad..a0ec5f744 100644
--- a/include/filter_parser.hpp
+++ b/include/filter_parser.hpp
@@ -26,6 +26,9 @@
 #ifndef FILTER_PARSER_HPP
 #define FILTER_PARSER_HPP
 
+#include <stack>
+#include <iostream>
+
 #include <boost/shared_ptr.hpp>
 #include <boost/spirit/core.hpp>
 #include <boost/spirit/symbols.hpp>
@@ -39,8 +42,6 @@
 #include "filter.hpp"
 #include "regex_filter.hpp"
 
-#include <stack>
-#include <iostream>
 
 using namespace boost::spirit;
 using std::string;
diff --git a/include/mapnik.hpp b/include/mapnik.hpp
index ac77672ae..e19f13b50 100644
--- a/include/mapnik.hpp
+++ b/include/mapnik.hpp
@@ -28,6 +28,7 @@
 #include <map>
 #include <vector>
 #include <cassert>
+
 #include "global.hpp"
 #include "factory.hpp"
 #include "filter.hpp"