Clean up some includes

src/ai/actions.cpp

@@ -41,6 +41,9 @@
 #include "../game_preferences.hpp"
 #include "../log.hpp"
 #include "../mouse_handler_base.hpp"
+#ifdef EXPERIMENTAL
+#include "../pathfind/teleport.hpp"
+#endif
 #include "play_controller.hpp"
 #include "../replay.hpp"
 #include "resources.hpp"

src/ai/formula/ai.cpp

@@ -34,6 +34,9 @@
 #include "../../formula_debugger.hpp"
 #include "../../log.hpp"
 #include "../../menu_events.hpp"
+#ifdef EXPERIMENTAL
+#include "../../pathfind/teleport.hpp"
+#endif
 #include "../../terrain_filter.hpp"
 #include "../../tod_manager.hpp"
 

src/ai/formula/function_table.cpp

@@ -27,6 +27,9 @@
 #include "../../log.hpp"
 #include "../../map_label.hpp"
 #include "../../menu_events.hpp"
+#ifdef EXPERIMENTAL
+#include "../../pathfind/teleport.hpp"
+#endif
 #include "../../replay.hpp"
 #include "../../terrain_filter.hpp"
 #include "../../unit.hpp"

src/game_events.cpp

@@ -36,6 +36,9 @@
 #include "map.hpp"
 #include "map_label.hpp"
 #include "map_exception.hpp"
+#ifdef EXPERIMENTAL
+#include "pathfind/teleport.hpp"
+#endif
 #include "replay.hpp"
 #include "resources.hpp"
 #include "scripting/lua.hpp"

src/mouse_events.cpp

@@ -27,6 +27,9 @@
 #include "map.hpp"
 #include "marked-up_text.hpp"
 #include "menu_events.hpp"
+#ifdef EXPERIMENTAL
+#include "pathfind/teleport.hpp"
+#endif
 #include "play_controller.hpp"
 #include "sound.hpp"
 #include "replay.hpp"

src/pathfind/pathfind.cpp

@@ -21,6 +21,9 @@
 #include "global.hpp"
 
 #include "pathfind/pathfind.hpp"
+#ifdef EXPERIMENTAL
+#include "pathfind/teleport.hpp"
+#endif
 
 #include "foreach.hpp"
 #include "gettext.hpp"

src/pathfind/pathfind.hpp

@@ -26,9 +26,6 @@ class unit_movement_type;
 
 #include "map_location.hpp"
 #include "team.hpp"
-#ifdef EXPERIMENTAL
-#include "pathfind/teleport.hpp"
-#endif
 
 #include <map>
 #include <list>

src/play_controller.cpp

@@ -26,6 +26,9 @@
 #include "halo.hpp"
 #include "loadscreen.hpp"
 #include "log.hpp"
+#ifdef EXPERIMENTAL
+#include "pathfind/teleport.hpp"
+#endif
 #include "resources.hpp"
 #include "savegame.hpp"
 #include "sound.hpp"

src/play_controller.hpp

@@ -53,6 +53,12 @@ namespace soundsource {
 	class manager;
 } // namespace soundsource
 
+#ifdef EXPERIMENTAL
+namespace pathfind {
+	class manager;
+}
+#endif
+
 namespace tooltips {
 	struct manager;
 } // namespace tooltips

src/scripting/lua.cpp

@@ -46,6 +46,9 @@ extern "C" {
 #include "log.hpp"
 #include "map.hpp"
 #include "pathfind/pathfind.hpp"
+#ifdef EXPERIMENTAL
+#include "pathfind/teleport.hpp"
+#endif
 #include "resources.hpp"
 #include "scripting/lua.hpp"
 #include "terrain_translation.hpp"