Move to forward declare header

include/util/dynamic_graph.hpp

@@ -5,6 +5,8 @@
 #include "util/integer_range.hpp"
 #include "util/typedefs.hpp"
 
+#include "storage/io_fwd.hpp"
+
 #include <boost/assert.hpp>
 
 #include <cstdint>
@@ -17,15 +19,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace util
 {
 template <typename EdgeDataT> class DynamicGraph;

include/util/packed_vector.hpp

@@ -4,7 +4,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
-#include "storage/io.hpp"
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <cmath>

include/util/static_graph.hpp

@@ -7,6 +7,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <boost/assert.hpp>
@@ -19,16 +20,6 @@
 
 namespace osrm
 {
-
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace util
 {
 template <typename EdgeDataT, storage::Ownership Ownership> class StaticGraph;