diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c92d73..bf1aa9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(spatialalgorithms LANGUAGES CXX C)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED on)
 
 option(BUILD_EXAMPLES "Build examples ON/OFF(default)" OFF)
diff --git a/cmake/spatialalgorithms.cmake b/cmake/spatialalgorithms.cmake
index c2a0f92..caed73b 100644
--- a/cmake/spatialalgorithms.cmake
+++ b/cmake/spatialalgorithms.cmake
@@ -5,5 +5,5 @@ execute_process(
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
 
 # CMake 3.1 does not have this yet.
-set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
-set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
+set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
+set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
diff --git a/include/mapbox/geometry/algorithms/closest_point.hpp b/include/mapbox/geometry/algorithms/closest_point.hpp
index d71fe71..36e8601 100644
--- a/include/mapbox/geometry/algorithms/closest_point.hpp
+++ b/include/mapbox/geometry/algorithms/closest_point.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <mapbox/geometry/point.hpp>
+
 namespace mapbox { namespace geometry { namespace algorithms {
 
 template <typename T>
diff --git a/include/mapbox/geometry/algorithms/closest_point_impl.hpp b/include/mapbox/geometry/algorithms/closest_point_impl.hpp
index b9c08a7..3b47974 100644
--- a/include/mapbox/geometry/algorithms/closest_point_impl.hpp
+++ b/include/mapbox/geometry/algorithms/closest_point_impl.hpp
@@ -1,4 +1,4 @@
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/algorithms/detail/boost_adapters.hpp>
 #include <mapbox/geometry/algorithms/closest_point.hpp>
 #include <boost/geometry/extensions/algorithms/closest_point.hpp>
diff --git a/include/mapbox/geometry/algorithms/detail/boost_adapters.hpp b/include/mapbox/geometry/algorithms/detail/boost_adapters.hpp
index bd0b62e..faa3314 100644
--- a/include/mapbox/geometry/algorithms/detail/boost_adapters.hpp
+++ b/include/mapbox/geometry/algorithms/detail/boost_adapters.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 // mapbox
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/box.hpp>
 // boost.geometry
 #include <boost/geometry/geometry.hpp>
diff --git a/include/mapbox/geometry/algorithms/detail/predicate_dispatcher.hpp b/include/mapbox/geometry/algorithms/detail/predicate_dispatcher.hpp
index 81826a2..e4fdb63 100644
--- a/include/mapbox/geometry/algorithms/detail/predicate_dispatcher.hpp
+++ b/include/mapbox/geometry/algorithms/detail/predicate_dispatcher.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <type_traits>
+#include <mapbox/geometry/geometry.hpp>
+
 namespace mapbox { namespace geometry { namespace algorithms { namespace detail {
 
 template <typename T>
diff --git a/include/mapbox/geometry/algorithms/intersection.hpp b/include/mapbox/geometry/algorithms/intersection.hpp
index 162836e..4d371b6 100644
--- a/include/mapbox/geometry/algorithms/intersection.hpp
+++ b/include/mapbox/geometry/algorithms/intersection.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <mapbox/geometry/geometry.hpp>
+#include <mapbox/geometry/box.hpp>
 #include <vector>
 
 namespace mapbox { namespace geometry { namespace algorithms {
diff --git a/include/mapbox/geometry/algorithms/intersection_impl.hpp b/include/mapbox/geometry/algorithms/intersection_impl.hpp
index 1f070e6..120d240 100644
--- a/include/mapbox/geometry/algorithms/intersection_impl.hpp
+++ b/include/mapbox/geometry/algorithms/intersection_impl.hpp
@@ -1,4 +1,4 @@
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/box.hpp>
 #include <mapbox/geometry/algorithms/detail/boost_adapters.hpp>
 #include <mapbox/geometry/algorithms/intersection.hpp>
diff --git a/include/mapbox/geometry/algorithms/predicates/disjoint_impl.hpp b/include/mapbox/geometry/algorithms/predicates/disjoint_impl.hpp
index 931f504..d128688 100644
--- a/include/mapbox/geometry/algorithms/predicates/disjoint_impl.hpp
+++ b/include/mapbox/geometry/algorithms/predicates/disjoint_impl.hpp
@@ -1,5 +1,5 @@
 //
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/algorithms/detail/boost_adapters.hpp>
 #include <mapbox/geometry/algorithms/detail/predicate_dispatcher.hpp>
 #include <mapbox/geometry/algorithms/predicates/disjoint.hpp>
diff --git a/include/mapbox/geometry/algorithms/predicates/intersects_impl.hpp b/include/mapbox/geometry/algorithms/predicates/intersects_impl.hpp
index a946258..d8a7f9a 100644
--- a/include/mapbox/geometry/algorithms/predicates/intersects_impl.hpp
+++ b/include/mapbox/geometry/algorithms/predicates/intersects_impl.hpp
@@ -1,5 +1,5 @@
 //
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/algorithms/detail/boost_adapters.hpp>
 #include <mapbox/geometry/algorithms/detail/predicate_dispatcher.hpp>
 #include <mapbox/geometry/algorithms/predicates/intersects.hpp>
diff --git a/include/mapbox/geometry/algorithms/scaling_impl.hpp b/include/mapbox/geometry/algorithms/scaling_impl.hpp
index f85c566..0bcfc89 100644
--- a/include/mapbox/geometry/algorithms/scaling_impl.hpp
+++ b/include/mapbox/geometry/algorithms/scaling_impl.hpp
@@ -1,4 +1,4 @@
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/algorithms/detail/boost_adapters.hpp>
 #include <mapbox/geometry/algorithms/scaling.hpp>
 #include <boost/geometry/algorithms/transform.hpp>
diff --git a/test/test-spatial-algorithms.cpp b/test/test-spatial-algorithms.cpp
index 6c746c0..43d40ce 100644
--- a/test/test-spatial-algorithms.cpp
+++ b/test/test-spatial-algorithms.cpp
@@ -1,4 +1,4 @@
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/algorithms/predicates.hpp>
 #include <iostream>
 
diff --git a/test/unit/closest_point/test-closest-point.cpp b/test/unit/closest_point/test-closest-point.cpp
index 17555aa..e467d59 100644
--- a/test/unit/closest_point/test-closest-point.cpp
+++ b/test/unit/closest_point/test-closest-point.cpp
@@ -1,5 +1,5 @@
 #include <boost/test/unit_test.hpp>
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/algorithms/closest_point.hpp>
 #include <iostream>
 BOOST_AUTO_TEST_SUITE(closest_point_tests)
diff --git a/test/unit/intersection/test-intersection.cpp b/test/unit/intersection/test-intersection.cpp
index acfda3c..5b29634 100644
--- a/test/unit/intersection/test-intersection.cpp
+++ b/test/unit/intersection/test-intersection.cpp
@@ -1,5 +1,6 @@
 #include <boost/test/unit_test.hpp>
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
+#include <mapbox/geometry/box.hpp>
 #include <mapbox/geometry/algorithms/intersection.hpp>
 #include <iostream>
 BOOST_AUTO_TEST_SUITE(intersection_tests)
diff --git a/test/unit/predicates/test-disjoint.cpp b/test/unit/predicates/test-disjoint.cpp
index 5aeb5cd..306bd1b 100644
--- a/test/unit/predicates/test-disjoint.cpp
+++ b/test/unit/predicates/test-disjoint.cpp
@@ -1,5 +1,5 @@
 #include <boost/test/unit_test.hpp>
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/algorithms/predicates.hpp>
 #include <iostream>
 
diff --git a/test/unit/predicates/test-intersects.cpp b/test/unit/predicates/test-intersects.cpp
index ea241b7..d6dcc64 100644
--- a/test/unit/predicates/test-intersects.cpp
+++ b/test/unit/predicates/test-intersects.cpp
@@ -1,5 +1,5 @@
 #include <boost/test/unit_test.hpp>
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/algorithms/predicates.hpp>
 #include <iostream>
 
diff --git a/test/unit/scaling/test-scaling.cpp b/test/unit/scaling/test-scaling.cpp
index d55adf3..b2c35d2 100644
--- a/test/unit/scaling/test-scaling.cpp
+++ b/test/unit/scaling/test-scaling.cpp
@@ -1,7 +1,8 @@
 #include <boost/test/unit_test.hpp>
-#include <mapbox/geometry.hpp>
+#include <mapbox/geometry/geometry.hpp>
 #include <mapbox/geometry/algorithms/scaling.hpp>
 #include <iostream>
+#include <cmath>
 
 BOOST_AUTO_TEST_SUITE(scaling_tests)