--- a/industry.h	Sun Mar 26 22:56:58 2006 +0000
+++ b/industry.h	Sun Mar 26 22:58:11 2006 +0000
@@ -23,7 +23,7 @@
 	uint16 counter;
 
 	byte type;
-	byte owner;
+	Owner owner;
 	byte color_map;
 	byte last_prod_year;
 	byte was_cargo_delivered;

--- a/town.h	Sun Mar 26 22:56:58 2006 +0000
+++ b/town.h	Sun Mar 26 22:58:11 2006 +0000
@@ -26,9 +26,6 @@
 	// Which players have a statue?
 	byte statues;
 
-	// Sort index in listings
-	byte sort_index_obsolete;
-
 	// Player ratings as well as a mask that determines which players have a rating.
 	byte have_ratings;
 	uint8 unwanted[MAX_PLAYERS]; // how many months companies aren't wanted by towns (bribe)

--- a/town_gui.c	Sun Mar 26 22:56:58 2006 +0000
+++ b/town_gui.c	Sun Mar 26 22:58:11 2006 +0000
@@ -334,7 +334,7 @@
 	TownViewWndProc
 };
 
-void ShowTownViewWindow(uint town)
+void ShowTownViewWindow(TownID town)
 {
 	Window *w;
 

--- a/waypoint.c	Sun Mar 26 22:56:58 2006 +0000
+++ b/waypoint.c	Sun Mar 26 22:58:11 2006 +0000
@@ -237,7 +237,7 @@
 		wp->xy = tile;
 		wp->build_date = _date;
 
-		if (wp->town_index == STR_NULL)
+		if (wp->town_index == 0)
 			MakeDefaultWaypointName(wp);
 
 		UpdateWaypointSign(wp);