diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index d4e38e713e..1b0024c2f9 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -528,7 +528,6 @@
     <ClInclude Include="..\src\roadveh.h" />
     <ClInclude Include="..\src\screenshot.h" />
     <ClInclude Include="..\src\sdl.h" />
-    <ClInclude Include="..\src\smallmap_gui.h" />
     <ClInclude Include="..\src\sound\sdl_s.h" />
     <ClInclude Include="..\src\video\sdl_v.h" />
     <ClInclude Include="..\src\settings_func.h" />
@@ -542,6 +541,7 @@
     <ClInclude Include="..\src\signs_type.h" />
     <ClInclude Include="..\src\slope_func.h" />
     <ClInclude Include="..\src\slope_type.h" />
+    <ClInclude Include="..\src\smallmap_gui.h" />
     <ClInclude Include="..\src\sortlist_type.h" />
     <ClInclude Include="..\src\sound_func.h" />
     <ClInclude Include="..\src\sound_type.h" />
@@ -565,9 +565,9 @@
     <ClInclude Include="..\src\textbuf_gui.h" />
     <ClInclude Include="..\src\texteff.hpp" />
     <ClInclude Include="..\src\tgp.h" />
-    <ClInclude Include="..\src\tilearea_type.h" />
     <ClInclude Include="..\src\tile_cmd.h" />
     <ClInclude Include="..\src\tile_type.h" />
+    <ClInclude Include="..\src\tilearea_type.h" />
     <ClInclude Include="..\src\tilehighlight_func.h" />
     <ClInclude Include="..\src\tilehighlight_type.h" />
     <ClInclude Include="..\src\timetable.h" />
@@ -746,9 +746,9 @@
     <ClCompile Include="..\src\saveload\vehicle_sl.cpp" />
     <ClCompile Include="..\src\saveload\waypoint_sl.cpp" />
     <ClInclude Include="..\src\table\airport_defaults.h" />
+    <ClInclude Include="..\src\table\airport_movement.h" />
     <ClInclude Include="..\src\table\airporttile_ids.h" />
     <ClInclude Include="..\src\table\airporttiles.h" />
-    <ClInclude Include="..\src\table\airport_movement.h" />
     <ClInclude Include="..\src\table\animcursors.h" />
     <ClInclude Include="..\src\table\autorail.h" />
     <ClInclude Include="..\src\table\bridge_land.h" />
@@ -1041,13 +1041,13 @@
     <ClInclude Include="..\src\network\core\packet.h" />
     <ClCompile Include="..\src\network\core\tcp.cpp" />
     <ClInclude Include="..\src\network\core\tcp.h" />
+    <ClCompile Include="..\src\network\core\tcp_admin.cpp" />
+    <ClInclude Include="..\src\network\core\tcp_admin.h" />
     <ClCompile Include="..\src\network\core\tcp_connect.cpp" />
     <ClCompile Include="..\src\network\core\tcp_content.cpp" />
     <ClInclude Include="..\src\network\core\tcp_content.h" />
     <ClCompile Include="..\src\network\core\tcp_game.cpp" />
     <ClInclude Include="..\src\network\core\tcp_game.h" />
-    <ClCompile Include="..\src\network\core\tcp_admin.cpp" />
-    <ClInclude Include="..\src\network\core\tcp_admin.h" />
     <ClCompile Include="..\src\network\core\tcp_http.cpp" />
     <ClInclude Include="..\src\network\core\tcp_http.h" />
     <ClInclude Include="..\src\network\core\tcp_listen.h" />
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index 1f4ba1c4f2..1c83535803 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -804,9 +804,6 @@
     <ClInclude Include="..\src\sdl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\smallmap_gui.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\sound\sdl_s.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -846,6 +843,9 @@
     <ClInclude Include="..\src\slope_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\smallmap_gui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\sortlist_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -915,15 +915,15 @@
     <ClInclude Include="..\src\tgp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\tilearea_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\tile_cmd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\tile_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\tilearea_type.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\tilehighlight_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1458,15 +1458,15 @@
     <ClInclude Include="..\src\table\airport_defaults.h">
       <Filter>Tables</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\table\airport_movement.h">
+      <Filter>Tables</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\table\airporttile_ids.h">
       <Filter>Tables</Filter>
     </ClInclude>
     <ClInclude Include="..\src\table\airporttiles.h">
       <Filter>Tables</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\table\airport_movement.h">
-      <Filter>Tables</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\table\animcursors.h">
       <Filter>Tables</Filter>
     </ClInclude>
@@ -2343,6 +2343,12 @@
     <ClInclude Include="..\src\network\core\tcp.h">
       <Filter>Network Core</Filter>
     </ClInclude>
+    <ClCompile Include="..\src\network\core\tcp_admin.cpp">
+      <Filter>Network Core</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\network\core\tcp_admin.h">
+      <Filter>Network Core</Filter>
+    </ClInclude>
     <ClCompile Include="..\src\network\core\tcp_connect.cpp">
       <Filter>Network Core</Filter>
     </ClCompile>
