diff --git a/src/cargo_type.h b/src/cargo_type.h
--- a/src/cargo_type.h
+++ b/src/cargo_type.h
@@ -22,7 +22,7 @@
 typedef byte CargoID;
 
 /** Available types of cargo */
-enum CargoTypes {
+enum CargoType {
 	/* Temperate */
 	CT_PASSENGERS   =  0,
 	CT_COAL         =  1,
@@ -70,6 +70,10 @@ enum CargoTypes {
 	CT_INVALID      = 0xFF, ///< Invalid cargo type.
 };
 
+typedef uint32 CargoTypes;
+
+static const CargoTypes ALL_CARGOTYPES = (CargoTypes)UINT32_MAX;
+
 /** Class for storing amounts of cargo */
 struct CargoArray {
 private: