(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header

8 files changed, 11 insertions, 10 deletions

diff --git a/src/pathfinder/follow_track.hpp b/src/pathfinder/follow_track.hpp
index 62e36e1bc..4c0fa7805 100644
--- a/src/pathfinder/follow_track.hpp
+++ b/src/pathfinder/follow_track.hpp
@@ -12,13 +12,13 @@
 #ifndef  FOLLOW_TRACK_HPP
 #define  FOLLOW_TRACK_HPP
 
-#include "../depot_map.h"
 #include "../pbs.h"
 #include "../roadveh.h"
 #include "../station_base.h"
 #include "../train.h"
 #include "../tunnelbridge.h"
 #include "../tunnelbridge_map.h"
+#include "../depot_map.h"
 #include "pf_performance_timer.hpp"
 
 /** Track follower helper template class (can serve pathfinders and vehicle
diff --git a/src/pathfinder/npf/npf.cpp b/src/pathfinder/npf/npf.cpp
index 4a5979542..1423ae449 100644
--- a/src/pathfinder/npf/npf.cpp
+++ b/src/pathfinder/npf/npf.cpp
@@ -12,15 +12,9 @@
 #include "../../stdafx.h"
 #include "../../debug.h"
 #include "../../landscape.h"
-#include "../../depot_base.h"
 #include "../../network/network.h"
-#include "../../tunnelbridge_map.h"
 #include "../../functions.h"
-#include "../../tunnelbridge.h"
-#include "../../pbs.h"
-#include "../../roadveh.h"
 #include "../../ship.h"
-#include "../../train.h"
 #include "../../roadstop_base.h"
 #include "../pathfinder_func.h"
 #include "../pathfinder_type.h"
diff --git a/src/pathfinder/npf/npf_func.h b/src/pathfinder/npf/npf_func.h
index 6684d9897..f0913dfa8 100644
--- a/src/pathfinder/npf/npf_func.h
+++ b/src/pathfinder/npf/npf_func.h
@@ -14,6 +14,7 @@
 
 #include "../../track_type.h"
 #include "../../direction_type.h"
+#include "../../vehicle_type.h"
 #include "../pathfinder_type.h"
 
 /**
diff --git a/src/pathfinder/opf/opf_ship.cpp b/src/pathfinder/opf/opf_ship.cpp
index 0d967c67a..9fee6b270 100644
--- a/src/pathfinder/opf/opf_ship.cpp
+++ b/src/pathfinder/opf/opf_ship.cpp
@@ -10,12 +10,10 @@
 /** @file pathfind.cpp Implementation of the oldest supported pathfinder. */
 
 #include "../../stdafx.h"
-#include "../../debug.h"
 #include "../../tunnelbridge_map.h"
 #include "../../tunnelbridge.h"
 #include "../../ship.h"
 #include "../../core/random_func.hpp"
-#include "opf_ship.h"
 
 struct RememberData {
 	uint16 cur_length;
diff --git a/src/pathfinder/opf/opf_ship.h b/src/pathfinder/opf/opf_ship.h
index 10055067b..b124ce34e 100644
--- a/src/pathfinder/opf/opf_ship.h
+++ b/src/pathfinder/opf/opf_ship.h
@@ -12,6 +12,11 @@
 #ifndef OPF_SHIP_H
 #define OPF_SHIP_H
 
+#include "../../direction_type.h"
+#include "../../tile_type.h"
+#include "../../track_type.h"
+#include "../../vehicle_type.h"
+
 /**
  * Finds the best path for given ship using OPF.
  * @param v        the ship that needs to find a path
diff --git a/src/pathfinder/pathfinder_func.h b/src/pathfinder/pathfinder_func.h
index 411b49f25..4c0671941 100644
--- a/src/pathfinder/pathfinder_func.h
+++ b/src/pathfinder/pathfinder_func.h
@@ -12,7 +12,6 @@
 #ifndef PATHFINDER_FUNC_H
 #define PATHFINDER_FUNC_H
 
-#include "../station_base.h"
 #include "../waypoint_base.h"
 
 /**
diff --git a/src/pathfinder/pathfinder_type.h b/src/pathfinder/pathfinder_type.h
index 5943537c2..cee1fd3f6 100644
--- a/src/pathfinder/pathfinder_type.h
+++ b/src/pathfinder/pathfinder_type.h
@@ -12,6 +12,8 @@
 #ifndef PATHFINDER_TYPE_H
 #define PATHFINDER_TYPE_H
 
+#include "../tile_type.h"
+
 /** Length (penalty) of one tile with NPF */
 static const int NPF_TILE_LENGTH = 100;
 
diff --git a/src/pathfinder/yapf/yapf.h b/src/pathfinder/yapf/yapf.h
index 54e46ce75..e5615f782 100644
--- a/src/pathfinder/yapf/yapf.h
+++ b/src/pathfinder/yapf/yapf.h
@@ -14,6 +14,8 @@
 
 #include "../../direction_type.h"
 #include "../../station_type.h"
+#include "../../track_type.h"
+#include "../../vehicle_type.h"
 #include "../pathfinder_type.h"
 
 /**