diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 0e595590d4..006c69fbf2 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -847,6 +847,14 @@
 				RelativePath=".\..\src\cargotype.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\cheat_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\cheat_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\cmd_helper.h"
 				>
@@ -875,14 +883,6 @@
 				RelativePath=".\..\src\console_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cheat_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\cheat_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\currency.h"
 				>
@@ -956,11 +956,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\effectvehicle_func.h"
+				RelativePath=".\..\src\effectvehicle_base.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\effectvehicle_base.h"
+				RelativePath=".\..\src\effectvehicle_func.h"
 				>
 			</File>
 			<File
@@ -1499,6 +1499,10 @@
 				RelativePath=".\..\src\timetable.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\toolbar_gui.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\town.h"
 				>
@@ -1507,10 +1511,6 @@
 				RelativePath=".\..\src\town_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\toolbar_gui.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\track_func.h"
 				>
@@ -1579,6 +1579,10 @@
 				RelativePath=".\..\src\viewport_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\water.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\waypoint.h"
 				>
@@ -1587,6 +1591,10 @@
 				RelativePath=".\..\src\waypoint_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\win32.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\music\win32_m.h"
 				>
@@ -1599,14 +1607,6 @@
 				RelativePath=".\..\src\video\win32_v.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\water.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\win32.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\window_func.h"
 				>
@@ -1632,11 +1632,11 @@
 			Name="Core Source Code"
 			>
 			<File
-				RelativePath=".\..\src\core\alloc_func.hpp"
+				RelativePath=".\..\src\core\alloc_func.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\alloc_func.cpp"
+				RelativePath=".\..\src\core\alloc_func.hpp"
 				>
 			</File>
 			<File
@@ -1644,11 +1644,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\bitmath_func.hpp"
+				RelativePath=".\..\src\core\bitmath_func.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\bitmath_func.cpp"
+				RelativePath=".\..\src\core\bitmath_func.hpp"
 				>
 			</File>
 			<File
@@ -1680,11 +1680,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\random_func.hpp"
+				RelativePath=".\..\src\core\random_func.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\random_func.cpp"
+				RelativePath=".\..\src\core\random_func.hpp"
 				>
 			</File>
 			<File
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 1585e40da8..c5c87e7d7e 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -844,6 +844,14 @@
 				RelativePath=".\..\src\cargotype.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\cheat_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\cheat_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\cmd_helper.h"
 				>
@@ -872,14 +880,6 @@
 				RelativePath=".\..\src\console_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\cheat_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\cheat_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\currency.h"
 				>
@@ -953,11 +953,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\effectvehicle_func.h"
+				RelativePath=".\..\src\effectvehicle_base.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\effectvehicle_base.h"
+				RelativePath=".\..\src\effectvehicle_func.h"
 				>
 			</File>
 			<File
@@ -1496,6 +1496,10 @@
 				RelativePath=".\..\src\timetable.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\toolbar_gui.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\town.h"
 				>
@@ -1504,10 +1508,6 @@
 				RelativePath=".\..\src\town_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\toolbar_gui.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\track_func.h"
 				>
@@ -1576,6 +1576,10 @@
 				RelativePath=".\..\src\viewport_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\water.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\waypoint.h"
 				>
@@ -1584,6 +1588,10 @@
 				RelativePath=".\..\src\waypoint_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\win32.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\music\win32_m.h"
 				>
@@ -1596,14 +1604,6 @@
 				RelativePath=".\..\src\video\win32_v.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\water.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\win32.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\window_func.h"
 				>
@@ -1629,11 +1629,11 @@
 			Name="Core Source Code"
 			>
 			<File
-				RelativePath=".\..\src\core\alloc_func.hpp"
+				RelativePath=".\..\src\core\alloc_func.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\alloc_func.cpp"
+				RelativePath=".\..\src\core\alloc_func.hpp"
 				>
 			</File>
 			<File
@@ -1641,11 +1641,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\bitmath_func.hpp"
+				RelativePath=".\..\src\core\bitmath_func.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\bitmath_func.cpp"
+				RelativePath=".\..\src\core\bitmath_func.hpp"
 				>
 			</File>
 			<File
@@ -1677,11 +1677,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\random_func.hpp"
+				RelativePath=".\..\src\core\random_func.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\random_func.cpp"
+				RelativePath=".\..\src\core\random_func.hpp"
 				>
 			</File>
 			<File
diff --git a/source.list b/source.list
index 42b22b0614..5f81eb0312 100644
--- a/source.list
+++ b/source.list
@@ -139,6 +139,8 @@ callback_table.h
 cargo_type.h
 cargopacket.h
 cargotype.h
+cheat_func.h
+cheat_type.h
 cmd_helper.h
 command_func.h
 command_type.h
@@ -146,8 +148,6 @@ console_func.h
 console_gui.h
 console_internal.h
 console_type.h
-cheat_func.h
-cheat_type.h
 currency.h
 date_func.h
 date_type.h
@@ -166,8 +166,8 @@ widgets/dropdown_func.h
 widgets/dropdown_type.h
 economy_func.h
 economy_type.h
-effectvehicle_func.h
 effectvehicle_base.h
+effectvehicle_func.h
 elrail_func.h
 engine_base.h
 engine_func.h
@@ -302,9 +302,9 @@ tile_type.h
 tilehighlight_func.h
 tilehighlight_type.h
 timetable.h
+toolbar_gui.h
 town.h
 town_type.h
-toolbar_gui.h
 track_func.h
 track_type.h
 train.h
@@ -322,13 +322,13 @@ vehicle_type.h
 vehiclelist.h
 viewport_func.h
 viewport_type.h
+water.h
 waypoint.h
 waypoint_type.h
+win32.h
 music/win32_m.h
 sound/win32_s.h
 video/win32_v.h
-water.h
-win32.h
 window_func.h
 window_gui.h
 window_type.h
@@ -350,11 +350,11 @@ video/cocoa/cocoa_v.h
 #end
 
 # Core Source Code
-core/alloc_func.hpp
 core/alloc_func.cpp
+core/alloc_func.hpp
 core/alloc_type.hpp
-core/bitmath_func.hpp
 core/bitmath_func.cpp
+core/bitmath_func.hpp
 core/endian_func.hpp
 core/endian_type.hpp
 core/enum_type.hpp
@@ -362,8 +362,8 @@ core/geometry_type.hpp
 core/math_func.hpp
 core/mem_func.hpp
 core/overflowsafe_type.hpp
-core/random_func.hpp
 core/random_func.cpp
+core/random_func.hpp
 core/smallvec_type.hpp
 core/sort_func.hpp