diff --git a/include/engine/datafacade/datafacade_base.hpp b/include/engine/datafacade/datafacade_base.hpp
index f5904728b4a..a0d1f0e9818 100644
--- a/include/engine/datafacade/datafacade_base.hpp
+++ b/include/engine/datafacade/datafacade_base.hpp
@@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/string_util.hpp"
 #include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <string>
 #include <boost/optional.hpp>
diff --git a/include/engine/datafacade/internal_datafacade.hpp b/include/engine/datafacade/internal_datafacade.hpp
index e0a265c7b99..82bbe30e2c7 100644
--- a/include/engine/datafacade/internal_datafacade.hpp
+++ b/include/engine/datafacade/internal_datafacade.hpp
@@ -43,7 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/graph_loader.hpp"
 #include "util/simple_logger.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <boost/thread.hpp>
 
diff --git a/include/engine/descriptors/description_factory.hpp b/include/engine/descriptors/description_factory.hpp
index 918b5d02e33..0e3dc241381 100644
--- a/include/engine/descriptors/description_factory.hpp
+++ b/include/engine/descriptors/description_factory.hpp
@@ -35,8 +35,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
-#include <osrm/json_container.hpp>
+#include "osrm/coordinate.hpp"
+#include "osrm/json_container.hpp"
 
 #include <cmath>
 
diff --git a/include/engine/descriptors/descriptor_base.hpp b/include/engine/descriptors/descriptor_base.hpp
index f1eed276fcd..41511a08212 100644
--- a/include/engine/descriptors/descriptor_base.hpp
+++ b/include/engine/descriptors/descriptor_base.hpp
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/assert.hpp>
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <string>
 #include <unordered_map>
diff --git a/include/engine/descriptors/gpx_descriptor.hpp b/include/engine/descriptors/gpx_descriptor.hpp
index 8ff0cc7ecc3..dd750662543 100644
--- a/include/engine/descriptors/gpx_descriptor.hpp
+++ b/include/engine/descriptors/gpx_descriptor.hpp
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "engine/descriptors/descriptor_base.hpp"
 #include "util/xml_renderer.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <iostream>
 
diff --git a/include/engine/descriptors/json_descriptor.hpp b/include/engine/descriptors/json_descriptor.hpp
index ad1ecbc8ea5..0e9e629a6a8 100644
--- a/include/engine/descriptors/json_descriptor.hpp
+++ b/include/engine/descriptors/json_descriptor.hpp
@@ -42,7 +42,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/string_util.hpp"
 #include "util/timing_util.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <limits>
 #include <algorithm>
diff --git a/include/engine/geospatial_query.hpp b/include/engine/geospatial_query.hpp
index 830babda6b3..05105554e41 100644
--- a/include/engine/geospatial_query.hpp
+++ b/include/engine/geospatial_query.hpp
@@ -6,7 +6,7 @@
 #include "engine/phantom_node.hpp"
 #include "util/bearing.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <vector>
 #include <memory>
diff --git a/include/engine/internal_route_result.hpp b/include/engine/internal_route_result.hpp
index dec60bfabe0..be8dec22320 100644
--- a/include/engine/internal_route_result.hpp
+++ b/include/engine/internal_route_result.hpp
@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "extractor/turn_instructions.hpp"
 #include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <vector>
 
diff --git a/include/engine/osrm_impl.hpp b/include/engine/osrm_impl.hpp
index ea039746da8..b6c8928d26c 100644
--- a/include/engine/osrm_impl.hpp
+++ b/include/engine/osrm_impl.hpp
@@ -33,9 +33,9 @@ struct RouteParameters;
 
 #include "contractor/query_edge.hpp"
 
-#include <osrm/json_container.hpp>
-#include <osrm/libosrm_config.hpp>
-#include <osrm/osrm.hpp>
+#include "osrm/json_container.hpp"
+#include "osrm/libosrm_config.hpp"
+#include "osrm/osrm.hpp"
 
 #include <memory>
 #include <unordered_map>
diff --git a/include/engine/phantom_node.hpp b/include/engine/phantom_node.hpp
index 0c660f05768..f2255e35e29 100644
--- a/include/engine/phantom_node.hpp
+++ b/include/engine/phantom_node.hpp
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "extractor/travel_mode.hpp"
 #include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <iostream>
 #include <utility>
diff --git a/include/engine/plugins/distance_table.hpp b/include/engine/plugins/distance_table.hpp
index 2e5d31da7e1..8009e6818e6 100644
--- a/include/engine/plugins/distance_table.hpp
+++ b/include/engine/plugins/distance_table.hpp
@@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/string_util.hpp"
 #include "util/timing_util.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cstdlib>
 
