diff --git a/src/town_map.h b/src/town_map.h
--- a/src/town_map.h
+++ b/src/town_map.h
@@ -5,8 +5,9 @@
 #ifndef TOWN_MAP_H
 #define TOWN_MAP_H
 
-#include "town.h"
 #include "tile_map.h"
+#include "town_type.h"
+#include "house.h"
 
 /**
  * Get the index of which town this house/street is attached to.
@@ -34,16 +35,6 @@ static inline void SetTownIndex(TileInde
 }
 
 /**
- * Gets the town associated with the house or road tile
- * @param t the tile to get the town of
- * @return the town
- */
-static inline Town *GetTownByTile(TileIndex t)
-{
-	return Town::Get(GetTownIndex(t));
-}
-
-/**
  * Get the type of this house, which is an index into the house spec array
  * Since m4 is only a byte and we want to support 512 houses, we use the bit 6
  * of m3 as an additional bit to house type.