Move to forward declare header

include/extractor/segment_data_container.hpp

@@ -4,6 +4,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
 
 #include <boost/filesystem/path.hpp>
@@ -17,15 +18,6 @@
 
 namespace osrm
 {
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace extractor
 {
 

include/extractor/turn_data_container.hpp

@@ -4,7 +4,9 @@
 #include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
 
+#include "storage/io_fwd.hpp"
 #include "storage/shared_memory_ownership.hpp"
+
 #include "util/guidance/turn_bearing.hpp"
 #include "util/vector_view.hpp"
 
@@ -12,16 +14,6 @@
 
 namespace osrm
 {
-
-namespace storage
-{
-namespace io
-{
-class FileReader;
-class FileWriter;
-}
-}
-
 namespace extractor
 {
 namespace detail