diff --git a/include/mapnik/expression_evaluator.hpp b/include/mapnik/expression_evaluator.hpp
index 83dcf119a..ded3c7e79 100644
--- a/include/mapnik/expression_evaluator.hpp
+++ b/include/mapnik/expression_evaluator.hpp
@@ -25,7 +25,6 @@
 
 // boost
 #include <boost/regex.hpp>
-//#include <boost/regex/config.hpp>
 #if defined(BOOST_REGEX_HAS_ICU)
 #include <boost/regex/icu.hpp>
 #endif
diff --git a/include/mapnik/grid/grid_pixfmt.hpp b/include/mapnik/grid/grid_pixfmt.hpp
index 0f3978975..7ae058479 100644
--- a/include/mapnik/grid/grid_pixfmt.hpp
+++ b/include/mapnik/grid/grid_pixfmt.hpp
@@ -23,7 +23,7 @@
 #ifndef MAPNIK_GRID_PIXFMT_HPP
 #define MAPNIK_GRID_PIXFMT_HPP
 
-#include <string.h>
+#include <string>
 #include "agg_basics.h"
 #include <mapnik/grid/grid_pixel.hpp>
 #include <mapnik/grid/grid_rendering_buffer.hpp>
diff --git a/include/mapnik/load_map.hpp b/include/mapnik/load_map.hpp
index 3a22c6f93..2d1f23336 100644
--- a/include/mapnik/load_map.hpp
+++ b/include/mapnik/load_map.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_LOAD_MAP_HPP
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <config.hpp>
 #endif
 
 // mapnik
diff --git a/include/mapnik/map.hpp b/include/mapnik/map.hpp
index 2be677e24..152ca0181 100644
--- a/include/mapnik/map.hpp
+++ b/include/mapnik/map.hpp
@@ -24,7 +24,7 @@
 #define MAPNIK_MAP_HPP
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <config.hpp>
 #endif
 
 // mapnik
diff --git a/include/mapnik/timer.hpp b/include/mapnik/timer.hpp
index e747e9e7b..4518159c1 100644
--- a/include/mapnik/timer.hpp
+++ b/include/mapnik/timer.hpp
@@ -28,7 +28,7 @@
 #include <string>
 #include <sstream>
 #include <iomanip>
-#include <sys/time.h> 
+#include <ctime> 
 
 namespace mapnik {
 
diff --git a/include/mapnik/vertex_vector.hpp b/include/mapnik/vertex_vector.hpp
index 43adc1cde..b1bf1de61 100644
--- a/include/mapnik/vertex_vector.hpp
+++ b/include/mapnik/vertex_vector.hpp
@@ -29,7 +29,6 @@
 
 // mapnik
 #include <mapnik/vertex.hpp>
-#include <mapnik/ctrans.hpp>
 
 // boost
 #include <boost/utility.hpp>