diff --git a/src/common/DataStores/DBCFileLoader.cpp b/src/common/DataStores/DBCFileLoader.cpp
index 16ee1ed3bf..329622502f 100644
--- a/src/common/DataStores/DBCFileLoader.cpp
+++ b/src/common/DataStores/DBCFileLoader.cpp
@@ -120,7 +120,7 @@ DBCFileLoader::~DBCFileLoader()
 
 DBCFileLoader::Record DBCFileLoader::getRecord(size_t id)
 {
-    assert(data);
+    ASSERT(data);
     return Record(*this, data + id * recordSize);
 }
 
diff --git a/src/common/DataStores/DBCFileLoader.h b/src/common/DataStores/DBCFileLoader.h
index 774dac31e8..e2c01a0967 100644
--- a/src/common/DataStores/DBCFileLoader.h
+++ b/src/common/DataStores/DBCFileLoader.h
@@ -20,7 +20,6 @@
 
 #include "Define.h"
 #include "Utilities/ByteConverter.h"
-#include <cassert>
 
 class TC_COMMON_API DBCFileLoader
 {
@@ -35,14 +34,14 @@ class TC_COMMON_API DBCFileLoader
             public:
                 float getFloat(size_t field) const
                 {
-                    assert(field < file.fieldCount);
+                    ASSERT(field < file.fieldCount);
                     float val = *reinterpret_cast<float*>(offset + file.GetOffset(field));
                     EndianConvert(val);
                     return val;
                 }
                 uint32 getUInt(size_t field) const
                 {
-                    assert(field < file.fieldCount);
+                    ASSERT(field < file.fieldCount);
                     uint32 val = *reinterpret_cast<uint32*>(offset + file.GetOffset(field));
                     EndianConvert(val);
                     return val;
@@ -56,7 +55,7 @@ class TC_COMMON_API DBCFileLoader
                 }
                 uint8 getUInt8(size_t field) const
                 {
-                    assert(field < file.fieldCount);
+                    ASSERT(field < file.fieldCount);
                     return *reinterpret_cast<uint8*>(offset + file.GetOffset(field));
                 }
                 uint64 getUInt64(size_t field) const
@@ -67,9 +66,9 @@ class TC_COMMON_API DBCFileLoader
 
                 const char *getString(size_t field) const
                 {
-                    assert(field < file.fieldCount);
+                    ASSERT(field < file.fieldCount);
                     size_t stringOffset = getUInt(field);
-                    assert(stringOffset < file.stringSize);
+                    ASSERT(stringOffset < file.stringSize);
                     return reinterpret_cast<char*>(file.stringTable + stringOffset);
                 }
 
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp
index 0e6d57041a..29207d45a4 100644
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@@ -374,7 +374,7 @@ void ThreatManager::AddThreat(Unit* target, float amount, SpellInfo const* spell
     target->GetThreatManager().PutThreatenedByMeRef(_owner->GetGUID(), ref);
 
     Creature* cOwner = _owner->ToCreature();
-    assert(cOwner); // if we got here the owner can have a threat list, and must be a creature!
+    ASSERT(cOwner); // if we got here the owner can have a threat list, and must be a creature!
     if (!_ownerEngaged && (cOwner->HasReactState(REACT_PASSIVE) || !ref->IsOffline()))
     {
         _ownerEngaged = true;