--- a/projects/openttd_vs80.vcproj	Wed May 07 13:11:33 2008 +0000
+++ b/projects/openttd_vs80.vcproj	Wed May 07 13:18:33 2008 +0000
@@ -1496,6 +1496,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\tilehighlight_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tilehighlight_type.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\timetable.h"
 				>
 			</File>

--- a/projects/openttd_vs90.vcproj	Wed May 07 13:11:33 2008 +0000
+++ b/projects/openttd_vs90.vcproj	Wed May 07 13:18:33 2008 +0000
@@ -1493,6 +1493,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\tilehighlight_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tilehighlight_type.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\timetable.h"
 				>
 			</File>

--- a/source.list	Wed May 07 13:11:33 2008 +0000
+++ b/source.list	Wed May 07 13:18:33 2008 +0000
@@ -299,6 +299,8 @@
 thread.h
 tile_cmd.h
 tile_type.h
+tilehighlight_func.h
+tilehighlight_type.h
 timetable.h
 town.h
 town_type.h

--- a/src/functions.h	Wed May 07 13:11:33 2008 +0000
+++ b/src/functions.h	Wed May 07 13:18:33 2008 +0000
@@ -58,8 +58,6 @@
 
 void RedrawAutosave();
 
-void UpdateViewportSignPos(ViewportSign *sign, int left, int top, StringID str);
-
 int ttd_main(int argc, char* argv[]);
 void HandleExitGameRequest();
 

--- a/src/openttd.h	Wed May 07 13:11:33 2008 +0000
+++ b/src/openttd.h	Wed May 07 13:18:33 2008 +0000
@@ -54,12 +54,6 @@
 	DO_WAYPOINTS          = 6,
 };
 
-struct ViewportSign {
-	int32 left;
-	int32 top;
-	byte width_1, width_2;
-};
-
 enum {
 	SORT_ASCENDING  = 0,
 	SORT_DESCENDING = 1,

--- a/src/signs_base.h	Wed May 07 13:11:33 2008 +0000
+++ b/src/signs_base.h	Wed May 07 13:18:33 2008 +0000
@@ -6,6 +6,7 @@
 #define SIGNS_BASE_H
 
 #include "signs_type.h"
+#include "viewport_type.h"
 #include "oldpool.h"
 
 DECLARE_OLD_POOL(Sign, Sign, 2, 16000)

--- a/src/viewport_type.h	Wed May 07 13:11:33 2008 +0000
+++ b/src/viewport_type.h	Wed May 07 13:18:33 2008 +0000
@@ -24,6 +24,12 @@
 	ZoomLevel zoom;
 };
 
+struct ViewportSign {
+	int32 left;
+	int32 top;
+	byte width_1, width_2;
+};
+
 enum {
 	ZOOM_IN   = 0,
 	ZOOM_OUT  = 1,

--- a/src/waypoint.cpp	Wed May 07 13:11:33 2008 +0000
+++ b/src/waypoint.cpp	Wed May 07 13:18:33 2008 +0000
@@ -32,6 +32,7 @@
 #include "settings_type.h"
 #include "newgrf_station.h"
 #include "oldpool_func.h"
+#include "viewport_func.h"
 
 #include "table/strings.h"
 

--- a/src/waypoint.h	Wed May 07 13:11:33 2008 +0000
+++ b/src/waypoint.h	Wed May 07 13:18:33 2008 +0000
@@ -11,6 +11,7 @@
 #include "command_type.h"
 #include "station_type.h"
 #include "town_type.h"
+#include "viewport_type.h"
 
 DECLARE_OLD_POOL(Waypoint, Waypoint, 3, 8000)