refactor(Core/Misc): headers cleanup (#9259)

src/common/Logging/enuminfo_LogCommon.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LogCommon.h"
 #include "Define.h"
+#include "LogCommon.h"
 #include "SmartEnum.h"
 #include <stdexcept>
 

src/common/Metric/Metric.cpp

@@ -21,8 +21,8 @@
 #include "DeadlineTimer.h"
 #include "Log.h"
 #include "Strand.h"
-#include "Util.h"
 #include "Tokenize.h"
+#include "Util.h"
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/asio/ip/tcp.hpp>
 

src/common/Metric/Metric.h

@@ -26,8 +26,8 @@
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include <vector>
 #include <utility>
+#include <vector>
 
 namespace Acore::Asio
 {

src/common/Threading/MPSCQueue.h

@@ -19,6 +19,7 @@
 #define MPSCQueue_h__
 
 #include <atomic>
+#include <memory>
 #include <utility>
 
 namespace Acore::Impl

src/common/Utilities/StartProcess.cpp

@@ -20,7 +20,6 @@
 #include "Log.h"
 #include "Optional.h"
 #include "Util.h"
-#include <filesystem>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/iostreams/copy.hpp>
 #include <boost/process/args.hpp>
@@ -30,6 +29,7 @@
 #include <boost/process/io.hpp>
 #include <boost/process/pipe.hpp>
 #include <boost/process/search_path.hpp>
+#include <filesystem>
 
 using namespace boost::process;
 using namespace boost::iostreams;

src/common/Utilities/Util.cpp

@@ -21,13 +21,13 @@
 #include "IpAddress.h"
 #include "StringFormat.h"
 #include <algorithm>
+#include <boost/core/demangle.hpp>
 #include <cctype>
 #include <cstdarg>
 #include <ctime>
 #include <iomanip>
 #include <sstream>
 #include <string>
-#include <boost/core/demangle.hpp>
 #include <utf8.h>
 
 Tokenizer::Tokenizer(const std::string& src, const char sep, uint32 vectorReserve)

src/common/Utilities/Util.h

@@ -28,9 +28,6 @@
 #include <map>
 #include <string>
 #include <vector>
-#include <list>
-#include <map>
-#include <array>
 
 // Searcher for map of structs
 template<typename T, class S> struct Finder

src/server/authserver/Main.cpp

@@ -33,8 +33,8 @@
 #include "DeadlineTimer.h"
 #include "GitRevision.h"
 #include "IPLocation.h"
-#include "Log.h"
 #include "IoContext.h"
+#include "Log.h"
 #include "MySQLThreading.h"
 #include "ProcessPriority.h"
 #include "RealmList.h"

src/server/authserver/PrecompiledHeaders/authPCH.h

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Common.h"
 #include "Config.h"
 #include "DatabaseEnv.h"
 #include "Log.h"
 #include "RealmList.h"
-#include "Common.h"

src/server/authserver/Server/AuthSession.cpp

@@ -20,16 +20,16 @@
 #include "AuthCodes.h"
 #include "Config.h"
 #include "CryptoGenerics.h"
+#include "CryptoHash.h"
 #include "CryptoRandom.h"
 #include "DatabaseEnv.h"
 #include "Errors.h"
-#include "CryptoHash.h"
 #include "IPLocation.h"
 #include "Log.h"
 #include "RealmList.h"
 #include "SecretMgr.h"
-#include "Timer.h"
 #include "TOTP.h"
+#include "Timer.h"
 #include "Util.h"
 #include <boost/lexical_cast.hpp>
 #include <openssl/crypto.h>

src/server/authserver/Server/AuthSession.h

@@ -24,11 +24,11 @@
 #include "Common.h"
 #include "CryptoHash.h"
 #include "Optional.h"
-#include "Socket.h"
-#include "SRP6.h"
 #include "QueryResult.h"
-#include <memory>
+#include "SRP6.h"
+#include "Socket.h"
 #include <boost/asio/ip/tcp.hpp>
+#include <memory>
 
 using boost::asio::ip::tcp;
 

src/server/authserver/Server/AuthSocketMgr.h

@@ -18,8 +18,8 @@
 #ifndef AuthSocketMgr_h__
 #define AuthSocketMgr_h__
 
-#include "SocketMgr.h"
 #include "AuthSession.h"
+#include "SocketMgr.h"
 
 class AuthSocketMgr : public SocketMgr<AuthSession>
 {

src/server/database/Database/DatabaseWorkerPool.cpp

@@ -25,8 +25,8 @@
 #include "Log.h"
 #include "MySQLPreparedStatement.h"
 #include "MySQLWorkaround.h"
-#include "PreparedStatement.h"
 #include "PCQueue.h"
+#include "PreparedStatement.h"
 #include "QueryCallback.h"
 #include "QueryHolder.h"
 #include "QueryResult.h"

src/server/database/PrecompiledHeaders/databasePCH.h

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Define.h"
 #include "DatabaseEnvFwd.h"
+#include "Define.h"
 #include "Errors.h"
 #include "Field.h"
 #include "Log.h"

src/server/database/Updater/DBUpdater.h

@@ -20,8 +20,8 @@
 
 #include "DatabaseEnv.h"
 #include "Define.h"
-#include <string>
 #include <filesystem>
+#include <string>
 
 template <class T>
 class DatabaseWorkerPool;

src/server/database/Updater/UpdateFetcher.cpp

@@ -23,8 +23,8 @@
 #include "QueryResult.h"
 #include "Tokenize.h"
 #include "Util.h"
-#include <sstream>
 #include <fstream>
+#include <sstream>
 
 using namespace std::filesystem;
 

src/server/database/Updater/UpdateFetcher.h

@@ -20,11 +20,11 @@
 
 #include "DatabaseEnv.h"
 #include "Define.h"
+#include <filesystem>
 #include <set>
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <filesystem>
 
 struct AC_DATABASE_API UpdateResult
 {

src/server/game/AI/CoreAI/GuardAI.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CreatureAIImpl.h"
 #include "GuardAI.h"
+#include "CreatureAIImpl.h"
 #include "Player.h"
 
 int GuardAI::Permissible(Creature const* creature)

src/server/game/AI/CoreAI/PassiveAI.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Creature.h"
 #include "PassiveAI.h"
+#include "Creature.h"
 #include "TemporarySummon.h"
 
 PassiveAI::PassiveAI(Creature* c) : CreatureAI(c) { me->SetReactState(REACT_PASSIVE); }

src/server/game/AI/CoreAI/PetAI.cpp

@@ -15,18 +15,19 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "PetAI.h"
 #include "Creature.h"
 #include "Errors.h"
 #include "Group.h"
 #include "ObjectAccessor.h"
 #include "Pet.h"
-#include "PetAI.h"
 #include "Player.h"
 #include "Spell.h"
 #include "SpellAuraEffects.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
 #include "Util.h"
+#include "WorldSession.h"
 
 int PetAI::Permissible(const Creature* creature)
 {

src/server/game/AI/CoreAI/ReactorAI.cpp

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "ReactorAI.h"
 #include "CreatureAIImpl.h"
 #include "Errors.h"
-#include "ReactorAI.h"
 
 int ReactorAI::Permissible(const Creature* creature)
 {

src/server/game/AI/CoreAI/TotemAI.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "TotemAI.h"
 #include "CellImpl.h"
 #include "Creature.h"
 #include "DBCStores.h"
@@ -23,7 +24,6 @@
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
 #include "Totem.h"
-#include "TotemAI.h"
 
 int TotemAI::Permissible(Creature const* creature)
 {

src/server/game/AI/CoreAI/UnitAI.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "UnitAI.h"
 #include "Creature.h"
 #include "CreatureAIImpl.h"
 #include "Player.h"
@@ -23,7 +24,6 @@
 #include "SpellAuras.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
-#include "UnitAI.h"
 
 void UnitAI::AttackStart(Unit* victim)
 {

src/server/game/AI/CreatureAI.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Creature.h"
 #include "CreatureAI.h"
+#include "Creature.h"
 #include "CreatureAIImpl.h"
 #include "CreatureGroups.h"
 #include "CreatureTextMgr.h"

src/server/game/AI/CreatureAIRegistry.cpp

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureAIRegistry.h"
 #include "CombatAI.h"
 #include "CreatureAIFactory.h"
-#include "CreatureAIRegistry.h"
 #include "GuardAI.h"
 #include "MovementGeneratorImpl.h"
 #include "PassiveAI.h"

src/server/game/AI/CreatureAISelector.cpp

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureAISelector.h"
 #include "Creature.h"
 #include "CreatureAIFactory.h"
-#include "CreatureAISelector.h"
 #include "MovementGenerator.h"
 #include "PassiveAI.h"
 #include "Pet.h"

src/server/game/AI/ScriptedAI/ScriptedCreature.cpp

@@ -15,12 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "ScriptedCreature.h"
 #include "Cell.h"
 #include "CellImpl.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "ObjectMgr.h"
-#include "ScriptedCreature.h"
 #include "Spell.h"
 #include "TemporarySummon.h"
 

src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp

@@ -22,10 +22,10 @@ SDComment:
 SDCategory: Npc
 EndScriptData */
 
+#include "ScriptedEscortAI.h"
 #include "Group.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
-#include "ScriptedEscortAI.h"
 
 enum ePoints
 {

src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp

@@ -22,10 +22,10 @@ SDComment: This AI is under development
 SDCategory: Npc
 EndScriptData */
 
+#include "ScriptedFollowerAI.h"
 #include "Group.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
-#include "ScriptedFollowerAI.h"
 
 const float MAX_PLAYER_DISTANCE = 100.0f;
 

src/server/game/AI/ScriptedAI/ScriptedFollowerAI.h

@@ -19,6 +19,7 @@
 #define SC_FOLLOWERAI_H
 
 #include "ScriptSystem.h"
+#include "ScriptedCreature.h"
 
 enum eFollowState
 {
@@ -35,7 +36,7 @@ class FollowerAI : public ScriptedAI
 {
 public:
     explicit FollowerAI(Creature* creature);
-    ~FollowerAI() override {}
+    ~FollowerAI() override { }
 
     //virtual void WaypointReached(uint32 uiPointId) = 0;
 

src/server/game/AI/ScriptedAI/ScriptedGossip.cpp

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "ScriptedGossip.h"
 #include "Creature.h"
 #include "Player.h"
-#include "ScriptedGossip.h"
 
 void ClearGossipMenuFor(Player* player)
 {

src/server/game/AI/SmartScripts/SmartAI.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "SmartAI.h"
 #include "Cell.h"
 #include "CellImpl.h"
 #include "DatabaseEnv.h"
@@ -25,9 +26,8 @@
 #include "InstanceScript.h"
 #include "ObjectDefines.h"
 #include "ObjectMgr.h"
-#include "ScriptedCreature.h"
 #include "ScriptMgr.h"
-#include "SmartAI.h"
+#include "ScriptedCreature.h"
 #include "SpellMgr.h"
 #include "Vehicle.h"
 

src/server/game/AI/SmartScripts/SmartScript.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "SmartScript.h"
 #include "Cell.h"
 #include "CellImpl.h"
 #include "ChatTextBuilder.h"
@@ -33,7 +34,6 @@
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "SmartAI.h"
-#include "SmartScript.h"
 #include "SpellMgr.h"
 #include "Vehicle.h"
 

src/server/game/AI/SmartScripts/SmartScriptMgr.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "SmartScriptMgr.h"
 #include "Cell.h"
 #include "CellImpl.h"
 #include "CreatureTextMgr.h"
@@ -27,7 +28,6 @@
 #include "ObjectDefines.h"
 #include "ObjectMgr.h"
 #include "ScriptedCreature.h"
-#include "SmartScriptMgr.h"
 #include "SpellMgr.h"
 
 SmartWaypointMgr* SmartWaypointMgr::instance()

src/server/game/AI/SmartScripts/SmartScriptMgr.h

@@ -21,9 +21,9 @@
 #include "Common.h"
 #include "Creature.h"
 #include "CreatureAI.h"
+#include "DBCStores.h"
 #include "Spell.h"
-//#include "SmartAI.h"
+#include "SpellMgr.h"
-//#include "SmartScript.h"
 #include "Unit.h"
 
 struct WayPoint

src/server/game/Accounts/AccountMgr.cpp

@@ -19,8 +19,8 @@
 #include "DatabaseEnv.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "SRP6.h"
+#include "ScriptMgr.h"
 #include "Util.h"
 #include "WorldSession.h"
 

src/server/game/Achievements/AchievementMgr.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "AccountMgr.h"
 #include "AchievementMgr.h"
+#include "AccountMgr.h"
 #include "ArenaTeam.h"
 #include "ArenaTeamMgr.h"
 #include "Battleground.h"
@@ -25,8 +25,8 @@
 #include "Chat.h"
 #include "ChatTextBuilder.h"
 #include "Common.h"
-#include "DatabaseEnv.h"
 #include "DBCEnums.h"
+#include "DatabaseEnv.h"
 #include "DisableMgr.h"
 #include "GameEventMgr.h"
 #include "GridNotifiersImpl.h"

src/server/game/Achievements/AchievementMgr.h

@@ -18,15 +18,14 @@
 #ifndef __ACORE_ACHIEVEMENTMGR_H
 #define __ACORE_ACHIEVEMENTMGR_H
 
-#include <map>
-#include <string>
-#include <chrono>
-
 #include "Common.h"
-#include "DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "DBCStores.h"
+#include "DatabaseEnv.h"
 #include "ObjectGuid.h"
+#include <chrono>
+#include <map>
+#include <string>
 
 typedef std::list<AchievementCriteriaEntry const*> AchievementCriteriaEntryList;
 typedef std::list<AchievementEntry const*>         AchievementEntryList;

src/server/game/ArenaSpectator/ArenaSpectator.cpp

@@ -23,6 +23,7 @@
 #include "Player.h"
 #include "SpellAuraEffects.h"
 #include "SpellAuras.h"
+#include "Types.h"
 #include "World.h"
 
 bool ArenaSpectator::HandleSpectatorSpectateCommand(ChatHandler* handler, std::string const& name)

src/server/game/AuctionHouse/AuctionHouseMgr.cpp

@@ -15,13 +15,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AuctionHouseMgr.h"
 #include "AccountMgr.h"
 #include "AsyncAuctionListing.h"
-#include "AuctionHouseMgr.h"
 #include "AvgDiffTracker.h"
 #include "Common.h"
-#include "DatabaseEnv.h"
 #include "DBCStores.h"
+#include "DatabaseEnv.h"
 #include "Item.h"
 #include "Logging/Log.h"
 #include "ObjectMgr.h"

src/server/game/AuctionHouse/AuctionHouseMgr.h

@@ -19,8 +19,8 @@
 #define _AUCTION_HOUSE_MGR_H
 
 #include "Common.h"
-#include "DatabaseEnv.h"
 #include "DBCStructure.h"
+#include "DatabaseEnv.h"
 #include "EventProcessor.h"
 #include "ObjectGuid.h"
 #include "WorldPacket.h"

src/server/game/Battlefield/Zones/BattlefieldWG.h

@@ -19,8 +19,8 @@
 #define BATTLEFIELD_WG_
 
 #include "Battlefield.h"
-#include "ObjectAccessor.h"
 #include "Log.h"
+#include "ObjectAccessor.h"
 #include "World.h"
 #include "WorldPacket.h"
 

src/server/game/Battlegrounds/ArenaTeam.h

@@ -70,7 +70,7 @@ enum ArenaTeamEvents
 };
 
 // PLAYER_FIELD_ARENA_TEAM_INFO_1_1 offsets
-enum ArenaTeamInfoType
+enum ArenaTeamInfoType : uint8
 {
     ARENA_TEAM_ID                = 0,
     ARENA_TEAM_TYPE              = 1,                       // new in 3.2 - team type?

src/server/game/Battlegrounds/Battleground.cpp

@@ -15,10 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Battleground.h"
 #include "ArenaSpectator.h"
 #include "ArenaTeam.h"
 #include "ArenaTeamMgr.h"
-#include "Battleground.h"
 #include "BattlegroundBE.h"
 #include "BattlegroundDS.h"
 #include "BattlegroundMgr.h"

src/server/game/Battlegrounds/BattlegroundMgr.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "BattlegroundMgr.h"
 #include "ArenaTeam.h"
 #include "ArenaTeamMgr.h"
 #include "BattlegroundAB.h"
@@ -23,7 +24,6 @@
 #include "BattlegroundDS.h"
 #include "BattlegroundEY.h"
 #include "BattlegroundIC.h"
-#include "BattlegroundMgr.h"
 #include "BattlegroundNA.h"
 #include "BattlegroundQueue.h"
 #include "BattlegroundRL.h"

src/server/game/Battlegrounds/BattlegroundQueue.h

@@ -22,8 +22,8 @@
 #include "Common.h"
 #include "DBCEnums.h"
 #include "EventProcessor.h"
-#include <deque>
 #include <array>
+#include <deque>
 
 #define COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME 10
 

src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp

@@ -17,6 +17,7 @@
 
 #include "BattlegroundBE.h"
 #include "Language.h"
+#include "Log.h"
 #include "Object.h"
 #include "ObjectMgr.h"
 #include "Player.h"

src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp

@@ -19,6 +19,7 @@
 #include "Creature.h"
 #include "GameObject.h"
 #include "Language.h"
+#include "Log.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
 #include "WorldPacket.h"

src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Battleground.h"
 #include "BattlegroundIC.h"
+#include "Battleground.h"
 #include "GameGraveyard.h"
 #include "GameObject.h"
 #include "Language.h"

src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp

@@ -17,6 +17,7 @@
 
 #include "BattlegroundRL.h"
 #include "Language.h"
+#include "Log.h"
 #include "Player.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"

src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp

@@ -15,10 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Battleground.h"
 #include "BattlegroundRV.h"
+#include "Battleground.h"
 #include "GameObject.h"
 #include "Language.h"
+#include "Log.h"
 #include "ObjectAccessor.h"
 #include "Pet.h"
 #include "Player.h"

src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "BattlegroundMgr.h"
 #include "BattlegroundWS.h"
+#include "BattlegroundMgr.h"
 #include "GameGraveyard.h"
 #include "GameObject.h"
 #include "Language.h"

src/server/game/Cache/WhoListCacheMgr.h

@@ -19,8 +19,8 @@
 #define _WHO_LISTCACHE_H_
 
 #include "Common.h"
-#include "SharedDefines.h"
 #include "ObjectGuid.h"
+#include "SharedDefines.h"
 
 class WhoListPlayerInfo
 {

src/server/game/Calendar/CalendarMgr.h

@@ -20,8 +20,8 @@
 
 #include "Common.h"
 #include "DatabaseEnv.h"
-#include "WorldPacket.h"
 #include "ObjectGuid.h"
+#include "WorldPacket.h"
 #include <unordered_map>
 
 enum CalendarMailAnswers

src/server/game/Chat/Channels/ChannelMgr.cpp

@@ -16,6 +16,7 @@
  */
 
 #include "ChannelMgr.h"
+#include "Log.h"
 #include "Player.h"
 #include "World.h"
 

src/server/game/Chat/Chat.h

@@ -19,8 +19,8 @@
 #define AZEROTHCORE_CHAT_H
 
 #include "ChatCommand.h"
-#include "SharedDefines.h"
 #include "Errors.h"
+#include "SharedDefines.h"
 #include "WorldSession.h"
 #include <vector>
 

src/server/game/Chat/ChatCommands/ChatCommand.h

@@ -18,7 +18,6 @@
 #ifndef _CHATCOMMAND_H
 #define _CHATCOMMAND_H
 
-#include "advstd.h"
 #include "ChatCommandArgs.h"
 #include "ChatCommandTags.h"
 #include "Define.h"
@@ -28,11 +27,12 @@
 #include "Optional.h"
 #include "StringFormat.h"
 #include "Util.h"
+#include "advstd.h"
 #include <cstddef>
 #include <map>
-#include <utility>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 #include <variant>
 #include <vector>
 

src/server/game/Chat/ChatCommands/ChatCommandTags.h

@@ -18,14 +18,14 @@
 #ifndef _CHATCOMMANDTAGS_H
 #define _CHATCOMMANDTAGS_H
 
-#include "advstd.h"
 #include "ChatCommandHelpers.h"
 #include "Hyperlinks.h"
 #include "ObjectGuid.h"
 #include "Optional.h"
 #include "Util.h"
-#include <boost/preprocessor/repetition/repeat.hpp>
+#include "advstd.h"
 #include <boost/preprocessor/punctuation/comma_if.hpp>
+#include <boost/preprocessor/repetition/repeat.hpp>
 #include <cmath>
 #include <cstring>
 #include <iostream>

src/server/game/Chat/HyperlinkTags.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Hyperlinks.h"
 #include "AchievementMgr.h"
+#include "Hyperlinks.h"
 #include "ObjectMgr.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"

src/server/game/Chat/Hyperlinks.cpp

@@ -16,15 +16,15 @@
  */
 
 #include "Hyperlinks.h"
-#include "advstd.h"
 #include "Common.h"
 #include "DBCStores.h"
 #include "Errors.h"
 #include "ObjectMgr.h"
+#include "QuestDef.h"
 #include "SharedDefines.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
-#include "QuestDef.h"
+#include "advstd.h"
 
 using namespace Acore::Hyperlinks;
 

src/server/game/Combat/HostileRefMgr.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CreatureAI.h"
 #include "HostileRefMgr.h"
+#include "CreatureAI.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
 #include "ThreatMgr.h"

src/server/game/Combat/ThreatMgr.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "ThreatMgr.h"
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "Map.h"
@@ -23,7 +24,6 @@
 #include "SpellAuras.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
-#include "ThreatMgr.h"
 #include "Unit.h"
 #include "UnitEvents.h"
 

src/server/game/Combat/ThreatMgr.h

@@ -19,7 +19,8 @@
 #define _THREATMANAGER
 
 #include "Common.h"
-#include "LinkedReference/Reference.h"
+#include "ObjectGuid.h"
+#include "Reference.h"
 #include "SharedDefines.h"
 #include "UnitEvents.h"
 #include <list>

src/server/game/DataStores/DBCStores.cpp

@@ -15,10 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "DBCStores.h"
 #include "BattlegroundMgr.h"
 #include "DBCFileLoader.h"
 #include "DBCfmt.h"
-#include "DBCStores.h"
 #include "Errors.h"
 #include "Log.h"
 #include "SharedDefines.h"

src/server/game/DungeonFinding/LFG.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Language.h"
 #include "LFG.h"
+#include "Language.h"
 #include "ObjectMgr.h"
 
 namespace lfg

src/server/game/DungeonFinding/LFGGroupData.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LFG.h"
 #include "LFGGroupData.h"
+#include "LFG.h"
 #include "World.h"
 
 namespace lfg

src/server/game/DungeonFinding/LFGMgr.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "LFGMgr.h"
 #include "CharacterCache.h"
 #include "Common.h"
 #include "DBCStores.h"
@@ -22,12 +23,12 @@
 #include "GameEventMgr.h"
 #include "Group.h"
 #include "GroupMgr.h"
-#include "Language.h"
+#include "InstanceSaveMgr.h"
 #include "LFGGroupData.h"
-#include "LFGMgr.h"
 #include "LFGPlayerData.h"
 #include "LFGQueue.h"
 #include "LFGScripts.h"
+#include "Language.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
 #include "Player.h"
@@ -38,7 +39,6 @@
 
 namespace lfg
 {
-
     LFGMgr::LFGMgr(): m_lfgProposalId(1), m_options(sWorld->getIntConfig(CONFIG_LFG_OPTIONSMASK)), m_Testing(false)
     {
         new LFGPlayerScript();

src/server/game/DungeonFinding/LFGPlayerData.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "LFGMgr.h"
 #include "LFGPlayerData.h"
+#include "LFGMgr.h"
 
 namespace lfg
 {

src/server/game/DungeonFinding/LFGQueue.cpp

@@ -15,12 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "LFGQueue.h"
 #include "Containers.h"
 #include "DBCStores.h"
 #include "Group.h"
 #include "InstanceScript.h"
 #include "LFGMgr.h"
-#include "LFGQueue.h"
 #include "Log.h"
 #include "ObjectDefines.h"
 #include "ObjectMgr.h"

src/server/game/DungeonFinding/LFGScripts.cpp

@@ -19,20 +19,18 @@
  * Interaction between core and LFGScripts
  */
 
+#include "LFGScripts.h"
 #include "Group.h"
 #include "LFGMgr.h"
-#include "LFGScripts.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "SharedDefines.h"
+#include "WorldSession.h"
 
 namespace lfg
 {
-
+    LFGPlayerScript::LFGPlayerScript() : PlayerScript("LFGPlayerScript") { }
-    LFGPlayerScript::LFGPlayerScript() : PlayerScript("LFGPlayerScript")
-    {
-    }
 
     void LFGPlayerScript::OnLevelChanged(Player* player, uint8 /*oldLevel*/)
     {

src/server/game/Entities/Corpse/Corpse.cpp

@@ -15,10 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Corpse.h"
 #include "CharacterCache.h"
 #include "Common.h"
-#include "Corpse.h"
 #include "DatabaseEnv.h"
+#include "Log.h"
 #include "ObjectAccessor.h"
 #include "Opcodes.h"
 #include "Player.h"

src/server/game/Entities/Creature/Creature.cpp

@@ -15,10 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Creature.h"
 #include "BattlegroundMgr.h"
 #include "CellImpl.h"
 #include "Common.h"
-#include "Creature.h"
 #include "CreatureAI.h"
 #include "CreatureAISelector.h"
 #include "CreatureGroups.h"

src/server/game/Entities/Creature/CreatureData.h

@@ -18,9 +18,9 @@
 #ifndef AZEROTHCORE_CREATUREDATA_H
 #define AZEROTHCORE_CREATUREDATA_H
 
-#include "DBCEnums.h"
 #include "Cell.h"
 #include "Common.h"
+#include "DBCEnums.h"
 #include "DatabaseEnv.h"
 #include "ItemTemplate.h"
 #include "LootMgr.h"

src/server/game/Entities/Creature/CreatureGroups.cpp

@@ -15,12 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "CreatureGroups.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "CreatureGroups.h"
+#include "Log.h"
 #include "MoveSplineInit.h"
 #include "ObjectMgr.h"
-#include "Log.h"
 
 FormationMgr::~FormationMgr()
 {

src/server/game/Entities/Creature/TemporarySummon.cpp

@@ -15,13 +15,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "TemporarySummon.h"
 #include "CreatureAI.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "Pet.h"
 #include "Player.h"
 #include "ScriptMgr.h"
-#include "TemporarySummon.h"
 
 TempSummon::TempSummon(SummonPropertiesEntry const* properties, ObjectGuid owner, bool isWorldObject) :
     Creature(isWorldObject), m_Properties(properties), m_type(TEMPSUMMON_MANUAL_DESPAWN),

src/server/game/Entities/GameObject/GameObject.cpp

@@ -34,9 +34,9 @@
 #include "Transport.h"
 #include "UpdateFieldFlags.h"
 #include "World.h"
-#include <G3D/Quat.h>
 #include <G3D/Box.h>
 #include <G3D/CoordinateFrame.h>
+#include <G3D/Quat.h>
 
 #ifdef ELUNA
 #include "LuaEngine.h"

src/server/game/Entities/Item/Item.cpp

@@ -15,10 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Item.h"
 #include "Common.h"
 #include "ConditionMgr.h"
 #include "DatabaseEnv.h"
-#include "Item.h"
 #include "ItemEnchantmentMgr.h"
 #include "ObjectMgr.h"
 #include "Player.h"
@@ -26,6 +26,7 @@
 #include "SpellInfo.h"
 #include "SpellMgr.h"
 #include "WorldPacket.h"
+#include "WorldSession.h"
 
 void AddItemsSetItem(Player* player, Item* item)
 {

src/server/game/Entities/Item/ItemEnchantmentMgr.cpp

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "DatabaseEnv.h"
-#include "DBCStores.h"
 #include "ItemEnchantmentMgr.h"
+#include "DBCStores.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Util.h"

src/server/game/Entities/Item/enuminfo_Item.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Item.h"
 #include "Define.h"
+#include "Item.h"
 #include "SmartEnum.h"
 #include <stdexcept>
 

src/server/game/Entities/Object/Object.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Object.h"
 #include "Battlefield.h"
 #include "BattlefieldMgr.h"
 #include "CellImpl.h"
@@ -28,7 +29,6 @@
 #include "Log.h"
 #include "MapMgr.h"
 #include "MovementPacketBuilder.h"
-#include "Object.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"

src/server/game/Entities/Object/Object.h

@@ -20,6 +20,7 @@
 
 #include "Common.h"
 #include "DataMap.h"
+#include "G3D/Vector3.h"
 #include "GridDefines.h"
 #include "GridReference.h"
 #include "Map.h"
@@ -29,9 +30,8 @@
 #include "UpdateData.h"
 #include "UpdateMask.h"
 #include <set>
-#include <string>
 #include <sstream>
-#include "G3D/Vector3.h"
+#include <string>
 
 #ifdef ELUNA
 class ElunaEventProcessor;

src/server/game/Entities/Object/ObjectGuid.cpp

@@ -18,8 +18,8 @@
 #include "ObjectGuid.h"
 #include "Log.h"
 #include "World.h"
-#include <sstream>
 #include <iomanip>
+#include <sstream>
 
 ObjectGuid const ObjectGuid::Empty = ObjectGuid();
 

src/server/game/Entities/Object/ObjectGuid.h

@@ -26,8 +26,8 @@
 #include <memory>
 #include <set>
 #include <type_traits>
-#include <vector>
 #include <unordered_set>
+#include <vector>
 
 enum TypeID
 {

src/server/game/Entities/Object/ObjectPosSelector.h

@@ -19,8 +19,8 @@
 #define _OBJECT_POS_SELECTOR_H
 
 #include "Define.h"
-#include <math.h>
 #include <map>
+#include <math.h>
 
 enum UsedPosType { USED_POS_PLUS, USED_POS_MINUS };
 

src/server/game/Entities/Player/KillRewarder.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "KillRewarder.h"
 #include "Formulas.h"
 #include "Group.h"
 #include "Pet.h"
@@ -77,7 +78,7 @@ KillRewarder::KillRewarder(Player* killer, Unit* victim, bool isBattleGround) :
     _InitGroupData();
 }
 
-inline void KillRewarder::_InitGroupData()
+void KillRewarder::_InitGroupData()
 {
     if (_group)
     {
@@ -117,7 +118,7 @@ inline void KillRewarder::_InitGroupData()
         _count = 1;
 }
 
-inline void KillRewarder::_InitXP(Player* player)
+void KillRewarder::_InitXP(Player* player)
 {
     // Get initial value of XP for kill.
     // XP is given:
@@ -134,14 +135,14 @@ inline void KillRewarder::_InitXP(Player* player)
                     _xp = uint32(_xp * ct->ModHealth);
 }
 
-inline void KillRewarder::_RewardHonor(Player* player)
+void KillRewarder::_RewardHonor(Player* player)
 {
     // Rewarded player must be alive.
     if (player->IsAlive())
         player->RewardHonor(_victim, _count, -1);
 }
 
-inline void KillRewarder::_RewardXP(Player* player, float rate)
+void KillRewarder::_RewardXP(Player* player, float rate)
 {
     uint32 xp(_xp);
     if (_group)
@@ -172,14 +173,14 @@ inline void KillRewarder::_RewardXP(Player* player, float rate)
     }
 }
 
-inline void KillRewarder::_RewardReputation(Player* player, float rate)
+void KillRewarder::_RewardReputation(Player* player, float rate)
 {
     // 4.3. Give reputation (player must not be on BG).
     // Even dead players and corpses are rewarded.
     player->RewardReputation(_victim, rate);
 }
 
-inline void KillRewarder::_RewardKillCredit(Player* player)
+void KillRewarder::_RewardKillCredit(Player* player)
 {
     // 4.4. Give kill credit (player must not be in group, or he must be alive or without corpse).
     if (!_group || player->IsAlive() || !player->GetCorpse())

src/server/game/Entities/Player/KillRewarder.h

@@ -15,7 +15,16 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-class KillRewarder
+#ifndef __KILL_REWARDER_H__
+#define __KILL_REWARDER_H__
+
+#include "Define.h"
+
+class Group;
+class Player;
+class Unit;
+
+class AC_GAME_API KillRewarder
 {
 public:
     KillRewarder(Player* killer, Unit* victim, bool isBattleGround);
@@ -47,3 +56,5 @@ private:
     bool _isBattleGround;
     bool _isPvP;
 };
+
+#endif

src/server/game/Entities/Player/PlayerGossip.cpp

@@ -16,10 +16,13 @@
  */
 
 #include "BattlegroundMgr.h"
+#include "GossipDef.h"
 #include "Language.h"
+#include "ObjectMgr.h"
 #include "OutdoorPvPMgr.h"
 #include "Pet.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 /*********************************************************/
 /***                    GOSSIP SYSTEM                  ***/

src/server/game/Entities/Player/PlayerMisc.cpp

@@ -15,9 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "AccountMgr.h"
 #include "MapMgr.h"
 #include "Player.h"
 #include "ScriptMgr.h"
+#include "WorldSession.h"
 
 /*********************************************************/
 /***               FLOOD FILTER SYSTEM                 ***/

src/server/game/Entities/Player/PlayerQuest.cpp

@@ -18,14 +18,17 @@
 #include "CreatureAI.h"
 #include "DisableMgr.h"
 #include "GameObjectAI.h"
+#include "GitRevision.h"
+#include "GossipDef.h"
 #include "Group.h"
 #include "MapMgr.h"
 #include "Player.h"
 #include "PoolMgr.h"
 #include "ReputationMgr.h"
-#include "GitRevision.h"
 #include "ScriptMgr.h"
 #include "SpellAuraEffects.h"
+#include "SpellMgr.h"
+#include "WorldSession.h"
 
 #ifdef ELUNA
 #include "LuaEngine.h"

src/server/game/Entities/Player/PlayerStorage.cpp

@@ -28,9 +28,9 @@
 #include "Channel.h"
 #include "CharacterDatabaseCleaner.h"
 #include "Chat.h"
-#include "Config.h"
 #include "Common.h"
 #include "ConditionMgr.h"
+#include "Config.h"
 #include "CreatureAI.h"
 #include "DatabaseEnv.h"
 #include "DisableMgr.h"
@@ -43,8 +43,8 @@
 #include "Guild.h"
 #include "InstanceSaveMgr.h"
 #include "InstanceScript.h"
-#include "Language.h"
 #include "LFGMgr.h"
+#include "Language.h"
 #include "Log.h"
 #include "LootItemStorage.h"
 #include "MapMgr.h"
@@ -55,8 +55,8 @@
 #include "OutdoorPvPMgr.h"
 #include "Pet.h"
 #include "Player.h"
-#include "QuestDef.h"
 #include "QueryHolder.h"
+#include "QuestDef.h"
 #include "ReputationMgr.h"
 #include "SavingSystem.h"
 #include "ScriptMgr.h"
@@ -74,6 +74,7 @@
 #include "WeatherMgr.h"
 #include "World.h"
 #include "WorldPacket.h"
+#include "WorldSession.h"
 
 #ifdef ELUNA
 #include "LuaEngine.h"

src/server/game/Entities/Player/PlayerTaxi.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "ObjectMgr.h"
 #include "Player.h"
 
 PlayerTaxi::PlayerTaxi() : _taxiSegment(0)

src/server/game/Entities/Player/PlayerTaxi.h

@@ -15,11 +15,20 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-class PlayerTaxi
+#ifndef __PLAYER_TAXI_H__
+#define __PLAYER_TAXI_H__
+
+#include "DBCStructure.h"
+#include <vector>
+
+class ByteBuffer;
+
+class AC_GAME_API PlayerTaxi
 {
 public:
     PlayerTaxi();
     ~PlayerTaxi() = default;
+
     // Nodes
     void InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level);
     void LoadTaxiMask(std::string const& data);
@@ -30,6 +39,7 @@ public:
         uint32 submask = 1 << ((nodeidx - 1) % 32);
         return (m_taximask[field] & submask) == submask;
     }
+
     bool SetTaximaskNode(uint32 nodeidx)
     {
         uint8  field   = uint8((nodeidx - 1) / 32);
@@ -42,6 +52,7 @@ public:
         else
             return false;
     }
+
     void AppendTaximaskTo(ByteBuffer& data, bool all);
 
     // Destinations
@@ -72,3 +83,5 @@ private:
     std::vector<uint32> m_TaxiDestinations;
     uint32 _taxiSegment;
 };
+
+#endif

src/server/game/Entities/Player/PlayerUpdates.cpp

@@ -33,6 +33,7 @@
 #include "ScriptMgr.h"
 #include "SkillDiscovery.h"
 #include "SpellAuraEffects.h"
+#include "SpellMgr.h"
 #include "UpdateFieldFlags.h"
 #include "Vehicle.h"
 #include "WeatherMgr.h"
@@ -797,8 +798,7 @@ bool Player::UpdateCraftSkill(uint32 spellid)
 {
     LOG_DEBUG("entities.player.skills", "UpdateCraftSkill spellid %d", spellid);
 
-    SkillLineAbilityMapBounds bounds =
+    SkillLineAbilityMapBounds bounds = sSpellMgr->GetSkillLineAbilityMapBounds(spellid);
-        sSpellMgr->GetSkillLineAbilityMapBounds(spellid);
 
     for (SkillLineAbilityMap::const_iterator _spell_idx = bounds.first;
          _spell_idx != bounds.second; ++_spell_idx)

src/server/game/Entities/Player/SocialMgr.cpp

@@ -15,11 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "SocialMgr.h"
 #include "AccountMgr.h"
 #include "DatabaseEnv.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "SocialMgr.h"
 #include "Util.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"

src/server/game/Entities/Player/SocialMgr.h

@@ -20,6 +20,7 @@
 
 #include "Common.h"
 #include "DatabaseEnv.h"
+#include "ObjectGuid.h"
 #include <map>
 
 class Player;

src/server/game/Entities/Player/TradeData.cpp

@@ -16,6 +16,7 @@
  */
 
 #include "Player.h"
+#include "WorldSession.h"
 
 TradeData* TradeData::GetTraderData() const
 {

src/server/game/Entities/Player/TradeData.h

@@ -15,6 +15,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __TRADE_DATA_H__
+#define __TRADE_DATA_H__
+
+#include "Define.h"
+
+class Item;
+class ObjectGuid;
+class Player;
+
 enum TradeSlots
 {
     TRADE_SLOT_COUNT            = 7,
@@ -23,12 +32,11 @@ enum TradeSlots
     TRADE_SLOT_INVALID          = -1,
 };
 
-class TradeData
+class AC_GAME_API TradeData
 {
 public:                                                 // constructors
-    TradeData(Player* player, Player* trader) : m_player(player),  m_trader(trader), m_accepted(false), m_acceptProccess(false), m_money(0), m_spell(0)
+    TradeData(Player* player, Player* trader) :
-    {
+        m_player(player),  m_trader(trader), m_accepted(false), m_acceptProccess(false), m_money(0), m_spell(0) { }
-    }
 
     [[nodiscard]] Player* GetTrader() const { return m_trader; }
     [[nodiscard]] TradeData* GetTraderData() const;
@@ -70,3 +78,5 @@ private:                                                // fields
 
     ObjectGuid m_items[TRADE_SLOT_COUNT];               // traded itmes from m_player side including non-traded slot
 };
+
+#endif

src/server/game/Entities/Totem/Totem.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Totem.h"
 #include "Group.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
@@ -22,7 +23,6 @@
 #include "SpellAuraEffects.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
-#include "Totem.h"
 #include "WorldPacket.h"
 
 Totem::Totem(SummonPropertiesEntry const* properties, ObjectGuid owner) : Minion(properties, owner, false)

src/server/game/Entities/Transport/Transport.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Transport.h"
 #include "Cell.h"
 #include "CellImpl.h"
 #include "Common.h"
@@ -26,7 +27,6 @@
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "Spell.h"
-#include "Transport.h"
 #include "Vehicle.h"
 #include "World.h"
 #include "WorldModel.h"

src/server/game/Entities/Unit/Unit.cpp

@@ -15,6 +15,7 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Unit.h"
 #include "AccountMgr.h"
 #include "ArenaSpectator.h"
 #include "Battlefield.h"
@@ -61,7 +62,6 @@
 #include "Totem.h"
 #include "TotemAI.h"
 #include "Transport.h"
-#include "Unit.h"
 #include "UpdateFieldFlags.h"
 #include "Util.h"
 #include "Vehicle.h"
@@ -71,8 +71,8 @@
 #include <math.h>
 
 #ifdef ELUNA
-#include "LuaEngine.h"
 #include "ElunaEventMgr.h"
+#include "LuaEngine.h"
 #endif
 
 float baseMoveSpeed[MAX_MOVE_TYPE] =