diff --git a/src/cargotype.h b/src/cargotype.h
--- a/src/cargotype.h
+++ b/src/cargotype.h
@@ -85,7 +85,7 @@ struct CargoSpec {
 	 * Determines index of this cargospec
 	 * @return index (in the CargoSpec::array array)
 	 */
-	FORCEINLINE CargoID Index() const
+	inline CargoID Index() const
 	{
 		return this - CargoSpec::array;
 	}
@@ -95,7 +95,7 @@ struct CargoSpec {
 	 * @return is this cargospec valid?
 	 * @note assert(cs->IsValid()) can be triggered when GRF config is modified
 	 */
-	FORCEINLINE bool IsValid() const
+	inline bool IsValid() const
 	{
 		return this->bitnum != INVALID_CARGO;
 	}
@@ -104,7 +104,7 @@ struct CargoSpec {
 	 * Total number of cargospecs, both valid and invalid
 	 * @return length of CargoSpec::array
 	 */
-	static FORCEINLINE size_t GetArraySize()
+	static inline size_t GetArraySize()
 	{
 		return lengthof(CargoSpec::array);
 	}
@@ -114,7 +114,7 @@ struct CargoSpec {
 	 * @param index ID of cargo
 	 * @pre index is a valid cargo ID
 	 */
-	static FORCEINLINE CargoSpec *Get(size_t index)
+	static inline CargoSpec *Get(size_t index)
 	{
 		assert(index < lengthof(CargoSpec::array));
 		return &CargoSpec::array[index];