diff --git a/ElunaIncludes.h b/ElunaIncludes.h
index be327e2..25f14c3 100644
--- a/ElunaIncludes.h
+++ b/ElunaIncludes.h
@@ -53,7 +53,7 @@
 
 #ifdef MANGOS
 #include "revision.h"
-#elif CMANGOS
+#elif defined(CMANGOS)
 #include "revision_nr.h"
 #endif
 
diff --git a/UnitMethods.h b/UnitMethods.h
index 0656ea4..07fcbf5 100644
--- a/UnitMethods.h
+++ b/UnitMethods.h
@@ -1741,9 +1741,9 @@ namespace LuaUnit
             unit->DealDamage(target, damage, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, durabilityloss);
 #ifdef TRINITY
             unit->SendAttackStateUpdate(HITINFO_AFFECTS_VICTIM, target, 1, SPELL_SCHOOL_MASK_NORMAL, damage, 0, 0, VICTIMSTATE_HIT, 0);
-#elif MANGOS
+#elif defined(MANGOS)
             unit->SendAttackStateUpdate(HITINFO_NORMALSWING2, target, 1, SPELL_SCHOOL_MASK_NORMAL, damage, 0, 0, VICTIMSTATE_NORMAL, 0);
-#elif CMANGOS
+#elif defined(CMANGOS)
             unit->SendAttackStateUpdate(HITINFO_NORMALSWING2, target, SPELL_SCHOOL_MASK_NORMAL, damage, 0, 0, VICTIMSTATE_NORMAL, 0);
 #endif
             return 0;
@@ -1779,9 +1779,9 @@ namespace LuaUnit
             unit->DealDamage(target, damage, NULL, DIRECT_DAMAGE, schoolmask, NULL, false);
 #ifdef TRINITY
             unit->SendAttackStateUpdate(HITINFO_AFFECTS_VICTIM, target, 1, schoolmask, damage, absorb, resist, VICTIMSTATE_HIT, 0);
-#elif MANGOS
+#elif defined(MANGOS)
             unit->SendAttackStateUpdate(HITINFO_NORMALSWING2, target, 1, schoolmask, damage, absorb, resist, VICTIMSTATE_NORMAL, 0);
-#elif CMANGOS
+#elif defined(CMANGOS)
             unit->SendAttackStateUpdate(HITINFO_NORMALSWING2, target, schoolmask, damage, absorb, resist, VICTIMSTATE_NORMAL, 0);
 #endif
             return 0;