diff --git a/include/engine/plugins/hello_world.hpp b/include/engine/plugins/hello_world.hpp
index d18cf30ab92..ac6aa53d959 100644
--- a/include/engine/plugins/hello_world.hpp
+++ b/include/engine/plugins/hello_world.hpp
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "util/json_renderer.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <string>
 
diff --git a/include/engine/plugins/nearest.hpp b/include/engine/plugins/nearest.hpp
index 6b95f8d860c..1fc66efec68 100644
--- a/include/engine/plugins/nearest.hpp
+++ b/include/engine/plugins/nearest.hpp
@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/integer_range.hpp"
 #include "util/json_renderer.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <string>
 
diff --git a/include/engine/plugins/plugin_base.hpp b/include/engine/plugins/plugin_base.hpp
index fb5cd728c26..b623aa1f40e 100644
--- a/include/engine/plugins/plugin_base.hpp
+++ b/include/engine/plugins/plugin_base.hpp
@@ -30,9 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "engine/phantom_node.hpp"
 
-#include <osrm/coordinate.hpp>
-#include <osrm/json_container.hpp>
-#include <osrm/route_parameters.hpp>
+#include "osrm/coordinate.hpp"
+#include "osrm/json_container.hpp"
+#include "osrm/route_parameters.hpp"
 
 #include <algorithm>
 #include <string>
diff --git a/include/engine/plugins/timestamp.hpp b/include/engine/plugins/timestamp.hpp
index 95201944990..0b1ef077281 100644
--- a/include/engine/plugins/timestamp.hpp
+++ b/include/engine/plugins/timestamp.hpp
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "util/json_renderer.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <string>
 
diff --git a/include/engine/plugins/trip.hpp b/include/engine/plugins/trip.hpp
index 34d39878e35..7ca1e663b45 100644
--- a/include/engine/plugins/trip.hpp
+++ b/include/engine/plugins/trip.hpp
@@ -46,7 +46,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/dist_table_wrapper.hpp" // to access the dist
                                           // table more easily
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 #include <boost/assert.hpp>
 
 #include <cstdlib>
diff --git a/include/engine/plugins/viaroute.hpp b/include/engine/plugins/viaroute.hpp
index 6c7976eb5f1..43e8728c3cb 100644
--- a/include/engine/plugins/viaroute.hpp
+++ b/include/engine/plugins/viaroute.hpp
@@ -41,7 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/simple_logger.hpp"
 #include "util/timing_util.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cstdlib>
 
diff --git a/include/engine/polyline_compressor.hpp b/include/engine/polyline_compressor.hpp
index a148200ca0c..f4c449156df 100644
--- a/include/engine/polyline_compressor.hpp
+++ b/include/engine/polyline_compressor.hpp
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct SegmentInformation;
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/engine/polyline_formatter.hpp b/include/engine/polyline_formatter.hpp
index 68cc70293ef..9f7c60eeffb 100644
--- a/include/engine/polyline_formatter.hpp
+++ b/include/engine/polyline_formatter.hpp
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct SegmentInformation;
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <string>
 #include <vector>
diff --git a/include/engine/segment_information.hpp b/include/engine/segment_information.hpp
index 6da38e126fa..725358b5094 100644
--- a/include/engine/segment_information.hpp
+++ b/include/engine/segment_information.hpp
@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "extractor/travel_mode.hpp"
 #include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 #include <utility>
 
 // Struct fits everything in one cache line
diff --git a/include/engine/trip/trip_brute_force.hpp b/include/engine/trip/trip_brute_force.hpp
index fa8b424b15e..5203deea875 100644
--- a/include/engine/trip/trip_brute_force.hpp
+++ b/include/engine/trip/trip_brute_force.hpp
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/dist_table_wrapper.hpp"
 #include "util/simple_logger.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cstdlib>
 #include <algorithm>
diff --git a/include/engine/trip/trip_farthest_insertion.hpp b/include/engine/trip/trip_farthest_insertion.hpp
index bd4910f308c..13f301235bf 100644
--- a/include/engine/trip/trip_farthest_insertion.hpp
+++ b/include/engine/trip/trip_farthest_insertion.hpp
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "engine/search_engine.hpp"
 #include "util/dist_table_wrapper.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 #include <boost/assert.hpp>
 
 #include <cstdlib>
diff --git a/include/engine/trip/trip_nearest_neighbour.hpp b/include/engine/trip/trip_nearest_neighbour.hpp
index f458dbac171..e931bcda7d6 100644
--- a/include/engine/trip/trip_nearest_neighbour.hpp
+++ b/include/engine/trip/trip_nearest_neighbour.hpp
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/simple_logger.hpp"
 #include "util/dist_table_wrapper.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cstdlib>
 #include <algorithm>
diff --git a/include/engine/trip/trip_tabu_search.hpp b/include/engine/trip/trip_tabu_search.hpp
index 4119371bc0c..988d0a66838 100644
--- a/include/engine/trip/trip_tabu_search.hpp
+++ b/include/engine/trip/trip_tabu_search.hpp
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "engine/search_engine.hpp"
 #include "util/simple_logger.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cstdlib>
 #include <algorithm>
