diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 888a2af36e..ee2543eb5a 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -896,11 +896,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\widgets\dropdown_type.h"
+				RelativePath=".\..\src\widgets\dropdown_func.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\widgets\dropdown_func.h"
+				RelativePath=".\..\src\widgets\dropdown_type.h"
 				>
 			</File>
 			<File
@@ -1395,18 +1395,6 @@
 				RelativePath=".\..\src\waypoint.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\window_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\window_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\window_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\music\win32_m.h"
 				>
@@ -1420,13 +1408,25 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\zoom_type.h"
+				RelativePath=".\..\src\window_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\window_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\window_type.h"
 				>
 			</File>
 			<File
 				RelativePath=".\..\src\zoom_func.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\zoom_type.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="GUI Source Code"
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index f8303b6f56..42e0323ecb 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -893,11 +893,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\widgets\dropdown_type.h"
+				RelativePath=".\..\src\widgets\dropdown_func.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\widgets\dropdown_func.h"
+				RelativePath=".\..\src\widgets\dropdown_type.h"
 				>
 			</File>
 			<File
@@ -1392,18 +1392,6 @@
 				RelativePath=".\..\src\waypoint.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\window_func.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\window_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\window_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\music\win32_m.h"
 				>
@@ -1417,13 +1405,25 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\zoom_type.h"
+				RelativePath=".\..\src\window_func.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\window_gui.h"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\window_type.h"
 				>
 			</File>
 			<File
 				RelativePath=".\..\src\zoom_func.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\zoom_type.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="GUI Source Code"
diff --git a/source.list b/source.list
index 214970b661..84920ae7b2 100644
--- a/source.list
+++ b/source.list
@@ -132,8 +132,8 @@ direction_func.h
 direction_type.h
 music/dmusic.h
 driver.h
-widgets/dropdown_type.h
 widgets/dropdown_func.h
+widgets/dropdown_type.h
 economy_func.h
 economy_type.h
 core/endian_func.hpp
@@ -257,14 +257,14 @@ vehicle_func.h
 vehicle_gui.h
 vehicle_type.h
 waypoint.h
-window_func.h
-window_gui.h
-window_type.h
 music/win32_m.h
 sound/win32_s.h
 video/win32_v.h
-zoom_type.h
+window_func.h
+window_gui.h
+window_type.h
 zoom_func.h
+zoom_type.h
 
 # GUI Source Code
 aircraft_gui.cpp