diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 35e17291dd..39fdbba284 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1495,6 +1495,14 @@
 				RelativePath=".\..\src\tile_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\tilehighlight_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tilehighlight_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\timetable.h"
 				>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 42a2292f5b..dca3e8d439 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1492,6 +1492,14 @@
 				RelativePath=".\..\src\tile_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\tilehighlight_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\tilehighlight_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\timetable.h"
 				>
diff --git a/source.list b/source.list
index 79d112e44c..f4f2632767 100644
--- a/source.list
+++ b/source.list
@@ -299,6 +299,8 @@ tgp.h
 thread.h
 tile_cmd.h
 tile_type.h
+tilehighlight_func.h
+tilehighlight_type.h
 timetable.h
 town.h
 town_type.h
diff --git a/src/functions.h b/src/functions.h
index e2fe879976..e0d5ee3902 100644
--- a/src/functions.h
+++ b/src/functions.h
@@ -58,8 +58,6 @@ void AskExitToGameMenu();
 
 void RedrawAutosave();
 
-void UpdateViewportSignPos(ViewportSign *sign, int left, int top, StringID str);
-
 int ttd_main(int argc, char* argv[]);
 void HandleExitGameRequest();
 
diff --git a/src/openttd.h b/src/openttd.h
index de17ccd5d1..1f3468159a 100644
--- a/src/openttd.h
+++ b/src/openttd.h
@@ -54,12 +54,6 @@ enum {
 	DO_WAYPOINTS          = 6,
 };
 
-struct ViewportSign {
-	int32 left;
-	int32 top;
-	byte width_1, width_2;
-};
-
 enum {
 	SORT_ASCENDING  = 0,
 	SORT_DESCENDING = 1,
diff --git a/src/signs_base.h b/src/signs_base.h
index 3fd945b5a0..e27441cb46 100644
--- a/src/signs_base.h
+++ b/src/signs_base.h
@@ -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)
diff --git a/src/viewport_type.h b/src/viewport_type.h
index e14862e658..166ca65933 100644
--- a/src/viewport_type.h
+++ b/src/viewport_type.h
@@ -24,6 +24,12 @@ struct ViewPort {
 	ZoomLevel zoom;
 };
 
+struct ViewportSign {
+	int32 left;
+	int32 top;
+	byte width_1, width_2;
+};
+
 enum {
 	ZOOM_IN   = 0,
 	ZOOM_OUT  = 1,
diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index 99e099c079..8cf8880c1c 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -32,6 +32,7 @@
 #include "settings_type.h"
 #include "newgrf_station.h"
 #include "oldpool_func.h"
+#include "viewport_func.h"
 
 #include "table/strings.h"
 
diff --git a/src/waypoint.h b/src/waypoint.h
index a6ba958ae1..36014f7cad 100644
--- a/src/waypoint.h
+++ b/src/waypoint.h
@@ -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)