diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
index 10df2b9d77f..19d7e5dc8ea 100644
--- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
@@ -908,8 +908,13 @@ Real BaseHeightMapRenderObjClass::getHeightMapHeight(Real x, Real y, Coord3D* no
 	float xdiv = x * MAP_XY_FACTOR_INV;
 	float ydiv = y * MAP_XY_FACTOR_INV;
 
-	float ixf = FAST_REAL_FLOOR(xdiv);
-	float iyf = FAST_REAL_FLOOR(ydiv);
+#if RTS_ZEROHOUR && RETAIL_COMPATIBLE_CRC
+	float ixf = fast_float_floor(xdiv);
+	float iyf = fast_float_floor(ydiv);
+#else
+	float ixf = WWMath::Floorf(xdiv);
+	float iyf = WWMath::Floorf(ydiv);
+#endif
 
 	float fx = xdiv - ixf; //get fraction
 	float fy = ydiv - iyf; //get fraction
diff --git a/Core/Libraries/Source/Lib/Include/Lib/BaseFunctions.h b/Core/Libraries/Source/Lib/Include/Lib/BaseFunctions.h
index 9a359d02cdd..c481fb73c0d 100644
--- a/Core/Libraries/Source/Lib/Include/Lib/BaseFunctions.h
+++ b/Core/Libraries/Source/Lib/Include/Lib/BaseFunctions.h
@@ -101,10 +101,6 @@ __forceinline float fast_float_ceil(float f)
 #define REAL_TO_INT_FLOOR(x)			(fast_float2long_round(fast_float_floor(x)))
 #endif
 
-#define FAST_REAL_TRUNC(x)        fast_float_trunc(x)
-#define FAST_REAL_CEIL(x)         fast_float_ceil(x)
-#define FAST_REAL_FLOOR(x)        fast_float_floor(x)
-
 //-------------------------------------------------------------------------------------------------
 // Checking whether a size matches the bit flags count from an enum definition:
 // enum MyEnum