diff --git a/include/mapnik/box2d.hpp b/include/mapnik/box2d.hpp
index dcc3a137a..28b03891b 100644
--- a/include/mapnik/box2d.hpp
+++ b/include/mapnik/box2d.hpp
@@ -25,9 +25,10 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/geometry.hpp>
+#include <mapnik/geometry/point.hpp>
 // stl
 #include <limits>
+#include <string>
 // agg
 // forward declare so that apps using mapnik do not need agg headers
 namespace agg {
diff --git a/include/mapnik/pixel_position.hpp b/include/mapnik/pixel_position.hpp
index 143648fc8..5d935ddc1 100644
--- a/include/mapnik/pixel_position.hpp
+++ b/include/mapnik/pixel_position.hpp
@@ -24,7 +24,7 @@
 
 // stl
 #include <cmath>
-#include <mapnik/geometry.hpp>
+#include <mapnik/geometry/point.hpp>
 
 namespace mapnik
 {