untangle includes using iwyu

algorithms/douglas_peucker.cpp

@@ -28,13 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "douglas_peucker.hpp"
 
 #include "../data_structures/segment_information.hpp"
-#include "../util/integer_range.hpp"
 
 #include <boost/assert.hpp>
 #include <osrm/coordinate.hpp>
 
 #include <cmath>
 #include <algorithm>
+#include <iterator>
 
 namespace
 {

algorithms/douglas_peucker.hpp

@@ -28,9 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DOUGLAS_PEUCKER_HPP_
 #define DOUGLAS_PEUCKER_HPP_
 
-#include <stack>
+#include "../data_structures/segment_information.hpp"
-#include <vector>
+
 #include <array>
+#include <stack>
+#include <utility>
+#include <vector>
+
 
 /* This class object computes the bitvector of indicating generalized input
  * points according to the (Ramer-)Douglas-Peucker algorithm.
@@ -39,8 +43,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * bit indicating if the points is present in the generalization.
  * Note: points may also be pre-selected*/
 
-struct SegmentInformation;
-
 static const std::array<int, 19> DOUGLAS_PEUCKER_THRESHOLDS {{
     512440, // z0
     256720, // z1

data_structures/coordinate.cpp

@@ -27,15 +27,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "coordinate_calculation.hpp"
 
-#include "../util/mercator.hpp"
 #ifndef NDEBUG
 #include "../util/simple_logger.hpp"
 #endif
-#include <boost/assert.hpp>
 #include <osrm/coordinate.hpp>
 
-#include <cmath>
-
 #ifndef NDEBUG
 #include <bitset>
 #endif

data_structures/coordinate_calculation.cpp

@@ -32,6 +32,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/assert.hpp>
 
+#include <osrm/coordinate.hpp>
+
 #include <cmath>
 
 #include <limits>

data_structures/coordinate_calculation.hpp

@@ -28,9 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef COORDINATE_CALCULATION
 #define COORDINATE_CALCULATION
 
-#include <osrm/coordinate.hpp>
+struct FixedPointCoordinate;
 
-#include <iosfwd> //for std::ostream
 #include <string>
 #include <utility>
 

data_structures/external_memory_node.cpp

@@ -26,6 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "external_memory_node.hpp"
+#include "query_node.hpp"
 
 #include <limits>
 

data_structures/external_memory_node.hpp

@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "query_node.hpp"
 
-#include <string>
+#include "../typedefs.h"
 
 struct ExternalMemoryNode : QueryNode
 {

data_structures/import_edge.cpp

@@ -27,7 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "import_edge.hpp"
 
-#include <boost/assert.hpp>
+#include "travel_mode.hpp"
+#include "../typedefs.h"
 
 bool NodeBasedEdge::operator<(const NodeBasedEdge &other) const
 {

data_structures/phantom_node.cpp

@@ -27,6 +27,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "phantom_node.hpp"
 
+#include "../typedefs.h"
+#include "travel_mode.hpp"
+
+#include <osrm/coordinate.hpp>
+
+#include <limits>
+
 PhantomNode::PhantomNode(NodeID forward_node_id, NodeID reverse_node_id, unsigned name_id,
             int forward_weight, int reverse_weight, int forward_offset, int reverse_offset,
             unsigned packed_geometry_id, unsigned component_id, FixedPointCoordinate &location,

data_structures/phantom_node.hpp

@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <osrm/coordinate.hpp>
 
 #include <iostream>
+#include <utility>
 #include <vector>
 
 struct PhantomNode

datastore.cpp

@@ -28,10 +28,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "data_structures/original_edge_data.hpp"
 #include "data_structures/range_table.hpp"
 #include "data_structures/query_edge.hpp"
+#include "data_structures/query_node.hpp"
 #include "data_structures/shared_memory_factory.hpp"
 #include "data_structures/shared_memory_vector_wrapper.hpp"
 #include "data_structures/static_graph.hpp"
 #include "data_structures/static_rtree.hpp"
+#include "data_structures/travel_mode.hpp"
 #include "data_structures/turn_instructions.hpp"
 #include "server/data_structures/datafacade_base.hpp"
 #include "server/data_structures/shared_datatype.hpp"
@@ -44,6 +46,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "typedefs.h"
 
 #include <osrm/coordinate.hpp>
+#include <osrm/server_paths.hpp>
 
 using RTreeLeaf = BaseDataFacade<QueryEdge::EdgeData>::RTreeLeaf;
 using RTreeNode = StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>::TreeNode;
@@ -58,6 +61,7 @@ using QueryGraph = StaticGraph<QueryEdge::EdgeData>;
 
 #include <cstdint>
 
+
 #include <fstream>
 #include <string>
 

extract.cpp

@@ -29,6 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "extractor/extractor_options.hpp"
 #include "util/simple_logger.hpp"
 
+#include <boost/filesystem.hpp>
+
 int main(int argc, char *argv[])
 {
     try

extractor/extractor_options.hpp

@@ -28,7 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTOR_OPTIONS_HPP
 #define EXTRACTOR_OPTIONS_HPP
 
-#include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+
+#include <string>
 
 enum class return_code : unsigned
 {

prepare.cpp

@@ -26,8 +26,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "contractor/processing_chain.hpp"
+#include "util/simple_logger.hpp"
 
-#include <boost/program_options.hpp>
+#include <boost/program_options/errors.hpp>
+
+#include <exception>
+#include <ostream>
 
 int main(int argc, char *argv[])
 {

server/request_parser.cpp

@@ -27,10 +27,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "request_parser.hpp"
 
+#include "http/compression_type.hpp"
+#include "http/header.hpp"
 #include "http/request.hpp"
 
+#include "../data_structures/tribool.hpp"
+
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <string>
+
 namespace http
 {
 

util/fingerprint.cpp.in

@@ -31,6 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/uuid/name_generator.hpp>
 
+#include <cstring>
+
 #include <algorithm>
 #include <string>
 

util/simple_logger.cpp

@@ -26,13 +26,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "simple_logger.hpp"
-
-#include "osrm_exception.hpp"
-
-#include <boost/assert.hpp>
-
-#include <cstdio>
-
 #ifdef _MSC_VER
 #include <io.h>
 #define isatty _isatty
@@ -40,10 +33,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #else
 #include <unistd.h>
 #endif
+#include <cstdio>                     
+#include <iostream>                
+#include <mutex>                      
+#include <string>               
 
-#include <ostream>
-#include <iostream>
-#include <mutex>
 
 namespace
 {