--- a/projects/openttd.vcproj	Mon Jul 16 13:48:12 2007 +0000
+++ b/projects/openttd.vcproj	Mon Jul 16 13:51:17 2007 +0000
@@ -179,10 +179,10 @@
 				RelativePath=".\..\src\callback_table.cpp">
 			</File>
 			<File
-				RelativePath=".\..\src\cargotype.cpp">
+				RelativePath=".\..\src\cargopacket.cpp">
 			</File>
 			<File
-				RelativePath=".\..\src\cargopacket.cpp">
+				RelativePath=".\..\src\cargotype.cpp">
 			</File>
 			<File
 				RelativePath=".\..\src\command.cpp">
@@ -402,10 +402,10 @@
 				RelativePath=".\..\src\bmp.h">
 			</File>
 			<File
-				RelativePath=".\..\src\cargotype.h">
+				RelativePath=".\..\src\cargopacket.h">
 			</File>
 			<File
-				RelativePath=".\..\src\cargopacket.h">
+				RelativePath=".\..\src\cargotype.h">
 			</File>
 			<File
 				RelativePath=".\..\src\command.h">

--- a/projects/openttd_vs80.vcproj	Mon Jul 16 13:48:12 2007 +0000
+++ b/projects/openttd_vs80.vcproj	Mon Jul 16 13:51:17 2007 +0000
@@ -468,11 +468,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\cargotype.cpp"
+				RelativePath=".\..\src\cargopacket.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\cargopacket.cpp"
+				RelativePath=".\..\src\cargotype.cpp"
 				>
 			</File>
 			<File
@@ -764,11 +764,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\cargotype.h"
+				RelativePath=".\..\src\cargopacket.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\cargopacket.h"
+				RelativePath=".\..\src\cargotype.h"
 				>
 			</File>
 			<File

--- a/source.list	Mon Jul 16 13:48:12 2007 +0000
+++ b/source.list	Mon Jul 16 13:51:17 2007 +0000
@@ -5,8 +5,8 @@
 aystar.cpp
 bmp.cpp
 callback_table.cpp
+cargopacket.cpp
 cargotype.cpp
-cargopacket.cpp
 command.cpp
 console.cpp
 console_cmds.cpp
@@ -101,8 +101,8 @@
 articulated_vehicles.h
 aystar.h
 bmp.h
+cargopacket.h
 cargotype.h
-cargopacket.h
 command.h
 console.h
 currency.h