diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 98e8d78982..fa7267ef16 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -491,10 +491,6 @@
 				RelativePath=".\..\src\cheat.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\crashlog.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\command.cpp"
 				>
@@ -507,6 +503,10 @@
 				RelativePath=".\..\src\console_cmds.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\crashlog.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\currency.cpp"
 				>
@@ -839,10 +839,6 @@
 				RelativePath=".\..\src\cmd_helper.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\crashlog.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\command_func.h"
 				>
@@ -887,6 +883,10 @@
 				RelativePath=".\..\src\console_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\crashlog.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\currency.h"
 				>
@@ -1499,6 +1499,10 @@
 				RelativePath=".\..\src\town.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\town_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\townname_func.h"
 				>
@@ -1507,10 +1511,6 @@
 				RelativePath=".\..\src\townname_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\town_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\track_func.h"
 				>
@@ -2272,11 +2272,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\townname.h"
+				RelativePath=".\..\src\table\town_land.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\town_land.h"
+				RelativePath=".\..\src\table\townname.h"
 				>
 			</File>
 			<File
@@ -3487,14 +3487,6 @@
 				RelativePath=".\..\src\pathfinder\npf\aystar.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\queue.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\queue.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\pathfinder\npf\npf.cpp"
 				>
@@ -3503,6 +3495,14 @@
 				RelativePath=".\..\src\pathfinder\npf\npf_func.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\npf\queue.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\npf\queue.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="YAPF"
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index ad626ece37..40d535982e 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -488,10 +488,6 @@
 				RelativePath=".\..\src\cheat.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\crashlog.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\command.cpp"
 				>
@@ -504,6 +500,10 @@
 				RelativePath=".\..\src\console_cmds.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\crashlog.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\currency.cpp"
 				>
@@ -836,10 +836,6 @@
 				RelativePath=".\..\src\cmd_helper.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\crashlog.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\command_func.h"
 				>
@@ -884,6 +880,10 @@
 				RelativePath=".\..\src\console_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\crashlog.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\currency.h"
 				>
@@ -1496,6 +1496,10 @@
 				RelativePath=".\..\src\town.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\town_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\townname_func.h"
 				>
@@ -1504,10 +1508,6 @@
 				RelativePath=".\..\src\townname_type.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\town_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\track_func.h"
 				>
@@ -2269,11 +2269,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\townname.h"
+				RelativePath=".\..\src\table\town_land.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\town_land.h"
+				RelativePath=".\..\src\table\townname.h"
 				>
 			</File>
 			<File
@@ -3484,14 +3484,6 @@
 				RelativePath=".\..\src\pathfinder\npf\aystar.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\queue.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\pathfinder\npf\queue.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\pathfinder\npf\npf.cpp"
 				>
@@ -3500,6 +3492,14 @@
 				RelativePath=".\..\src\pathfinder\npf\npf_func.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\npf\queue.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\pathfinder\npf\queue.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="YAPF"
diff --git a/source.list b/source.list
index 0bc11a7e33..a6c083988e 100644
--- a/source.list
+++ b/source.list
@@ -8,10 +8,10 @@ callback_table.cpp
 cargopacket.cpp
 cargotype.cpp
 cheat.cpp
-crashlog.cpp
 command.cpp
 console.cpp
 console_cmds.cpp
+crashlog.cpp
 currency.cpp
 date.cpp
 debug.cpp
@@ -119,7 +119,6 @@ cargotype.h
 cheat_func.h
 cheat_type.h
 cmd_helper.h
-crashlog.h
 command_func.h
 command_type.h
 company_base.h
@@ -131,6 +130,7 @@ console_func.h
 console_gui.h
 console_internal.h
 console_type.h
+crashlog.h
 currency.h
 date_func.h
 date_gui.h
@@ -284,9 +284,9 @@ tilehighlight_type.h
 timetable.h
 toolbar_gui.h
 town.h
+town_type.h
 townname_func.h
 townname_type.h
-town_type.h
 track_func.h
 track_type.h
 train.h
@@ -498,8 +498,8 @@ table/sprites.h
 table/station_land.h
 table/strgen_tables.h
 ../objs/langs/table/strings.h
-table/townname.h
 table/town_land.h
+table/townname.h
 table/track_land.h
 table/train_cmd.h
 table/tree_land.h
@@ -824,10 +824,10 @@ pathfinder/pf_performance_timer.hpp
 # NPF
 pathfinder/npf/aystar.cpp
 pathfinder/npf/aystar.h
-pathfinder/npf/queue.cpp
-pathfinder/npf/queue.h
 pathfinder/npf/npf.cpp
 pathfinder/npf/npf_func.h
+pathfinder/npf/queue.cpp
+pathfinder/npf/queue.h
 
 # YAPF
 pathfinder/yapf/nodelist.hpp