diff --git a/src/map.h b/src/map.h
--- a/src/map.h
+++ b/src/map.h
@@ -7,6 +7,7 @@
 
 #include "stdafx.h"
 #include "direction_func.h"
+#include "tile_type.h"
 
 extern uint _map_tile_mask;
 
@@ -136,11 +137,6 @@ uint ScaleByMapSize(uint);
 uint ScaleByMapSize1D(uint);
 
 /**
- * The index/ID of a Tile.
- */
-typedef uint32 TileIndex;
-
-/**
  * An offset value between to tiles.
  *
  * This value is used fro the difference between