diff --git a/include/extractor/edge_based_node.hpp b/include/extractor/edge_based_node.hpp
index d6812657430..cc09ed2a0c5 100644
--- a/include/extractor/edge_based_node.hpp
+++ b/include/extractor/edge_based_node.hpp
@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <limits>
 
diff --git a/include/extractor/internal_extractor_edge.hpp b/include/extractor/internal_extractor_edge.hpp
index 7d9514ffdb9..546bb32dcb5 100644
--- a/include/extractor/internal_extractor_edge.hpp
+++ b/include/extractor/internal_extractor_edge.hpp
@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 #include <utility>
 
 struct InternalExtractorEdge
diff --git a/include/extractor/query_node.hpp b/include/extractor/query_node.hpp
index 4781b121ded..2c956262e53 100644
--- a/include/extractor/query_node.hpp
+++ b/include/extractor/query_node.hpp
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <limits>
 
diff --git a/include/extractor/tarjan_scc.hpp b/include/extractor/tarjan_scc.hpp
index 0acbd755597..ad829d1672e 100644
--- a/include/extractor/tarjan_scc.hpp
+++ b/include/extractor/tarjan_scc.hpp
@@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/std_hash.hpp"
 #include "util/timing_util.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 #include <boost/assert.hpp>
 #include <cstdint>
 
diff --git a/include/osrm/route_parameters.hpp b/include/osrm/route_parameters.hpp
index 6d2dda71977..700c55807b8 100644
--- a/include/osrm/route_parameters.hpp
+++ b/include/osrm/route_parameters.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ROUTE_PARAMETERS_HPP
 #define ROUTE_PARAMETERS_HPP
 
-#include <osrm/coordinate.hpp>
+#include "coordinate.hpp"
 
 #include <boost/fusion/container/vector/vector_fwd.hpp>
 #include <boost/spirit/include/qi.hpp>
diff --git a/include/util/json_logger.hpp b/include/util/json_logger.hpp
index 8726f78d99c..dbef457e6eb 100644
--- a/include/util/json_logger.hpp
+++ b/include/util/json_logger.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef JSON_LOGGER_HPP
 #define JSON_LOGGER_HPP
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <boost/thread/tss.hpp>
 
diff --git a/include/util/json_renderer.hpp b/include/util/json_renderer.hpp
index a359cfe2fdb..d44d507fa7c 100644
--- a/include/util/json_renderer.hpp
+++ b/include/util/json_renderer.hpp
@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/cast.hpp"
 #include "util/string_util.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 namespace osrm
 {
diff --git a/include/util/json_util.hpp b/include/util/json_util.hpp
index bfb8a8bc44b..0804f0a6feb 100644
--- a/include/util/json_util.hpp
+++ b/include/util/json_util.hpp
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef JSON_UTIL_HPP
 #define JSON_UTIL_HPP
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 #include <cmath>
 #include <limits>
diff --git a/include/util/matching_debug_info.hpp b/include/util/matching_debug_info.hpp
index b51b3ccb15e..a21c8f6bc95 100644
--- a/include/util/matching_debug_info.hpp
+++ b/include/util/matching_debug_info.hpp
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/json_util.hpp"
 #include "engine/map_matching/hidden_markov_model.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 // Provides the debug interface for introspection tools
 struct MatchingDebugInfo
diff --git a/include/util/rectangle.hpp b/include/util/rectangle.hpp
index b31ea621f92..f4dd5280d42 100644
--- a/include/util/rectangle.hpp
+++ b/include/util/rectangle.hpp
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <algorithm>
 #include <cstdint>
diff --git a/include/util/static_rtree.hpp b/include/util/static_rtree.hpp
index aa523710b70..8483142e829 100644
--- a/include/util/static_rtree.hpp
+++ b/include/util/static_rtree.hpp
@@ -40,7 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/osrm_exception.hpp"
 #include "util/typedefs.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>
diff --git a/include/util/typedefs.hpp b/include/util/typedefs.hpp
index dc77f39c76d..efc15965f02 100644
--- a/include/util/typedefs.hpp
+++ b/include/util/typedefs.hpp
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define TYPEDEFS_H
 
 #include <limits>
-#include <osrm/strong_typedef.hpp>
+#include "osrm/strong_typedef.hpp"
 #include <cstddef>
 
 // Necessary workaround for Windows as VS doesn't implement C99
diff --git a/include/util/xml_renderer.hpp b/include/util/xml_renderer.hpp
index 452fd5e8768..ffd155de8f0 100644
--- a/include/util/xml_renderer.hpp
+++ b/include/util/xml_renderer.hpp
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "util/cast.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 namespace osrm
 {