diff --git a/modules/acore/framework/Database/Field.h b/modules/acore/framework/Database/Field.h
index 568532fb0..6ba3c9e92 100644
--- a/modules/acore/framework/Database/Field.h
+++ b/modules/acore/framework/Database/Field.h
@@ -5,8 +5,8 @@
* Copyright (C) 2005-2009 MaNGOS
*/
-#ifndef _FIELD_H
-#define _FIELD_H
+#ifndef AZEROTHCORE_FIELD_H
+#define AZEROTHCORE_FIELD_H
#include "Common.h"
#include "Log.h"
diff --git a/modules/acore/framework/Database/QueryResult.h b/modules/acore/framework/Database/QueryResult.h
index 72973b4c8..dd6cec32d 100644
--- a/modules/acore/framework/Database/QueryResult.h
+++ b/modules/acore/framework/Database/QueryResult.h
@@ -10,6 +10,7 @@
#include "AutoPtr.h"
#include
+#include "Errors.h"
#include "Field.h"
#ifdef _WIN32
diff --git a/modules/acore/framework/Packets/ByteBuffer.h b/modules/acore/framework/Packets/ByteBuffer.h
index 7531a60f7..7c6cdb2d4 100644
--- a/modules/acore/framework/Packets/ByteBuffer.h
+++ b/modules/acore/framework/Packets/ByteBuffer.h
@@ -7,7 +7,7 @@
#ifndef _BYTEBUFFER_H
#define _BYTEBUFFER_H
-#include "Define.h"
+#include "Common.h"
#include "Errors.h"
#include "ByteConverter.h"
diff --git a/modules/acore/framework/Utilities/Util.cpp b/modules/acore/framework/Utilities/Util.cpp
index 00ef6a11a..ea3d81e8e 100644
--- a/modules/acore/framework/Utilities/Util.cpp
+++ b/modules/acore/framework/Utilities/Util.cpp
@@ -7,6 +7,11 @@
#include "Util.h"
#include "Common.h"
#include "utf8.h"
+#include "Log.h"
+#include "DatabaseWorker.h"
+#include "SQLOperation.h"
+#include "Errors.h"
+#include "TypeList.h"
#include "SFMT.h"
#include "Errors.h" // for ASSERT
#include
diff --git a/src/game/DungeonFinding/LFG.h b/src/game/DungeonFinding/LFG.h
index fca86260d..b6249a994 100644
--- a/src/game/DungeonFinding/LFG.h
+++ b/src/game/DungeonFinding/LFG.h
@@ -9,6 +9,9 @@
#define _LFG_H
#include "Common.h"
+#include "ObjectDefines.h"
+#include "SharedDefines.h"
+#include "WorldPacket.h"
namespace lfg
{
diff --git a/src/game/DungeonFinding/LFGMgr.cpp b/src/game/DungeonFinding/LFGMgr.cpp
index 09f9c6c7a..ef2144d51 100644
--- a/src/game/DungeonFinding/LFGMgr.cpp
+++ b/src/game/DungeonFinding/LFGMgr.cpp
@@ -23,6 +23,7 @@
#include "GroupMgr.h"
#include "GameEventMgr.h"
#include "WorldSession.h"
+#include "Opcodes.h"
namespace lfg
{
diff --git a/src/game/DungeonFinding/LFGMgr.h b/src/game/DungeonFinding/LFGMgr.h
index 5854d1734..a87c2971d 100644
--- a/src/game/DungeonFinding/LFGMgr.h
+++ b/src/game/DungeonFinding/LFGMgr.h
@@ -15,6 +15,7 @@
#include "LFGQueue.h"
#include "LFGGroupData.h"
#include "LFGPlayerData.h"
+#include "Map.h"
class Group;
class Player;
diff --git a/src/game/Entities/Vehicle/VehicleDefines.h b/src/game/Entities/Vehicle/VehicleDefines.h
index 11256c993..1c1f0da97 100644
--- a/src/game/Entities/Vehicle/VehicleDefines.h
+++ b/src/game/Entities/Vehicle/VehicleDefines.h
@@ -8,6 +8,8 @@
#define __TRINITY_VEHICLEDEFINES_H
#include "Define.h"
+#include "Map.h"
+#include "Object.h"
#include
#include