untangle includes using iwyu

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