diff --git a/modules/acore/deps/mysqllite/include/my_global.h b/modules/acore/deps/mysqllite/include/my_global.h
index c1ae8a6d6..3bd3f219c 100644
--- a/modules/acore/deps/mysqllite/include/my_global.h
+++ b/modules/acore/deps/mysqllite/include/my_global.h
@@ -787,11 +787,7 @@ inline unsigned long long my_double2ulonglong(double d)
 #endif
 
 #ifndef isfinite
-#ifdef HAVE_FINITE
-#define isfinite(x) finite(x)
-#else
-#define finite(x) (1.0 / fabs(x) > 0.0)
-#endif /* HAVE_FINITE */
+#define isfinite(x) (1.0 / fabs(x) > 0.0)
 #endif /* isfinite */
 
 #ifndef HAVE_ISNAN
diff --git a/modules/acore/framework/Common.h b/modules/acore/framework/Common.h
index 3415a0336..41cb831eb 100644
--- a/modules/acore/framework/Common.h
+++ b/modules/acore/framework/Common.h
@@ -122,7 +122,9 @@
 #define snprintf _snprintf
 #define atoll _atoi64
 #define vsnprintf _vsnprintf
-#define finite(X) _finite(X)
+#ifndef isfinite
+#define isfinite(X) _finite(X)
+#endif
 #define llabs _abs64
 
 #else
@@ -134,12 +136,12 @@
 
 #endif
 
-inline float finiteAlways(float f) { return finite(f) ? f : 0.0f; }
+inline float finiteAlways(float f) { return isfinite(f) ? f : 0.0f; }
 
 #if COMPILER == COMPILER_MICROSOFT
 inline bool myisfinite(float f) { return _finite(f) && !_isnan(f); }
 #else
-inline bool myisfinite(float f) { return finite(f) && !std::isnan(f); }
+inline bool myisfinite(float f) { return isfinite(f) && !std::isnan(f); }
 #endif
 
 #define atol(a) strtoul( a, NULL, 10)
diff --git a/src/game/Grids/GridDefines.h b/src/game/Grids/GridDefines.h
index 60c75bc4a..33b9d184f 100644
--- a/src/game/Grids/GridDefines.h
+++ b/src/game/Grids/GridDefines.h
@@ -215,7 +215,7 @@ namespace Trinity
 
     inline bool IsValidMapCoord(float c)
     {
-        return finite(c) && (std::fabs(c) <= MAP_HALFSIZE - 0.5f);
+        return isfinite(c) && (std::fabs(c) <= MAP_HALFSIZE - 0.5f);
     }
 
     inline bool IsValidMapCoord(float x, float y)
@@ -225,12 +225,12 @@ namespace Trinity
 
     inline bool IsValidMapCoord(float x, float y, float z)
     {
-        return IsValidMapCoord(x, y) && finite(z);
+        return IsValidMapCoord(x, y) && isfinite(z);
     }
 
     inline bool IsValidMapCoord(float x, float y, float z, float o)
     {
-        return IsValidMapCoord(x, y, z) && finite(o);
+        return IsValidMapCoord(x, y, z) && isfinite(o);
     }
 }
 #endif