diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index ff901243f4..ec5bb6673c 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1320,7 +1320,15 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\signs.h"
+				RelativePath=".\..\src\signs_base.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\signs_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\signs_type.h"
 				>
 			</File>
 			<File
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 1af13cafca..df74b86241 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1317,7 +1317,15 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\signs.h"
+				RelativePath=".\..\src\signs_base.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\signs_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\signs_type.h"
 				>
 			</File>
 			<File
diff --git a/source.list b/source.list
index bde85dec97..fdde4965e1 100644
--- a/source.list
+++ b/source.list
@@ -238,7 +238,9 @@ settings_type.h
 ship.h
 signal_func.h
 signal_type.h
-signs.h
+signs_base.h
+signs_func.h
+signs_type.h
 slope_func.h
 slope_type.h
 sound_func.h
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 3bf1ed7989..e43bfd7ba2 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -16,7 +16,7 @@
 #include "news_func.h"
 #include "town.h"
 #include "console.h"
-#include "signs.h"
+#include "signs_func.h"
 #include "waypoint.h"
 #include "variables.h"
 #include "train.h"
diff --git a/src/network/network_internal.h b/src/network/network_internal.h
index ae4c56c5a2..f44d361332 100644
--- a/src/network/network_internal.h
+++ b/src/network/network_internal.h
@@ -45,7 +45,7 @@ enum {
 	/** How many vehicle/station types we put over the network */
 	NETWORK_VEHICLE_TYPES = 5,
 	NETWORK_STATION_TYPES = 5,
-}
+};
 
 struct NetworkPlayerInfo {
 	char company_name[NETWORK_NAME_LENGTH];         ///< Company name
diff --git a/src/oldloader.cpp b/src/oldloader.cpp
index a5bf88f714..a84cb66fe2 100644
--- a/src/oldloader.cpp
+++ b/src/oldloader.cpp
@@ -13,7 +13,7 @@
 #include "roadveh.h"
 #include "ship.h"
 #include "train.h"
-#include "signs.h"
+#include "signs_base.h"
 #include "debug.h"
 #include "depot.h"
 #include "newgrf_config.h"
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 81cfef80d3..a82636b6f4 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -44,7 +44,8 @@
 #include "console.h"
 #include "screenshot.h"
 #include "network/network.h"
-#include "signs.h"
+#include "signs_base.h"
+#include "signs_func.h"
 #include "depot.h"
 #include "waypoint.h"
 #include "ai/ai.h"
diff --git a/src/signs.cpp b/src/signs.cpp
index 7444bf0246..4b3146b22b 100644
--- a/src/signs.cpp
+++ b/src/signs.cpp
@@ -6,7 +6,8 @@
 #include "openttd.h"
 #include "landscape.h"
 #include "player_func.h"
-#include "signs.h"
+#include "signs_base.h"
+#include "signs_func.h"
 #include "saveload.h"
 #include "command_func.h"
 #include "variables.h"
diff --git a/src/signs.h b/src/signs_base.h
similarity index 77%
rename from src/signs.h
rename to src/signs_base.h
index ebf32f2435..3fd945b5a0 100644
--- a/src/signs.h
+++ b/src/signs_base.h
@@ -1,14 +1,13 @@
 /* $Id$ */
 
-/** @file signs.h */
+/** @file signs_base.h Base class for signs. */
 
-#ifndef SIGNS_H
-#define SIGNS_H
+#ifndef SIGNS_BASE_H
+#define SIGNS_BASE_H
 
+#include "signs_type.h"
 #include "oldpool.h"
 
-typedef uint16 SignID;
-struct Sign;
 DECLARE_OLD_POOL(Sign, Sign, 2, 16000)
 
 struct Sign : PoolItem<Sign, SignID, &_Sign_pool> {
@@ -30,13 +29,6 @@ struct Sign : PoolItem<Sign, SignID, &_Sign_pool> {
 	inline bool IsValid() const { return this->owner != INVALID_PLAYER; }
 };
 
-enum {
-	INVALID_SIGN = 0xFFFF,
-};
-
-extern SignID _new_sign_id;
-
-
 static inline SignID GetMaxSignIndex()
 {
 	/* TODO - This isn't the real content of the function, but
@@ -61,14 +53,4 @@ static inline bool IsValidSignID(uint index)
 #define FOR_ALL_SIGNS_FROM(ss, start) for (ss = GetSign(start); ss != NULL; ss = (ss->index + 1U < GetSignPoolSize()) ? GetSign(ss->index + 1U) : NULL) if (ss->IsValid())
 #define FOR_ALL_SIGNS(ss) FOR_ALL_SIGNS_FROM(ss, 0)
 
-extern bool _sign_sort_dirty;
-
-void UpdateAllSignVirtCoords();
-void PlaceProc_Sign(TileIndex tile);
-
-/* signs_gui.cpp */
-void ShowRenameSignWindow(const Sign *si);
-
-void ShowSignList();
-
-#endif /* SIGNS_H */
+#endif /* SIGNS_BASE_H */
diff --git a/src/signs_func.h b/src/signs_func.h
new file mode 100644
index 0000000000..5a38ba748f
--- /dev/null
+++ b/src/signs_func.h
@@ -0,0 +1,21 @@
+/* $Id$ */
+
+/** @file signs_func.h Functions related to signs. */
+
+#ifndef SIGNS_FUNC_H
+#define SIGNS_FUNC_H
+
+#include "signs_type.h"
+
+extern SignID _new_sign_id;
+extern bool _sign_sort_dirty;
+
+void UpdateAllSignVirtCoords();
+void PlaceProc_Sign(TileIndex tile);
+
+/* signs_gui.cpp */
+void ShowRenameSignWindow(const Sign *si);
+
+void ShowSignList();
+
+#endif /* SIGNS_FUNC_H */
diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp
index ce533954c4..2e01f260ad 100644
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -8,7 +8,8 @@
 #include "textbuf_gui.h"
 #include "window_gui.h"
 #include "player_gui.h"
-#include "signs.h"
+#include "signs_base.h"
+#include "signs_func.h"
 #include "debug.h"
 #include "variables.h"
 #include "command_func.h"
diff --git a/src/signs_type.h b/src/signs_type.h
new file mode 100644
index 0000000000..7f1dc5f4ff
--- /dev/null
+++ b/src/signs_type.h
@@ -0,0 +1,15 @@
+/* $Id$ */
+
+/** @file signs_type.h Types related to signs */
+
+#ifndef SIGNS_TYPE_H
+#define SIGNS_TYPE_H
+
+typedef uint16 SignID;
+struct Sign;
+
+enum {
+	INVALID_SIGN = 0xFFFF,
+};
+
+#endif /* SIGNS_TYPE_H */
diff --git a/src/strings.cpp b/src/strings.cpp
index 62e8224380..2fcb7055c6 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -20,7 +20,7 @@
 #include "group.h"
 #include "debug.h"
 #include "newgrf_townname.h"
-#include "signs.h"
+#include "signs_base.h"
 #include "newgrf_engine.h"
 #include "spritecache.h"
 #include "fontcache.h"
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 935f39afce..a215bd475d 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -13,7 +13,7 @@
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "command_func.h"
-#include "signs.h"
+#include "signs_func.h"
 #include "variables.h"
 #include "functions.h"
 #include "sound_func.h"
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 96e8dff887..659834fd1b 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -12,7 +12,8 @@
 #include "viewport_func.h"
 #include "station_base.h"
 #include "town.h"
-#include "signs.h"
+#include "signs_base.h"
+#include "signs_func.h"
 #include "waypoint.h"
 #include "variables.h"
 #include "train.h"