diff --git a/src/pathfinder/yapf/yapf_costcache.hpp b/src/pathfinder/yapf/yapf_costcache.hpp
--- a/src/pathfinder/yapf/yapf_costcache.hpp
+++ b/src/pathfinder/yapf/yapf_costcache.hpp
@@ -30,7 +30,7 @@ public:
 	 * Called by YAPF to attach cached or local segment cost data to the given node.
 	 *  @return true if globally cached data were used or false if local data was used
 	 */
-	FORCEINLINE bool PfNodeCacheFetch(Node& n)
+	inline bool PfNodeCacheFetch(Node& n)
 	{
 		return false;
 	}
@@ -39,7 +39,7 @@ public:
 	 * Called by YAPF to flush the cached segment cost data back into cache storage.
 	 *  Current cache implementation doesn't use that.
 	 */
-	FORCEINLINE void PfNodeCacheFlush(Node& n)
+	inline void PfNodeCacheFlush(Node& n)
 	{
 	}
 };
@@ -65,7 +65,7 @@ protected:
 	LocalCache      m_local_cache;
 
 	/** to access inherited path finder */
-	FORCEINLINE Tpf& Yapf()
+	inline Tpf& Yapf()
 	{
 		return *static_cast<Tpf*>(this);
 	}
@@ -75,7 +75,7 @@ public:
 	 * Called by YAPF to attach cached or local segment cost data to the given node.
 	 *  @return true if globally cached data were used or false if local data was used
 	 */
-	FORCEINLINE bool PfNodeCacheFetch(Node& n)
+	inline bool PfNodeCacheFetch(Node& n)
 	{
 		CacheKey key(n.GetKey());
 		Yapf().ConnectNodeToCachedData(n, *new (m_local_cache.Append()) CachedData(key));
@@ -86,7 +86,7 @@ public:
 	 * Called by YAPF to flush the cached segment cost data back into cache storage.
 	 *  Current cache implementation doesn't use that.
 	 */
-	FORCEINLINE void PfNodeCacheFlush(Node& n)
+	inline void PfNodeCacheFlush(Node& n)
 	{
 	}
 };
@@ -133,16 +133,16 @@ struct CSegmentCostCacheT
 	HashTable    m_map;
 	Heap         m_heap;
 
-	FORCEINLINE CSegmentCostCacheT() {}
+	inline CSegmentCostCacheT() {}
 
 	/** flush (clear) the cache */
-	FORCEINLINE void Flush()
+	inline void Flush()
 	{
 		m_map.Clear();
 		m_heap.Clear();
 	}
 
-	FORCEINLINE Tsegment& Get(Key& key, bool *found)
+	inline Tsegment& Get(Key& key, bool *found)
 	{
 		Tsegment *item = m_map.Find(key);
 		if (item == NULL) {
@@ -177,15 +177,15 @@ public:
 protected:
 	Cache&      m_global_cache;
 
-	FORCEINLINE CYapfSegmentCostCacheGlobalT() : m_global_cache(stGetGlobalCache()) {};
+	inline CYapfSegmentCostCacheGlobalT() : m_global_cache(stGetGlobalCache()) {};
 
 	/** to access inherited path finder */
-	FORCEINLINE Tpf& Yapf()
+	inline Tpf& Yapf()
 	{
 		return *static_cast<Tpf*>(this);
 	}
 
-	FORCEINLINE static Cache& stGetGlobalCache()
+	inline static Cache& stGetGlobalCache()
 	{
 		static int last_rail_change_counter = 0;
 		static Date last_date = 0;
@@ -211,7 +211,7 @@ public:
 	 * Called by YAPF to attach cached or local segment cost data to the given node.
 	 *  @return true if globally cached data were used or false if local data was used
 	 */
-	FORCEINLINE bool PfNodeCacheFetch(Node& n)
+	inline bool PfNodeCacheFetch(Node& n)
 	{
 		if (!Yapf().CanUseGlobalCache(n)) {
 			return Tlocal::PfNodeCacheFetch(n);
@@ -227,7 +227,7 @@ public:
 	 * Called by YAPF to flush the cached segment cost data back into cache storage.
 	 *  Current cache implementation doesn't use that.
 	 */
-	FORCEINLINE void PfNodeCacheFlush(Node& n)
+	inline void PfNodeCacheFlush(Node& n)
 	{
 	}
 };