Fix include paths

include/extractor/compressed_edge_container.hpp

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

include/extractor/edge_based_graph_factory.hpp

@@ -30,16 +30,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EDGE_BASED_GRAPH_FACTORY_HPP_
 #define EDGE_BASED_GRAPH_FACTORY_HPP_
 
-#include "speed_profile.hpp"
-#include "../typedefs.h"
-#include "../data_structures/compressed_edge_container.hpp"
-#include "../data_structures/deallocating_vector.hpp"
-#include "../data_structures/edge_based_node.hpp"
-#include "../data_structures/original_edge_data.hpp"
-#include "../data_structures/query_node.hpp"
-#include "../data_structures/turn_instructions.hpp"
-#include "../data_structures/node_based_graph.hpp"
-#include "../data_structures/restriction_map.hpp"
+#include "extractor/speed_profile.hpp"
+#include "util/typedefs.hpp"
+#include "extractor/compressed_edge_container.hpp"
+#include "util/deallocating_vector.hpp"
+#include "extractor/edge_based_node.hpp"
+#include "extractor/original_edge_data.hpp"
+#include "extractor/query_node.hpp"
+#include "extractor/turn_instructions.hpp"
+#include "util/node_based_graph.hpp"
+#include "extractor/restriction_map.hpp"
 
 #include <algorithm>
 #include <iosfwd>

include/extractor/edge_based_node.hpp

@@ -28,12 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EDGE_BASED_NODE_HPP
 #define EDGE_BASED_NODE_HPP
 
-#include "../data_structures/travel_mode.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <limits>
 

include/extractor/external_memory_node.hpp

@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTERNAL_MEMORY_NODE_HPP_
 #define EXTERNAL_MEMORY_NODE_HPP_
 
