diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 86215dd0e8..57323afc60 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -467,6 +467,10 @@
 				RelativePath=".\..\src\aystar.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\core\bitmath_func.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\bmp.cpp"
 				>
@@ -495,14 +499,6 @@
 				RelativePath=".\..\src\console_cmds.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\bitmath_func.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\random_func.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\currency.cpp"
 				>
@@ -527,6 +523,10 @@
 				RelativePath=".\..\src\driver.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\widgets\dropdown.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\economy.cpp"
 				>
@@ -667,6 +667,10 @@
 				RelativePath=".\..\src\rail.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\core\random_func.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\rev.cpp"
 				>
@@ -751,10 +755,6 @@
 				RelativePath=".\..\src\widget.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\dropdown.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\win32.cpp"
 				>
@@ -807,6 +807,10 @@
 				RelativePath=".\..\src\aystar.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\core\bitmath_func.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\bmp.h"
 				>
@@ -847,18 +851,6 @@
 				RelativePath=".\..\src\console.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\bitmath_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\math_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\random_func.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\currency.h"
 				>
@@ -899,6 +891,14 @@
 				RelativePath=".\..\src\driver.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\widgets\dropdown_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widgets\dropdown_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\economy_func.h"
 				>
@@ -975,6 +975,10 @@
 				RelativePath=".\..\src\livery.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\core\math_func.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\md5.h"
 				>
@@ -1155,6 +1159,10 @@
 				RelativePath=".\..\src\rail_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\core\random_func.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\road_cmd.h"
 				>
@@ -1387,14 +1395,6 @@
 				RelativePath=".\..\src\video\win32_v.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\dropdown_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\widgets\dropdown_func.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\zoom_type.h"
 				>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 15dd7d40a1..1b13372479 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -464,6 +464,10 @@
 				RelativePath=".\..\src\aystar.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\core\bitmath_func.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\bmp.cpp"
 				>
@@ -492,14 +496,6 @@
 				RelativePath=".\..\src\console_cmds.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\bitmath_func.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\random_func.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\currency.cpp"
 				>
@@ -524,6 +520,10 @@
 				RelativePath=".\..\src\driver.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\widgets\dropdown.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\economy.cpp"
 				>
@@ -664,6 +664,10 @@
 				RelativePath=".\..\src\rail.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\core\random_func.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\rev.cpp"
 				>
@@ -748,10 +752,6 @@
 				RelativePath=".\..\src\widget.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\dropdown.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\win32.cpp"
 				>
@@ -804,6 +804,10 @@
 				RelativePath=".\..\src\aystar.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\core\bitmath_func.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\bmp.h"
 				>
@@ -844,18 +848,6 @@
 				RelativePath=".\..\src\console.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\core\bitmath_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\math_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\random_func.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\currency.h"
 				>
@@ -896,6 +888,14 @@
 				RelativePath=".\..\src\driver.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\widgets\dropdown_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\widgets\dropdown_func.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\economy_func.h"
 				>
@@ -972,6 +972,10 @@
 				RelativePath=".\..\src\livery.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\core\math_func.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\md5.h"
 				>
@@ -1152,6 +1156,10 @@
 				RelativePath=".\..\src\rail_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\core\random_func.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\road_cmd.h"
 				>
@@ -1384,14 +1392,6 @@
 				RelativePath=".\..\src\video\win32_v.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\widgets\dropdown_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\widgets\dropdown_func.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\zoom_type.h"
 				>
diff --git a/source.list b/source.list
index 7cf9e8c70d..fe6a9dc77b 100644
--- a/source.list
+++ b/source.list
@@ -3,6 +3,7 @@ airport.cpp
 articulated_vehicles.cpp
 autoreplace_cmd.cpp
 aystar.cpp
+core/bitmath_func.cpp
 bmp.cpp
 callback_table.cpp
 cargopacket.cpp
@@ -10,14 +11,13 @@ cargotype.cpp
 command.cpp
 console.cpp
 console_cmds.cpp
-core/bitmath_func.cpp
-core/random_func.cpp
 currency.cpp
 date.cpp
 debug.cpp
 dedicated.cpp
 depot.cpp
 driver.cpp
+widgets/dropdown.cpp
 economy.cpp
 elrail.cpp
 engine.cpp
@@ -58,6 +58,7 @@ pathfind.cpp
 players.cpp
 queue.cpp
 rail.cpp
+core/random_func.cpp
 rev.cpp
 road.cpp
 saveload.cpp
@@ -93,7 +94,6 @@ vehicle.cpp
 viewport.cpp
 waypoint.cpp
 widget.cpp
-widgets/dropdown.cpp
 #if WIN32
 	win32.cpp
 #end
@@ -110,6 +110,7 @@ autoreplace_gui.h
 autoreplace_type.h
 autoslope.h
 aystar.h
+core/bitmath_func.hpp
 bmp.h
 bridge.h
 callback_table.h
@@ -120,9 +121,6 @@ cmd_helper.h
 command_func.h
 command_type.h
 console.h
-core/bitmath_func.hpp
-core/math_func.hpp
-core/random_func.hpp
 currency.h
 date_func.h
 date_type.h
@@ -133,6 +131,8 @@ direction_func.h
 direction_type.h
 music/dmusic.h
 driver.h
+widgets/dropdown_type.h
+widgets/dropdown_func.h
 economy_func.h
 economy_type.h
 engine.h
@@ -152,6 +152,7 @@ industry.h
 industry_type.h
 landscape.h
 livery.h
+core/math_func.hpp
 md5.h
 mixer.h
 music.h
@@ -197,6 +198,7 @@ queue.h
 rail.h
 rail_gui.h
 rail_type.h
+core/random_func.hpp
 road_cmd.h
 road_func.h
 road_gui.h
@@ -255,8 +257,6 @@ window_type.h
 music/win32_m.h
 sound/win32_s.h
 video/win32_v.h
-widgets/dropdown_type.h
-widgets/dropdown_func.h
 zoom_type.h
 zoom_func.h