--- a/projects/openttd_vs80.vcproj	Fri Mar 28 16:39:19 2008 +0000
+++ b/projects/openttd_vs80.vcproj	Fri Mar 28 16:41:12 2008 +0000
@@ -1348,6 +1348,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\station_type.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\stdafx.h"
 				>
 			</File>
@@ -1476,6 +1480,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\waypoint_type.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\music\win32_m.h"
 				>
 			</File>

--- a/projects/openttd_vs90.vcproj	Fri Mar 28 16:39:19 2008 +0000
+++ b/projects/openttd_vs90.vcproj	Fri Mar 28 16:41:12 2008 +0000
@@ -1345,6 +1345,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\station_type.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\stdafx.h"
 				>
 			</File>
@@ -1473,6 +1477,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\waypoint_type.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\music\win32_m.h"
 				>
 			</File>

--- a/source.list	Fri Mar 28 16:39:19 2008 +0000
+++ b/source.list	Fri Mar 28 16:41:12 2008 +0000
@@ -278,6 +278,7 @@
 viewport_func.h
 viewport_type.h
 waypoint.h
+waypoint_type.h
 music/win32_m.h
 sound/win32_s.h
 video/win32_v.h

--- a/src/openttd.h	Fri Mar 28 16:39:19 2008 +0000
+++ b/src/openttd.h	Fri Mar 28 16:41:12 2008 +0000
@@ -9,13 +9,11 @@
 #endif
 
 // Forward declarations of structs.
-struct Waypoint;
 typedef byte LandscapeID;
 typedef uint16 EngineID;
 typedef uint16 UnitID;
 
 /* IDs used in Pools */
-typedef uint16 WaypointID;
 typedef uint16 EngineRenewID;
 
 enum GameModes {

--- a/src/rail_map.h	Fri Mar 28 16:39:19 2008 +0000
+++ b/src/rail_map.h	Fri Mar 28 16:41:12 2008 +0000
@@ -11,6 +11,7 @@
 #include "track_func.h"
 #include "tile_map.h"
 #include "signal_type.h"
+#include "waypoint_type.h"
 
 
 /** Different types of Rail-related tiles */

--- a/src/waypoint.h	Fri Mar 28 16:39:19 2008 +0000
+++ b/src/waypoint.h	Fri Mar 28 16:41:12 2008 +0000
@@ -5,12 +5,12 @@
 #ifndef WAYPOINT_H
 #define WAYPOINT_H
 
+#include "waypoint_type.h"
 #include "oldpool.h"
 #include "rail_map.h"
 #include "command_type.h"
 #include "station_type.h"
 
-struct Waypoint;
 DECLARE_OLD_POOL(Waypoint, Waypoint, 3, 8000)
 
 struct Waypoint : PoolItem<Waypoint, WaypointID, &_Waypoint_pool> {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/waypoint_type.h	Fri Mar 28 16:41:12 2008 +0000
@@ -0,0 +1,11 @@
+/* $Id$ */
+
+/** @file waypoint_type.h Types related to waypoints. */
+
+#ifndef WAYPOINT_TYPE_H
+#define WAYPOINT_TYPE_H
+
+typedef uint16 WaypointID;
+struct Waypoint;
+
+#endif /* WAYPOINT_TYPE_H */