diff --git a/src/bridge.h b/src/bridge.h
index bf622804d9..6690988a50 100644
--- a/src/bridge.h
+++ b/src/bridge.h
@@ -35,4 +35,6 @@ static inline const Bridge *GetBridge(uint i)
 	return &_bridge[i];
 }
 
+void DrawBridgeMiddle(const TileInfo* ti);
+
 #endif /* BRIDGE_H */
diff --git a/src/bridge_map.h b/src/bridge_map.h
index b4ab3a68a6..52943a2b51 100644
--- a/src/bridge_map.h
+++ b/src/bridge_map.h
@@ -13,9 +13,6 @@
 #include "tile.h"
 
 
-void DrawBridgeMiddle(const TileInfo* ti); // XXX
-
-
 static inline bool IsBridge(TileIndex t)
 {
 	assert(IsTileType(t, MP_TUNNELBRIDGE));
diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp
index 44e735add9..d80876554f 100644
--- a/src/clear_cmd.cpp
+++ b/src/clear_cmd.cpp
@@ -15,6 +15,7 @@
 #include "command.h"
 #include "tunnel_map.h"
 #include "bridge_map.h"
+#include "bridge.h"
 #include "variables.h"
 #include "table/sprites.h"
 #include "unmovable_map.h"
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index cb4d08c80d..549ef40626 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -3,6 +3,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "bridge_map.h"
+#include "bridge.h"
 #include "cmd_helper.h"
 #include "debug.h"
 #include "functions.h"
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index caf24eb296..6266428d59 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -3,6 +3,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "bridge_map.h"
+#include "bridge.h"
 #include "cmd_helper.h"
 #include "rail_map.h"
 #include "road_map.h"
diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp
index b67a1a0a2f..49d8725760 100644
--- a/src/unmovable_cmd.cpp
+++ b/src/unmovable_cmd.cpp
@@ -2,7 +2,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "bridge_map.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "functions.h"
@@ -20,6 +19,7 @@
 #include "variables.h"
 #include "table/unmovable_land.h"
 #include "genworld.h"
+#include "bridge.h"
 
 /** Destroy a HQ.
  * During normal gameplay you can only implicitely destroy a HQ when you are
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 61db28030a..fb6ea8090c 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -3,6 +3,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "bridge_map.h"
+#include "bridge.h"
 #include "cmd_helper.h"
 #include "station_map.h"
 #include "table/sprites.h"