--- a/src/npf.cpp	Thu Jan 11 06:24:37 2007 +0000
+++ b/src/npf.cpp	Thu Jan 11 10:34:42 2007 +0000
@@ -628,7 +628,7 @@
 	i = 0;
 	/* Enumerate possible track */
 	while (trackdirbits != 0) {
-		Trackdir dst_trackdir = RemoveFirstTrackdir(trackdirbits);
+		Trackdir dst_trackdir = RemoveFirstTrackdir(&trackdirbits);
 		DEBUG(npf, 5, "Expanded into trackdir: %d, remaining trackdirs: 0x%X", dst_trackdir, trackdirbits);
 
 		/* Check for oneway signal against us */

--- a/src/pathfind.cpp	Thu Jan 11 06:24:37 2007 +0000
+++ b/src/pathfind.cpp	Thu Jan 11 10:34:42 2007 +0000
@@ -910,7 +910,7 @@
 			continue; /* We overflowed our depth. No more searching in this direction. */
 		si.tile = tile;
 		while (bits != TRACK_BIT_NONE) {
-			Track track = RemoveFirstTrack(bits);
+			Track track = RemoveFirstTrack(&bits);
 			si.track = _new_trackdir[track][direction];
 			assert(si.track != 0xFF);
 			si.priority = si.cur_length + estimation;

--- a/src/rail.h	Thu Jan 11 06:24:37 2007 +0000
+++ b/src/rail.h	Thu Jan 11 10:34:42 2007 +0000
@@ -250,11 +250,11 @@
 /**
 * Removes first Track from TrackBits and returns it
 */
-static inline Track RemoveFirstTrack(TrackBits &tracks)
+static inline Track RemoveFirstTrack(TrackBits *tracks)
 {
-	if (tracks != TRACK_BIT_NONE && tracks != INVALID_TRACK_BIT) {
-		Track first = (Track)FIND_FIRST_BIT(tracks);
-		tracks = ClrBitT(tracks, first);
+	if (*tracks != TRACK_BIT_NONE && *tracks != INVALID_TRACK_BIT) {
+		Track first = (Track)FIND_FIRST_BIT(*tracks);
+		*tracks = ClrBitT(*tracks, first);
 		return first;
 	}
 	return INVALID_TRACK;
@@ -263,11 +263,11 @@
 /**
 * Removes first Trackdir from TrackdirBits and returns it
 */
-static inline Trackdir RemoveFirstTrackdir(TrackdirBits &trackdirs)
+static inline Trackdir RemoveFirstTrackdir(TrackdirBits *trackdirs)
 {
-	if (trackdirs != TRACKDIR_BIT_NONE && trackdirs != INVALID_TRACKDIR_BIT) {
-		Trackdir first = (Trackdir)FindFirstBit2x64(trackdirs);
-		trackdirs = ClrBitT(trackdirs, first);
+	if (*trackdirs != TRACKDIR_BIT_NONE && *trackdirs != INVALID_TRACKDIR_BIT) {
+		Trackdir first = (Trackdir)FindFirstBit2x64(*trackdirs);
+		*trackdirs = ClrBitT(*trackdirs, first);
 		return first;
 	}
 	return INVALID_TRACKDIR;

--- a/src/rail_cmd.cpp	Thu Jan 11 06:24:37 2007 +0000
+++ b/src/rail_cmd.cpp	Thu Jan 11 10:34:42 2007 +0000
@@ -860,7 +860,7 @@
 		// notify YAPF about the track layout change
 		TrackBits tracks = GetTrackBits(tile);
 		while (tracks != TRACK_BIT_NONE) {
-			YapfNotifyTrackLayoutChange(tile, RemoveFirstTrack(tracks));
+			YapfNotifyTrackLayoutChange(tile, RemoveFirstTrack(&tracks));
 		}
 
 		if (IsTileDepotType(tile, TRANSPORT_RAIL)) {
@@ -988,7 +988,7 @@
 		case RAIL_TILE_NORMAL: {
 			TrackBits tracks = GetTrackBits(tile);
 			while (tracks != TRACK_BIT_NONE) {
-				Track track = RemoveFirstTrack(tracks);
+				Track track = RemoveFirstTrack(&tracks);
 				ret = DoCommand(tile, 0, track, flags, CMD_REMOVE_SINGLE_RAIL);
 				if (CmdFailed(ret)) return CMD_ERROR;
 				cost += ret;

--- a/src/ship_cmd.cpp	Thu Jan 11 06:24:37 2007 +0000
+++ b/src/ship_cmd.cpp	Thu Jan 11 10:34:42 2007 +0000
@@ -468,7 +468,7 @@
 	best_track = INVALID_TRACK;
 
 	do {
-		i = RemoveFirstTrack(bits);
+		i = RemoveFirstTrack(&bits);
 
 		pfs.best_bird_dist = (uint)-1;
 		pfs.best_length = (uint)-1;