@@ -2358,12 +2364,6 @@
     <ClInclude Include="..\src\network\core\tcp_game.h">
       <Filter>Network Core</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\network\core\tcp_admin.cpp">
-      <Filter>Network Core</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\network\core\tcp_admin.h">
-      <Filter>Network Core</Filter>
-    </ClInclude>
     <ClCompile Include="..\src\network\core\tcp_http.cpp">
       <Filter>Network Core</Filter>
     </ClCompile>
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 6404232507..9f197eeafc 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1386,10 +1386,6 @@
 				RelativePath=".\..\src\sdl.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\smallmap_gui.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\sound\sdl_s.h"
 				>
@@ -1442,6 +1438,10 @@
 				RelativePath=".\..\src\slope_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\smallmap_gui.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\sortlist_type.h"
 				>
@@ -1534,10 +1534,6 @@
 				RelativePath=".\..\src\tgp.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\tilearea_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tile_cmd.h"
 				>
@@ -1546,6 +1542,10 @@
 				RelativePath=".\..\src\tile_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\tilearea_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\tilehighlight_func.h"
 				>
@@ -2282,6 +2282,10 @@
 				RelativePath=".\..\src\table\airport_defaults.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\airport_movement.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\airporttile_ids.h"
 				>
@@ -2290,10 +2294,6 @@
 				RelativePath=".\..\src\table\airporttiles.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\airport_movement.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\animcursors.h"
 				>
@@ -3518,6 +3518,14 @@
 				RelativePath=".\..\src\network\core\tcp.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp_admin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp_admin.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\network\core\tcp_connect.cpp"
 				>
@@ -3538,14 +3546,6 @@
 				RelativePath=".\..\src\network\core\tcp_game.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\network\core\tcp_admin.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\tcp_admin.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\network\core\tcp_http.cpp"
 				>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 1f8b60b0a9..f1a6da8717 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1383,10 +1383,6 @@
 				RelativePath=".\..\src\sdl.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\smallmap_gui.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\sound\sdl_s.h"
 				>
@@ -1439,6 +1435,10 @@
 				RelativePath=".\..\src\slope_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\smallmap_gui.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\sortlist_type.h"
 				>
@@ -1531,10 +1531,6 @@
 				RelativePath=".\..\src\tgp.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\tilearea_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tile_cmd.h"
 				>
@@ -1543,6 +1539,10 @@
 				RelativePath=".\..\src\tile_type.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\tilearea_type.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\tilehighlight_func.h"
 				>
@@ -2279,6 +2279,10 @@
 				RelativePath=".\..\src\table\airport_defaults.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\table\airport_movement.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\table\airporttile_ids.h"
 				>
@@ -2287,10 +2291,6 @@
 				RelativePath=".\..\src\table\airporttiles.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\table\airport_movement.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\table\animcursors.h"
 				>
@@ -3515,6 +3515,14 @@
 				RelativePath=".\..\src\network\core\tcp.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp_admin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp_admin.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\network\core\tcp_connect.cpp"
 				>
@@ -3535,14 +3543,6 @@
 				RelativePath=".\..\src\network\core\tcp_game.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\network\core\tcp_admin.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\tcp_admin.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\network\core\tcp_http.cpp"
 				>
diff --git a/source.list b/source.list
index 45a5cf9a99..0cb5e69394 100644
--- a/source.list
+++ b/source.list
@@ -261,7 +261,6 @@ roadstop_base.h
 roadveh.h
 screenshot.h
 sdl.h
-smallmap_gui.h
 sound/sdl_s.h
 video/sdl_v.h
 settings_func.h
@@ -275,6 +274,7 @@ signs_func.h
 signs_type.h
 slope_func.h
 slope_type.h
+smallmap_gui.h
 sortlist_type.h
 sound_func.h
 sound_type.h
@@ -298,9 +298,9 @@ terraform_gui.h
 textbuf_gui.h
 texteff.hpp
 tgp.h
-tilearea_type.h
 tile_cmd.h
 tile_type.h
+tilearea_type.h
 tilehighlight_func.h
 tilehighlight_type.h
 timetable.h
@@ -506,9 +506,9 @@ saveload/waypoint_sl.cpp
 
 # Tables
 table/airport_defaults.h
+table/airport_movement.h
 table/airporttile_ids.h
 table/airporttiles.h
-table/airport_movement.h
 table/animcursors.h
 table/autorail.h
 table/bridge_land.h
@@ -836,13 +836,13 @@ network/core/packet.cpp
 network/core/packet.h
 network/core/tcp.cpp
 network/core/tcp.h
+network/core/tcp_admin.cpp
+network/core/tcp_admin.h
 network/core/tcp_connect.cpp
 network/core/tcp_content.cpp
 network/core/tcp_content.h
 network/core/tcp_game.cpp
 network/core/tcp_game.h
-network/core/tcp_admin.cpp
-network/core/tcp_admin.h
 network/core/tcp_http.cpp
 network/core/tcp_http.h
 network/core/tcp_listen.h