--- a/vehicle_gui.c	Wed Nov 24 22:52:57 2004 +0000
+++ b/vehicle_gui.c	Thu Nov 25 06:05:47 2004 +0000
@@ -3,6 +3,31 @@
 
 #include "vehicle.h"
 
+VehicleSortListingTypeFunctions * const _vehicle_sorter[] = {
+	&VehicleUnsortedSorter,
+	&VehicleNumberSorter,
+	&VehicleNameSorter,
+	&VehicleAgeSorter,
+	&VehicleProfitThisYearSorter,
+	&VehicleProfitLastYearSorter,
+	&VehicleCargoSorter,
+	&VehicleReliabilitySorter,
+	&VehicleMaxSpeedSorter
+};
+
+const StringID _vehicle_sort_listing[] = {
+	STR_SORT_BY_UNSORTED,
+	STR_SORT_BY_NUMBER,
+	STR_SORT_BY_DROPDOWN_NAME,
+	STR_SORT_BY_AGE,
+	STR_SORT_BY_PROFIT_THIS_YEAR,
+	STR_SORT_BY_PROFIT_LAST_YEAR,
+	STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE,
+	STR_SORT_BY_RELIABILITY,
+	STR_SORT_BY_MAX_SPEED,
+	INVALID_STRING_ID
+};
+
 /* General Vehicle GUI based procedures that are independent of vehicle types */
 void InitializeVehiclesGuiList()
 {

--- a/vehicle_gui.h	Wed Nov 24 22:52:57 2004 +0000
+++ b/vehicle_gui.h	Thu Nov 25 06:05:47 2004 +0000
@@ -31,32 +31,9 @@
 
 typedef DEF_SORTER(VehicleSortListingTypeFunctions);
 
-static VehicleSortListingTypeFunctions * const _vehicle_sorter[] = {
-	&VehicleUnsortedSorter,
-	&VehicleNumberSorter,
-	&VehicleNameSorter,
-	&VehicleAgeSorter,
-	&VehicleProfitThisYearSorter,
-	&VehicleProfitLastYearSorter,
-	&VehicleCargoSorter,
-	&VehicleReliabilitySorter,
-	&VehicleMaxSpeedSorter
-};
-
 #define SORT_BY_UNSORTED 0
-
-static const uint16 _vehicle_sort_listing[] = {
-	STR_SORT_BY_UNSORTED,
-	STR_SORT_BY_NUMBER,
-	STR_SORT_BY_DROPDOWN_NAME,
-	STR_SORT_BY_AGE,
-	STR_SORT_BY_PROFIT_THIS_YEAR,
-	STR_SORT_BY_PROFIT_LAST_YEAR,
-	STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE,
-	STR_SORT_BY_RELIABILITY,
-	STR_SORT_BY_MAX_SPEED,
-	INVALID_STRING_ID
-};
+extern VehicleSortListingTypeFunctions * const _vehicle_sorter[];
+extern const StringID _vehicle_sort_listing[];
 
 enum VehicleSortTypes {
 	VEHTRAIN		= 0,