diff --git a/ElunaIncludes.h b/ElunaIncludes.h
index 18b32c0..61d17b3 100644
--- a/ElunaIncludes.h
+++ b/ElunaIncludes.h
@@ -84,8 +84,6 @@ typedef ThreatContainer::StorageType ThreatList;
 
 #ifdef CATA
 #define NUM_MSG_TYPES           NUM_OPCODE_HANDLERS
-#else
-typedef uint64 ObjectGuid;
 #endif
 #endif
 
diff --git a/ElunaUtilitiy.h b/ElunaUtilitiy.h
index 11da784..50d02db 100644
--- a/ElunaUtilitiy.h
+++ b/ElunaUtilitiy.h
@@ -9,6 +9,11 @@
 
 #include "Common.h"
 #include "SharedDefines.h"
+#ifdef TRINITY
+#ifdef CATA
+#include "Object.h"
+#endif
+#endif
 
 #ifdef TRINITY
 #ifndef CATA