-#include "query_node.hpp"
+#include "extractor/query_node.hpp"
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 struct ExternalMemoryNode : QueryNode
 {

include/extractor/extraction_containers.hpp

@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTION_CONTAINERS_HPP
 #define EXTRACTION_CONTAINERS_HPP
 
-#include "internal_extractor_edge.hpp"
-#include "first_and_last_segment_of_way.hpp"
-#include "scripting_environment.hpp"
-#include "../data_structures/external_memory_node.hpp"
-#include "../data_structures/restriction.hpp"
+#include "extractor/internal_extractor_edge.hpp"
+#include "extractor/first_and_last_segment_of_way.hpp"
+#include "extractor/scripting_environment.hpp"
+#include "extractor/external_memory_node.hpp"
+#include "extractor/restriction.hpp"
 
 #include <stxxl/vector>
 #include <unordered_map>

include/extractor/extraction_helper_functions.hpp

@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTION_HELPER_FUNCTIONS_HPP
 #define EXTRACTION_HELPER_FUNCTIONS_HPP
 
-#include "../util/cast.hpp"
-#include "../util/iso_8601_duration_parser.hpp"
+#include "util/cast.hpp"
+#include "util/iso_8601_duration_parser.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string_regex.hpp>

include/extractor/extraction_way.hpp

@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTION_WAY_HPP
 #define EXTRACTION_WAY_HPP
 
-#include "../data_structures/travel_mode.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "util/typedefs.hpp"
 
 #include <string>
 #include <vector>

include/extractor/extractor.hpp

@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTOR_HPP
 #define EXTRACTOR_HPP
 
-#include "extractor_options.hpp"
-#include "edge_based_graph_factory.hpp"
-#include "../algorithms/graph_compressor.hpp"
+#include "extractor/extractor_options.hpp"
+#include "extractor/edge_based_graph_factory.hpp"
+#include "extractor/graph_compressor.hpp"
 
 class extractor
 {

include/extractor/extractor_callbacks.hpp

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTOR_CALLBACKS_HPP
 #define EXTRACTOR_CALLBACKS_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 #include <boost/optional/optional_fwd.hpp>
 
 #include <string>

include/extractor/first_and_last_segment_of_way.hpp

@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef FIRST_AND_LAST_SEGMENT_OF_WAY_HPP
 #define FIRST_AND_LAST_SEGMENT_OF_WAY_HPP
 
-#include "../data_structures/external_memory_node.hpp"
-#include "../typedefs.h"
+#include "extractor/external_memory_node.hpp"
+#include "util/typedefs.hpp"
 
 #include <limits>
 #include <string>

include/extractor/graph_compressor.hpp

@@ -27,10 +27,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef GEOMETRY_COMPRESSOR_HPP
 #define GEOMETRY_COMPRESSOR_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
-#include "../extractor/speed_profile.hpp"
-#include "../data_structures/node_based_graph.hpp"
+#include "extractor/speed_profile.hpp"
+#include "util/node_based_graph.hpp"
 
 #include <memory>
 #include <unordered_set>

include/extractor/import_edge.hpp

@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef IMPORT_EDGE_HPP
 #define IMPORT_EDGE_HPP
 
-#include "../data_structures/travel_mode.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "util/typedefs.hpp"
 
 struct NodeBasedEdge
 {

include/extractor/internal_extractor_edge.hpp

@@ -28,13 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INTERNAL_EXTRACTOR_EDGE_HPP
 #define INTERNAL_EXTRACTOR_EDGE_HPP
 
-#include "../typedefs.h"
-#include "../data_structures/travel_mode.hpp"
-#include "../data_structures/import_edge.hpp"
+#include "util/typedefs.hpp"
+#include "extractor/travel_mode.hpp"
+#include "extractor/import_edge.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 #include <utility>
 
 struct InternalExtractorEdge

include/extractor/node_id.hpp

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef NODE_ID_HPP
 #define NODE_ID_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 struct Cmp
 {

include/extractor/original_edge_data.hpp

@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ORIGINAL_EDGE_DATA_HPP
 #define ORIGINAL_EDGE_DATA_HPP
 
-#include "travel_mode.hpp"
-#include "turn_instructions.hpp"
-#include "../typedefs.h"
+#include "extractor/travel_mode.hpp"
+#include "extractor/turn_instructions.hpp"
+#include "util/typedefs.hpp"
 
 #include <limits>
 

include/extractor/query_node.hpp

@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef QUERY_NODE_HPP
 #define QUERY_NODE_HPP
 
-#include "../typedefs.h"
+#include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 
 #include <limits>
 

include/extractor/raster_source.hpp

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RASTER_SOURCE_HPP
 #define RASTER_SOURCE_HPP
 
-#include "../util/osrm_exception.hpp"
+#include "util/osrm_exception.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>

include/extractor/restriction.hpp

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

include/extractor/restriction_map.hpp

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

include/extractor/restriction_parser.hpp

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RESTRICTION_PARSER_HPP
 #define RESTRICTION_PARSER_HPP
 
-#include "../data_structures/restriction.hpp"
+#include "extractor/restriction.hpp"
 
 #include <boost/optional/optional.hpp>
 

include/extractor/tarjan_scc.hpp

@@ -28,18 +28,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TARJAN_SCC_HPP
 #define TARJAN_SCC_HPP
 
-#include "../typedefs.h"
-#include "../data_structures/deallocating_vector.hpp"
-#include "../data_structures/import_edge.hpp"
-#include "../data_structures/query_node.hpp"
-#include "../data_structures/percent.hpp"
+#include "util/typedefs.hpp"
+#include "util/deallocating_vector.hpp"
+#include "extractor/import_edge.hpp"
+#include "extractor/query_node.hpp"
+#include "util/percent.hpp"
 
-#include "../util/integer_range.hpp"
-#include "../util/simple_logger.hpp"
-#include "../util/std_hash.hpp"
-#include "../util/timing_util.hpp"
+#include "util/integer_range.hpp"
+#include "util/simple_logger.hpp"
+#include "util/std_hash.hpp"
+#include "util/timing_util.hpp"
 
-#include <osrm/coordinate.hpp>
+#include "osrm/coordinate.hpp"
 #include <boost/assert.hpp>
 #include <cstdint>