--- a/functions.h	Sun Dec 25 15:05:59 2005 +0000
+++ b/functions.h	Sun Dec 25 19:44:23 2005 +0000
@@ -3,11 +3,6 @@
 #ifndef FUNCTIONS_H
 #define FUNCTIONS_H
 
-/* vehicle.c */
-
-/* window.c */
-
-
 /* landscape.c */
 void FindLandscapeHeight(TileInfo *ti, uint x, uint y);
 void FindLandscapeHeightByTile(TileInfo *ti, TileIndex tile);

--- a/map.h	Sun Dec 25 15:05:59 2005 +0000
+++ b/map.h	Sun Dec 25 19:44:23 2005 +0000
@@ -15,7 +15,6 @@
 
 #define TILE_MASK(x) ((x) & _map_tile_mask)
 #define TILE_ASSERT(x) assert(TILE_MASK(x) == (x));
-#define RANDOM_TILE(r) TILE_MASK(r)
 
 typedef struct Tile {
 	byte type_height;

--- a/openttd.h	Sun Dec 25 15:05:59 2005 +0000
+++ b/openttd.h	Sun Dec 25 19:44:23 2005 +0000
@@ -8,17 +8,10 @@
 #define VARDEF extern
 #endif
 
-// use this on non static functions
-#define PUBLIC
-
 typedef struct Rect {
 	int left,top,right,bottom;
 } Rect;
 
-typedef struct SmallPoint {
-	int16 x,y;
-} SmallPoint;
-
 typedef struct Point {
 	int x,y;
 } Point;
@@ -125,9 +118,6 @@
 	uint z;
 } TileInfo;
 
-enum {
-	NG_EDGE = 1,
-};
 
 /* Display Options */
 enum {
@@ -531,7 +521,6 @@
 
 VARDEF byte _savegame_sort_order;
 
-#define INVALID_UINT_TILE (uint)0xFFFFFFFF
 #define INVALID_STRING_ID 0xFFFF
 
 enum {