Fix include paths

include/util/datastore_options.hpp

@@ -29,9 +29,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define DATASTORE_OPTIONS_HPP
 
 #include "util/version.hpp"
-#include "ini_file.hpp"
-#include "osrm_exception.hpp"
-#include "simple_logger.hpp"
+#include "util/ini_file.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/any.hpp>
 #include <boost/filesystem.hpp>

include/util/deallocating_vector.hpp

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DEALLOCATING_VECTOR_HPP
 #define DEALLOCATING_VECTOR_HPP
 
-#include "../util/integer_range.hpp"
+#include "util/integer_range.hpp"
 
 #include <boost/iterator/iterator_facade.hpp>
 

include/util/debug_geometry.hpp

@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DEBUG_GEOMETRY_H
 #define DEBUG_GEOMETRY_H
 
-#include "../contractor/contractor_options.hpp"
-#include "../data_structures/query_node.hpp"
+#include "contractor/contractor_options.hpp"
+#include "extractor/query_node.hpp"
 
 #ifndef DEBUG_GEOMETRY
 
@@ -57,8 +57,8 @@ inline void DEBUG_TURNS_STOP() {}
 #include <iomanip>
 #include <iostream>
 
-#include "../include/osrm/coordinate.hpp"
-#include "../algorithms/coordinate_calculation.hpp"
+#include "util/coordinate.hpp"
+#include "util/coordinate_calculation.hpp"
 
 boost::filesystem::ofstream debug_geometry_file;
 bool dg_output_debug_geometry = false;

include/util/dynamic_graph.hpp

@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DYNAMICGRAPH_HPP
 #define DYNAMICGRAPH_HPP
 
-#include "deallocating_vector.hpp"
-#include "../util/integer_range.hpp"
-#include "../typedefs.h"
+#include "util/deallocating_vector.hpp"
+#include "util/integer_range.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 

include/util/graph_loader.hpp

@@ -28,14 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GRAPH_LOADER_HPP
 #define GRAPH_LOADER_HPP
 
-#include "fingerprint.hpp"
-#include "osrm_exception.hpp"
-#include "simple_logger.hpp"
-#include "../data_structures/external_memory_node.hpp"
-#include "../data_structures/import_edge.hpp"
-#include "../data_structures/query_node.hpp"
-#include "../data_structures/restriction.hpp"
-#include "../typedefs.h"
+#include "util/fingerprint.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "extractor/import_edge.hpp"
+#include "extractor/query_node.hpp"
+#include "extractor/restriction.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>

include/util/graph_utils.hpp

@@ -1,7 +1,7 @@
 #ifndef GRAPH_UTILS_HPP
 #define GRAPH_UTILS_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 #include <vector>

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>
 

include/util/json_renderer.hpp

@@ -31,10 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef JSON_RENDERER_HPP
 #define JSON_RENDERER_HPP
 
-#include "cast.hpp"
-#include "string_util.hpp"
+#include "util/cast.hpp"
+#include "util/string_util.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 namespace osrm
 {

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>

include/util/matching_debug_info.hpp

@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef MATCHING_DEBUG_INFO_HPP
 #define MATCHING_DEBUG_INFO_HPP
 
-#include "json_logger.hpp"
-#include "json_util.hpp"
-#include "../data_structures/hidden_markov_model.hpp"
+#include "util/json_logger.hpp"
+#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

include/util/matrix_graph_wrapper.hpp

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cstddef>
 #include <iterator>
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 // This Wrapper provides all methods that are needed for TarjanSCC, when the graph is given in a
 // matrix representation (e.g. as output from a distance table call)

include/util/node_based_graph.hpp

@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef NODE_BASED_GRAPH_HPP
 #define NODE_BASED_GRAPH_HPP
 
-#include "dynamic_graph.hpp"
-#include "import_edge.hpp"
-#include "../util/graph_utils.hpp"
+#include "util/dynamic_graph.hpp"
+#include "extractor/import_edge.hpp"
+#include "util/graph_utils.hpp"
 
 #include <tbb/parallel_sort.h>
 

include/util/range_table.hpp

@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RANGE_TABLE_HPP
 #define RANGE_TABLE_HPP
 
-#include "../util/integer_range.hpp"
-#include "shared_memory_factory.hpp"
-#include "shared_memory_vector_wrapper.hpp"
+#include "util/integer_range.hpp"
+#include "datastore/shared_memory_factory.hpp"
+#include "util/shared_memory_vector_wrapper.hpp"
 
 #include <fstream>
 #include <array>

include/util/rectangle.hpp

@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RECTANGLE_HPP
 #define RECTANGLE_HPP
 
-#include "../algorithms/coordinate_calculation.hpp"
+#include "util/coordinate_calculation.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <algorithm>
 #include <cstdint>

include/util/routed_options.hpp

@@ -29,9 +29,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define ROUTED_OPTIONS_HPP
 
 #include "util/version.hpp"
-#include "ini_file.hpp"
-#include "osrm_exception.hpp"
-#include "simple_logger.hpp"
+#include "util/ini_file.hpp"
+#include "util/osrm_exception.hpp"
+#include "util/simple_logger.hpp"
 
 #include <boost/any.hpp>
 #include <boost/program_options.hpp>

include/util/static_graph.hpp

@@ -28,10 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef STATIC_GRAPH_HPP
 #define STATIC_GRAPH_HPP
 
-#include "percent.hpp"
-#include "shared_memory_vector_wrapper.hpp"
-#include "../util/integer_range.hpp"
-#include "../typedefs.h"
+#include "util/percent.hpp"
+#include "util/shared_memory_vector_wrapper.hpp"
+#include "util/integer_range.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 

include/util/static_rtree.hpp

@@ -28,19 +28,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef STATIC_RTREE_HPP
 #define STATIC_RTREE_HPP
 
-#include "deallocating_vector.hpp"
-#include "hilbert_value.hpp"
-#include "rectangle.hpp"
-#include "shared_memory_factory.hpp"
-#include "shared_memory_vector_wrapper.hpp"
+#include "util/deallocating_vector.hpp"
+#include "util/hilbert_value.hpp"
+#include "util/rectangle.hpp"
+#include "datastore/shared_memory_factory.hpp"
+#include "util/shared_memory_vector_wrapper.hpp"
 
-#include "../util/bearing.hpp"
-#include "../util/integer_range.hpp"
-#include "../util/mercator.hpp"
-#include "../util/osrm_exception.hpp"
-#include "../typedefs.h"
+#include "util/bearing.hpp"
+#include "util/integer_range.hpp"
+#include "util/mercator.hpp"
+#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>

include/util/trigonometry_table.hpp

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TRIGONOMETRY_TABLE_HPP
 #define TRIGONOMETRY_TABLE_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 #include <cmath>
 
 #include <limits>

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

include/util/xml_renderer.hpp

@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef XML_RENDERER_HPP
 #define XML_RENDERER_HPP
 
-#include "cast.hpp"
+#include "util/cast.hpp"
 
-#include <osrm/json_container.hpp>
+#include "osrm/json_container.hpp"
 
 namespace osrm
 {

include/util/xor_fast_hash_storage.hpp

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef XOR_FAST_HASH_STORAGE_HPP
 #define XOR_FAST_HASH_STORAGE_HPP
 
-#include "xor_fast_hash.hpp"
+#include "util/xor_fast_hash.hpp"
 
 #include <limits>
 #include <vector>