chore(Core/Misc): sort includes (#17776)

* chore(Cleanup): sort includes

* fix build

* fix build again

src/common/Collision/Maps/TileAssembler.cpp

@@ -20,10 +20,10 @@
 #include "MapDefines.h"
 #include "MapTree.h"
 #include "VMapDefinitions.h"
+#include <boost/filesystem.hpp>
 #include <iomanip>
 #include <set>
 #include <sstream>
-#include <boost/filesystem.hpp>
 
 using G3D::Vector3;
 using G3D::AABox;

src/common/Dynamic/ObjectRegistry.h

@@ -20,10 +20,10 @@
 
 #include "Define.h"
 #include <map>
+#include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <memory>
 
 /** ObjectRegistry holds all registry item of the same type
  */

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/server/apps/authserver/Server/AuthSession.cpp

@@ -28,10 +28,10 @@
 #include "Log.h"
 #include "RealmList.h"
 #include "SecretMgr.h"
+#include "StringConvert.h"
 #include "TOTP.h"
 #include "Timer.h"
 #include "Util.h"
-#include "StringConvert.h"
 #include <boost/lexical_cast.hpp>
 #include <openssl/crypto.h>
 

src/server/apps/worldserver/RemoteAccess/RASession.cpp

@@ -21,8 +21,8 @@
 #include "DatabaseEnv.h"
 #include "Duration.h"
 #include "Log.h"
-#include "SRP6.h"
 #include "MotdMgr.h"
+#include "SRP6.h"
 #include "Util.h"
 #include "World.h"
 #include <boost/asio/buffer.hpp>

src/server/database/Database/DatabaseWorkerPool.cpp

@@ -31,8 +31,8 @@
 #include "SQLOperation.h"
 #include "Transaction.h"
 #include "WorldDatabase.h"
-#include <mysqld_error.h>
 #include <limits>
+#include <mysqld_error.h>
 
 #ifdef ACORE_DEBUG
 #include <boost/stacktrace.hpp>

src/server/game/AI/CreatureAI.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "AreaBoundary.h"
 #include "CreatureAI.h"
+#include "AreaBoundary.h"
 #include "Creature.h"
 #include "CreatureAIImpl.h"
 #include "CreatureGroups.h"
@@ -24,8 +24,8 @@
 #include "Log.h"
 #include "MapReference.h"
 #include "Player.h"
-#include "Vehicle.h"
 #include "ScriptMgr.h"
+#include "Vehicle.h"
 #include "ZoneScript.h"
 
 //Disable CreatureAI when charmed

src/server/game/AI/CreatureAIRegistry.cpp

@@ -18,6 +18,7 @@
 #include "CreatureAIRegistry.h"
 #include "CombatAI.h"
 #include "CreatureAIFactory.h"
+#include "GameObjectAIFactory.h"
 #include "GuardAI.h"
 #include "MovementGenerator.h"
 #include "PassiveAI.h"
@@ -27,7 +28,6 @@
 #include "SmartAI.h"
 #include "TotemAI.h"
 #include "WaypointMovementGenerator.h"
-#include "GameObjectAIFactory.h"
 
 namespace AIRegistry
 {

src/server/game/AI/CreatureAISelector.cpp

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

src/server/game/AI/CreatureAISelector.h

@@ -18,6 +18,8 @@
 #ifndef ACORE_CREATUREAISELECTOR_H
 #define ACORE_CREATUREAISELECTOR_H
 
+#include "Define.h"
+
 class CreatureAI;
 class Creature;
 class MovementGenerator;
@@ -31,4 +33,5 @@ namespace FactorySelector
     AC_GAME_API MovementGenerator* SelectMovementGenerator(Unit* unit);
     AC_GAME_API GameObjectAI* SelectGameObjectAI(GameObject* go);
 }
+
 #endif

src/server/game/AI/GameObjectAIFactory.h

@@ -18,8 +18,9 @@
 #ifndef ACORE_GAMEOBJECTAIFACTORY_H
 #define ACORE_GAMEOBJECTAIFACTORY_H
 
-#include "ObjectRegistry.h"
 #include "FactoryHolder.h"
+#include "GameObjectAI.h"
+#include "ObjectRegistry.h"
 
 typedef FactoryHolder<GameObjectAI, GameObject> GameObjectAICreator;
 

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

@@ -21,8 +21,8 @@
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "CreatureAIImpl.h"
-#include "InstanceScript.h"
 #include "EventMap.h"
+#include "InstanceScript.h"
 #include "TaskScheduler.h"
 
 #define CAST_AI(a, b)   (dynamic_cast<a*>(b))

src/server/game/Addons/AddonMgr.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "AddonMgr.h"
-#include "DatabaseEnv.h"
 #include "CryptoHash.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "Timer.h"
 #include <list>

src/server/game/Autobroadcast/AutobroadcastMgr.cpp

@@ -16,10 +16,10 @@
  */
 
 #include "AutobroadcastMgr.h"
-#include "Config.h"
 #include "Chat.h"
-#include "Player.h"
+#include "Config.h"
 #include "GridNotifiers.h"
+#include "Player.h"
 
 AutobroadcastMgr* AutobroadcastMgr::instance()
 {

src/server/game/Battlegrounds/Arena.cpp

@@ -20,11 +20,11 @@
 #include "GroupMgr.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
+#include "Pet.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 #include "World.h"
 #include "WorldSession.h"
-#include "Pet.h"
-#include "ScriptMgr.h"
 //#include "WorldStatePackets.h"
 
 void ArenaScore::AppendToPacket(WorldPacket& data)

src/server/game/Battlegrounds/BattlegroundMgr.h

@@ -23,8 +23,8 @@
 #include "Common.h"
 #include "CreatureAIImpl.h"
 #include "DBCEnums.h"
-#include <unordered_map>
 #include <functional>
+#include <unordered_map>
 
 typedef std::map<uint32, Battleground*> BattlegroundContainer;
 typedef std::set<uint32> BattlegroundClientIdsContainer;

src/server/game/Battlegrounds/Zones/BattlegroundEY.h

@@ -20,8 +20,8 @@
 
 #include "Battleground.h"
 #include "BattlegroundScore.h"
-#include "Language.h"
 #include "EventMap.h"
+#include "Language.h"
 
 enum BG_EY_Events
 {

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

@@ -18,9 +18,9 @@
 #include "ChannelMgr.h"
 #include "Log.h"
 #include "Player.h"
-#include "World.h"
-#include "Tokenize.h"
 #include "StringConvert.h"
+#include "Tokenize.h"
+#include "World.h"
 
 ChannelMgr::~ChannelMgr()
 {

src/server/game/Conditions/ConditionMgr.cpp

@@ -20,8 +20,8 @@
 #include "GameEventMgr.h"
 #include "InstanceScript.h"
 #include "ObjectMgr.h"
-#include "Player.h"
 #include "Pet.h"
+#include "Player.h"
 #include "ReputationMgr.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"

src/server/game/Conditions/DisableMgr.cpp

@@ -23,9 +23,9 @@
 #include "Player.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
-#include "World.h"
-#include "Tokenize.h"
 #include "StringConvert.h"
+#include "Tokenize.h"
+#include "World.h"
 
 namespace DisableMgr
 {

src/server/game/DataStores/M2Stores.cpp

@@ -15,11 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "DBCStores.h"
+#include "M2Stores.h"
 #include "Containers.h"
+#include "DBCStores.h"
 #include "Log.h"
 #include "M2Structure.h"
-#include "M2Stores.h"
 #include "World.h"
 #include <boost/filesystem/path.hpp>
 #include <fstream>

src/server/game/DataStores/M2Structure.h

@@ -18,8 +18,8 @@
 #ifndef ACORE_M2STRUCTURE_H
 #define ACORE_M2STRUCTURE_H
 
-#include <G3D/Vector3.h>
 #include <G3D/AABox.h>
+#include <G3D/Vector3.h>
 
 // Structures for M2 file. Source: https://wowdev.wiki
 #pragma pack(push, 1)

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

@@ -17,8 +17,8 @@
 
 #include "GossipDef.h"
 #include "Formulas.h"
-#include "ObjectMgr.h"
 #include "Object.h"
+#include "ObjectMgr.h"
 #include "Opcodes.h"
 #include "Player.h"
 #include "QuestDef.h"

src/server/game/Entities/DynamicObject/DynamicObject.cpp

@@ -15,12 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "SpellAuraEffects.h"
 #include "GameTime.h"
 #include "GridNotifiers.h"
 #include "ObjectAccessor.h"
 #include "Opcodes.h"
 #include "ScriptMgr.h"
+#include "SpellAuraEffects.h"
 #include "Transport.h"
 #include "UpdateMask.h"
 #include "World.h"

src/server/game/Entities/GameObject/GameObject.h

@@ -21,10 +21,10 @@
 #include "Common.h"
 #include "DatabaseEnv.h"
 #include "G3D/Quat.h"
+#include "GameObjectData.h"
 #include "LootMgr.h"
 #include "Object.h"
 #include "SharedDefines.h"
-#include "GameObjectData.h"
 #include "Unit.h"
 #include <array>
 

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

@@ -26,9 +26,9 @@
 #include "ScriptMgr.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
-#include "WorldPacket.h"
-#include "Tokenize.h"
 #include "StringConvert.h"
+#include "Tokenize.h"
+#include "WorldPacket.h"
 
 void AddItemsSetItem(Player* player, Item* item)
 {

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

@@ -38,8 +38,10 @@
 #include "ScriptMgr.h"
 #include "SharedDefines.h"
 #include "SpellAuraEffects.h"
+#include "StringConvert.h"
 #include "TargetedMovementGenerator.h"
 #include "TemporarySummon.h"
+#include "Tokenize.h"
 #include "Totem.h"
 #include "Transport.h"
 #include "UpdateData.h"
@@ -49,8 +51,6 @@
 #include "Vehicle.h"
 #include "World.h"
 #include "WorldPacket.h"
-#include "Tokenize.h"
-#include "StringConvert.h"
 
 /// @todo: this import is not necessary for compilation and marked as unused by the IDE
 //  however, for some reasons removing it would cause a damn linking issue

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

@@ -17,8 +17,8 @@
 
 #include "Position.h"
 #include "ByteBuffer.h"
-#include "GridDefines.h"
 #include "Geometry.h"
+#include "GridDefines.h"
 #include <G3D/g3dmath.h>
 #include <sstream>
 

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

@@ -18,9 +18,9 @@
 #ifndef ACore_game_Position_h__
 #define ACore_game_Position_h__
 
-#include <cmath>
 #include "Common.h"
 #include "G3D/Vector3.h"
+#include <cmath>
 
 class ByteBuffer;
 

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

@@ -75,7 +75,9 @@
 #include "SpellAuraEffects.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
+#include "StringConvert.h"
 #include "TicketMgr.h"
+#include "Tokenize.h"
 #include "Transport.h"
 #include "UpdateData.h"
 #include "UpdateFieldFlags.h"
@@ -85,8 +87,6 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Tokenize.h"
-#include "StringConvert.h"
 
 /// @todo: this import is not necessary for compilation and marked as unused by the IDE
 //  however, for some reasons removing it would cause a damn linking issue

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

@@ -37,8 +37,8 @@
 #include "PlayerTaxi.h"
 #include "QuestDef.h"
 #include "SpellAuras.h"
-#include "SpellMgr.h"
 #include "SpellInfo.h"
+#include "SpellMgr.h"
 #include "TradeData.h"
 #include "Unit.h"
 #include "WorldSession.h"

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

@@ -62,6 +62,8 @@
 #include "SpellAuraEffects.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
+#include "StringConvert.h"
+#include "Tokenize.h"
 #include "Transport.h"
 #include "UpdateData.h"
 #include "UpdateFieldFlags.h"
@@ -70,8 +72,6 @@
 #include "Weather.h"
 #include "World.h"
 #include "WorldPacket.h"
-#include "Tokenize.h"
-#include "StringConvert.h"
 
 /// @todo: this import is not necessary for compilation and marked as unused by the IDE
 //  however, for some reasons removing it would cause a damn linking issue

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

@@ -17,8 +17,8 @@
 
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Tokenize.h"
 #include "StringConvert.h"
+#include "Tokenize.h"
 
 void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level)
 {

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

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Creature.h"
 #include "Config.h"
+#include "Creature.h"
 #include "Pet.h"
 #include "Player.h"
 #include "ScriptMgr.h"

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

@@ -58,8 +58,10 @@
 #include "SpellAuras.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
+#include "StringConvert.h"
 #include "TargetedMovementGenerator.h"
 #include "TemporarySummon.h"
+#include "Tokenize.h"
 #include "Totem.h"
 #include "TotemAI.h"
 #include "Transport.h"
@@ -68,8 +70,6 @@
 #include "Vehicle.h"
 #include "World.h"
 #include "WorldPacket.h"
-#include "Tokenize.h"
-#include "StringConvert.h"
 #include <math.h>
 
 float baseMoveSpeed[MAX_MOVE_TYPE] =

src/server/game/Entities/Unit/Unit.h

@@ -18,8 +18,8 @@
 #ifndef __UNIT_H
 #define __UNIT_H
 
-#include "EventProcessor.h"
 #include "EnumFlag.h"
+#include "EventProcessor.h"
 #include "FollowerRefMgr.h"
 #include "FollowerReference.h"
 #include "HostileRefMgr.h"

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

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Unit.h"
 #include "Define.h"
 #include "SmartEnum.h"
+#include "Unit.h"
 #include <stdexcept>
 
 namespace Acore::Impl::EnumUtilsImpl

src/server/game/Globals/ObjectMgr.cpp

@@ -22,14 +22,14 @@
 #include "CharacterCache.h"
 #include "Chat.h"
 #include "Common.h"
-#include "CreatureAIFactory.h"
 #include "Config.h"
 #include "Containers.h"
-#include "DatabaseEnv.h"
+#include "CreatureAIFactory.h"
 #include "DBCStructure.h"
+#include "DatabaseEnv.h"
 #include "DisableMgr.h"
-#include "GameObjectAIFactory.h"
 #include "GameEventMgr.h"
+#include "GameObjectAIFactory.h"
 #include "GameTime.h"
 #include "GossipDef.h"
 #include "GroupMgr.h"
@@ -45,13 +45,13 @@
 #include "Spell.h"
 #include "SpellMgr.h"
 #include "SpellScript.h"
+#include "StringConvert.h"
+#include "Tokenize.h"
 #include "Transport.h"
 #include "Unit.h"
 #include "Util.h"
 #include "Vehicle.h"
 #include "World.h"
-#include "StringConvert.h"
-#include "Tokenize.h"
 #include <boost/algorithm/string.hpp>
 
 ScriptMapMap sSpellScripts;

src/server/game/Globals/ObjectMgr.h

@@ -25,6 +25,7 @@
 #include "DatabaseEnv.h"
 #include "DynamicObject.h"
 #include "GameObject.h"
+#include "GossipDef.h"
 #include "ItemTemplate.h"
 #include "Log.h"
 #include "Mail.h"
@@ -36,7 +37,6 @@
 #include "QuestDef.h"
 #include "TemporarySummon.h"
 #include "VehicleDefines.h"
-#include "GossipDef.h"
 #include <functional>
 #include <limits>
 #include <map>

src/server/game/Grids/ObjectGridLoader.cpp

@@ -18,10 +18,10 @@
 #include "ObjectGridLoader.h"
 #include "CellImpl.h"
 #include "Corpse.h"
-#include "GridNotifiers.h"
 #include "Creature.h"
 #include "DynamicObject.h"
 #include "GameObject.h"
+#include "GridNotifiers.h"
 #include "ObjectMgr.h"
 #include "Transport.h"
 #include "Vehicle.h"

src/server/game/Groups/Group.h

@@ -18,8 +18,8 @@
 #ifndef AZEROTHCORE_GROUP_H
 #define AZEROTHCORE_GROUP_H
 
-#include "DataMap.h"
 #include "DBCEnums.h"
+#include "DataMap.h"
 #include "GroupRefMgr.h"
 #include "LootMgr.h"
 #include "QueryResult.h"

src/server/game/Handlers/CharacterHandler.cpp

@@ -35,6 +35,7 @@
 #include "Log.h"
 #include "MapMgr.h"
 #include "Metric.h"
+#include "MotdMgr.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
@@ -45,7 +46,6 @@
 #include "Realm.h"
 #include "ReputationMgr.h"
 #include "ScriptMgr.h"
-#include "MotdMgr.h"
 #include "SharedDefines.h"
 #include "SocialMgr.h"
 #include "SpellAuraEffects.h"

src/server/game/Handlers/CombatHandler.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CreatureAI.h"
 #include "CombatPackets.h"
+#include "CreatureAI.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"

src/server/game/Handlers/GroupHandler.cpp

@@ -20,9 +20,9 @@
 #include "GroupMgr.h"
 #include "Language.h"
 #include "Log.h"
+#include "MiscPackets.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
-#include "MiscPackets.h"
 #include "Pet.h"
 #include "Player.h"
 #include "ScriptMgr.h"

src/server/game/Maps/MapUpdater.cpp

@@ -15,10 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "MapUpdater.h"
 #include "DatabaseEnv.h"
 #include "LFGMgr.h"
 #include "Map.h"
-#include "MapUpdater.h"
 #include "Metric.h"
 
 class UpdateRequest

src/server/game/Motd/MotdMgr.cpp

@@ -19,9 +19,9 @@
 #include "Config.h"
 #include "Opcodes.h"
 #include "ScriptMgr.h"
+#include "Tokenize.h"
 #include "Util.h"
 #include "WorldPacket.h"
-#include "Tokenize.h"
 #include <iterator>
 
 namespace

src/server/game/Movement/MotionMaster.cpp

@@ -30,8 +30,8 @@
 #include "PointMovementGenerator.h"
 #include "RandomMovementGenerator.h"
 #include "TargetedMovementGenerator.h"
-#include "WaypointMovementGenerator.h"
 #include "WaypointMgr.h"
+#include "WaypointMovementGenerator.h"
 
 inline MovementGenerator* GetIdleMovementGenerator()
 {

src/server/game/Quests/enuminfo_QuestDef.cpp

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

src/server/game/Server/Packets/AllPackets.h

@@ -18,15 +18,15 @@
 #ifndef AllPackets_h__
 #define AllPackets_h__
 
-#include "LFGPackets.h"
 #include "BankPackets.h"
 #include "CharacterPackets.h"
 #include "ChatPackets.h"
-#include "PetPackets.h"
 #include "CombatLogPackets.h"
 #include "CombatPackets.h"
 #include "GuildPackets.h"
+#include "LFGPackets.h"
 #include "MiscPackets.h"
+#include "PetPackets.h"
 #include "TotemPackets.h"
 #include "WorldStatePackets.h"
 

src/server/game/Server/Packets/CombatPackets.h

@@ -18,8 +18,8 @@
 #ifndef CombatPackets_h__
 #define CombatPackets_h__
 
-#include "Packet.h"
 #include "ObjectGuid.h"
+#include "Packet.h"
 
 namespace WorldPackets
 {

src/server/game/Server/Packets/MiscPackets.h

@@ -18,8 +18,8 @@
 #ifndef MiscPackets_h__
 #define MiscPackets_h__
 
-#include "Packet.h"
 #include "ObjectGuid.h"
+#include "Packet.h"
 #include "Weather.h"
 
 enum WeatherState : uint32;

src/server/game/Server/Packets/PetPackets.h

@@ -18,8 +18,8 @@
 #ifndef PetPackets_h__
 #define PetPackets_h__
 
-#include "Packet.h"
 #include "ObjectGuid.h"
+#include "Packet.h"
 
 namespace WorldPackets
 {

src/server/game/Spells/SpellInfoCorrections.cpp

@@ -15,10 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "SpellInfo.h"
 #include "DBCStores.h"
 #include "DBCStructure.h"
 #include "GameGraveyard.h"
+#include "SpellInfo.h"
 #include "SpellMgr.h"
 
 inline void ApplySpellFix(std::initializer_list<uint32> spellIds, void(*fix)(SpellInfo*))

src/server/game/Spells/SpellMgr.cpp

@@ -26,12 +26,12 @@
 #include "MapMgr.h"
 #include "ObjectMgr.h"
 #include "Player.h"
+#include "ScriptMgr.h"
 #include "SharedDefines.h"
 #include "Spell.h"
 #include "SpellAuraDefines.h"
 #include "SpellAuras.h"
 #include "SpellInfo.h"
-#include "ScriptMgr.h"
 #include "World.h"
 
 bool IsPrimaryProfessionSkill(uint32 skill)

src/server/game/Tools/PlayerDump.h

@@ -18,11 +18,11 @@
 #ifndef _PLAYER_DUMP_H
 #define _PLAYER_DUMP_H
 
-#include <string>
+#include "ObjectGuid.h"
 #include <iosfwd>
 #include <map>
 #include <set>
-#include "ObjectGuid.h"
+#include <string>
 
 enum DumpTableType
 {

src/server/game/Warden/WardenPayloadMgr.cpp

@@ -16,9 +16,9 @@
  */
 
 #include "WardenPayloadMgr.h"
-#include "StringFormat.h"
 #include "Errors.h"
 #include "Log.h"
+#include "StringFormat.h"
 
 WardenPayloadMgr::WardenPayloadMgr() { }
 

src/server/game/Warden/enuminfo_WardenCheckMgr.cpp

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "WardenCheckMgr.h"
 #include "Define.h"
 #include "SmartEnum.h"
+#include "WardenCheckMgr.h"
 #include <stdexcept>
 
 namespace Acore::Impl::EnumUtilsImpl

src/server/game/World/World.cpp

@@ -59,10 +59,11 @@
 #include "Log.h"
 #include "LootItemStorage.h"
 #include "LootMgr.h"
+#include "M2Stores.h"
 #include "MMapFactory.h"
 #include "MapMgr.h"
 #include "Metric.h"
-#include "M2Stores.h"
+#include "MotdMgr.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
 #include "OutdoorPvPMgr.h"
@@ -72,7 +73,6 @@
 #include "PoolMgr.h"
 #include "Realm.h"
 #include "ScriptMgr.h"
-#include "MotdMgr.h"
 #include "SkillDiscovery.h"
 #include "SkillExtraItems.h"
 #include "SmartAI.h"

src/server/scripts/Commands/cs_debug.cpp

@@ -31,8 +31,8 @@
 #include "GridNotifiersImpl.h"
 #include "Language.h"
 #include "Log.h"
-#include "MapMgr.h"
 #include "M2Stores.h"
+#include "MapMgr.h"
 #include "ObjectMgr.h"
 #include "PoolMgr.h"
 #include "ScriptMgr.h"

src/server/scripts/Commands/cs_server.cpp

@@ -28,11 +28,11 @@
 #include "GitRevision.h"
 #include "Language.h"
 #include "ModuleMgr.h"
+#include "MotdMgr.h"
 #include "MySQLThreading.h"
 #include "Player.h"
 #include "Realm.h"
 #include "ScriptMgr.h"
-#include "MotdMgr.h"
 #include "StringConvert.h"
 #include "UpdateTime.h"
 #include "VMapFactory.h"

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp

@@ -17,8 +17,8 @@
 
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "blackrock_spire.h"
 #include "SpellScript.h"
+#include "blackrock_spire.h"
 
 enum Spells
 {

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp

@@ -20,8 +20,8 @@
 #include "InstanceScript.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "blackwing_lair.h"
 #include "SpellScript.h"
+#include "blackwing_lair.h"
 
 enum Say
 {

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp

@@ -23,9 +23,9 @@
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "SpellScript.h"
+#include "TaskScheduler.h"
 #include "TemporarySummon.h"
 #include "blackwing_lair.h"
-#include "TaskScheduler.h"
 
 enum Events
 {

src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp

@@ -15,7 +15,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "karazhan.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "ScriptMgr.h"
@@ -23,11 +22,12 @@
 #include "ScriptedEscortAI.h"
 #include "ScriptedFollowerAI.h"
 #include "ScriptedGossip.h"
-#include "SpellInfo.h"
 #include "SpellAuras.h"
+#include "SpellInfo.h"
 #include "SpellScript.h"
 #include "Unit.h"
 #include "World.h"
+#include "karazhan.h"
 
 #include <array>
 

src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp

@@ -18,9 +18,9 @@
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "karazhan.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
+#include "karazhan.h"
 
 enum Emotes
 {

src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp

@@ -22,8 +22,8 @@
 #include "SpellAuras.h"
 #include "SpellInfo.h"
 #include "SpellScript.h"
-#include "karazhan.h"
 #include "TaskScheduler.h"
+#include "karazhan.h"
 
 enum Texts
 {

src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp

@@ -24,10 +24,10 @@ EndScriptData */
 
 #include "Player.h"
 #include "ScriptMgr.h"
-#include "TaskScheduler.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "SpellInfo.h"
+#include "TaskScheduler.h"
 #include "karazhan.h"
 
 /***********************************/

src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp

@@ -34,8 +34,8 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
-#include "SpellAuras.h"
 #include "SpellAuraEffects.h"
+#include "SpellAuras.h"
 #include "SpellScript.h"
 
 enum Spells

src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "InstanceScript.h"
-#include "ScriptedCreature.h"
 #include "ScriptMgr.h"
+#include "ScriptedCreature.h"
 #include "magisters_terrace.h"
 
 ObjectData const creatureData[] =

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp

@@ -17,6 +17,7 @@
 
 #include "CombatAI.h"
 #include "CreatureTextMgr.h"
+#include "MoveSplineInit.h"
 #include "ObjectMgr.h"
 #include "PassiveAI.h"
 #include "Player.h"
@@ -27,7 +28,6 @@
 #include "SpellInfo.h"
 #include "SpellScript.h"
 #include "Vehicle.h"
-#include "MoveSplineInit.h"
 
  /*######
  ## npc_eye_of_acherus

src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp

@@ -15,17 +15,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "GridNotifiersImpl.h"
+#include "Group.h"
+#include "LFGMgr.h"
+#include "Player.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
-#include "LFGMgr.h"
-#include "Player.h"
-#include "Group.h"
-#include "SpellScript.h"
 #include "SpellAuraEffects.h"
-#include "shadowfang_keep.h"
+#include "SpellScript.h"
-#include "GridNotifiersImpl.h"
 #include "TaskScheduler.h"
+#include "shadowfang_keep.h"
 
 enum ApothecarySpells
 {

src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h

@@ -18,9 +18,9 @@
 #ifndef DEF_SHADOWFANG_H
 #define DEF_SHADOWFANG_H
 
+#include "CreatureAIImpl.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
-#include "CreatureAIImpl.h"
 
 #define DataHeader "SK"
 #define ShadowfangKeepScriptName "instance_shadowfang_keep"

src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp

@@ -21,8 +21,8 @@
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "SpellScript.h"
-#include "sunken_temple.h"
 #include "Unit.h"
+#include "sunken_temple.h"
 
 class instance_sunken_temple : public InstanceMapScript
 {

src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp

@@ -15,14 +15,14 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "Player.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Spell.h"
 #include "SpellAuras.h"
 #include "SpellScript.h"
-#include "zulgurub.h"
-#include "Player.h"
 #include "TaskScheduler.h"
+#include "zulgurub.h"
 
 enum Says
 {

src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp

@@ -16,9 +16,9 @@
  */
 
 #include "GameObjectAI.h"
-#include "SpellScript.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellScript.h"
 #include "TaskScheduler.h"
 #include "zulgurub.h"
 

src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp

@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "SharedDefines.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SharedDefines.h"
 #include "TaskScheduler.h"
 #include "zulgurub.h"
 

src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp

@@ -17,9 +17,9 @@
 
 #include "the_black_morass.h"
 #include "MoveSplineInit.h"
-#include "SmartAI.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SmartAI.h"
 
 enum medivhMisc
 {

src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp

@@ -23,8 +23,8 @@
 #include "ScriptedCreature.h"
 #include "SpellInfo.h"
 #include "SpellScript.h"
-#include "ruins_of_ahnqiraj.h"
 #include "TaskScheduler.h"
+#include "ruins_of_ahnqiraj.h"
 
 enum Texts
 {

src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp

@@ -15,11 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "SmartAI.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
+#include "SmartAI.h"
 #include "SpellScript.h"
 #include "ruins_of_ahnqiraj.h"
 

src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.cpp

@@ -15,10 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "ruins_of_ahnqiraj.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
-#include "ruins_of_ahnqiraj.h"
 
 enum Spells
 {

src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp

@@ -17,8 +17,8 @@
 
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "SpellScript.h"
 #include "SpellAuras.h"
+#include "SpellScript.h"
 #include "temple_of_ahnqiraj.h"
 
 enum Emotes

src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp

@@ -16,8 +16,8 @@
  */
 
 #include "ScriptMgr.h"
-#include "SpellScript.h"
 #include "ScriptedCreature.h"
+#include "SpellScript.h"
 #include "temple_of_ahnqiraj.h"
 
 enum Says

src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.cpp

@@ -15,12 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "temple_of_ahnqiraj.h"
 #include "MapReference.h"
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
-#include "temple_of_ahnqiraj.h"
 
 enum Spells
 {

src/server/scripts/Kalimdor/boss_azuregos.cpp

@@ -17,9 +17,9 @@
 
 #include "GameTime.h"
 #include "Player.h"
-#include "ScriptedGossip.h"
-#include "ScriptedCreature.h"
 #include "ScriptMgr.h"
+#include "ScriptedCreature.h"
+#include "ScriptedGossip.h"
 #include "SpellScript.h"
 #include "TaskScheduler.h"
 

src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp

@@ -23,8 +23,8 @@
 #include "ScriptedGossip.h"
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
-#include "Vehicle.h"
 #include "TaskScheduler.h"
+#include "Vehicle.h"
 
 enum Texts
 {

src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp

@@ -15,11 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "utgarde_pinnacle.h"
 #include "ScriptMgr.h"
 #include "SpellInfo.h"
 #include "SpellScript.h"
 #include "Unit.h"
-#include "utgarde_pinnacle.h"
 
 enum UtgardeSpells
 {

src/server/scripts/Northrend/zone_dragonblight.cpp

@@ -25,8 +25,8 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
-#include "SpellAuras.h"
 #include "SpellAuraEffects.h"
+#include "SpellAuras.h"
 #include "SpellScript.h"
 #include "Vehicle.h"
 

src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp

@@ -16,6 +16,7 @@
  */
 
 #include "OutdoorPvPTF.h"
+#include "GameTime.h"
 #include "Language.h"
 #include "MapMgr.h"
 #include "ObjectMgr.h"
@@ -24,7 +25,6 @@
 #include "ScriptMgr.h"
 #include "World.h"
 #include "WorldPacket.h"
-#include "GameTime.h"
 
 OutdoorPvPTF::OutdoorPvPTF()
 {

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp

@@ -17,8 +17,8 @@
 
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "serpent_shrine.h"
 #include "TaskScheduler.h"
+#include "serpent_shrine.h"
 
 enum Talk
 {

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp

@@ -19,8 +19,8 @@
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "serpent_shrine.h"
 #include "TaskScheduler.h"
+#include "serpent_shrine.h"
 
 enum Talk
 {

src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp

@@ -17,8 +17,8 @@
 
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "SpellScript.h"
 #include "SpellAuras.h"
+#include "SpellScript.h"
 #include "steam_vault.h"
 
 enum Texts

src/server/scripts/Outland/GruulsLair/boss_gruul.cpp

@@ -15,11 +15,11 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "PassiveAI.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 #include "gruuls_lair.h"
-#include "PassiveAI.h"
 
 enum Yells
 {

src/server/scripts/Outland/zone_netherstorm.cpp

@@ -21,8 +21,8 @@
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
-#include "SpellInfo.h"
 #include "SpellAuras.h"
+#include "SpellInfo.h"
 #include "SpellScript.h"
 
 // Ours

src/server/scripts/Spells/spell_item.cpp

@@ -24,8 +24,8 @@
 #include "Battleground.h"
 #include "GameTime.h"
 #include "ObjectMgr.h"
-#include "Player.h"
 #include "Pet.h"
+#include "Player.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SkillDiscovery.h"

src/server/scripts/World/chat_log.cpp

@@ -18,8 +18,8 @@
 #include "Channel.h"
 #include "Group.h"
 #include "Guild.h"
-#include "ScriptMgr.h"
 #include "Log.h"
+#include "ScriptMgr.h"
 
 class ChatLogScript : public PlayerScript
 {

src/server/scripts/World/server_mail.cpp

@@ -15,10 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Player.h"
-#include "ScriptMgr.h"
 #include "ObjectMgr.h"
+#include "Player.h"
 #include "QueryResult.h"
+#include "ScriptMgr.h"
 
 class ServerMailReward : public PlayerScript
 {

src/server/shared/enuminfo_SharedDefines.cpp

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

src/test/mocks/WorldMock.h

@@ -19,8 +19,8 @@
 #define AZEROTHCORE_WORLDMOCK_H
 
 #include "ArenaSpectator.h"
-#include "IWorld.h"
 #include "Duration.h"
+#include "IWorld.h"
 #include "gmock/gmock.h"
 
 #pragma GCC diagnostic push

src/tools/mmaps_generator/PathGenerator.cpp

@@ -17,8 +17,8 @@
 
 #include "MapBuilder.h"
 #include "PathCommon.h"
-#include "Util.h"
 #include "Timer.h"
+#include "Util.h"
 #include <boost/filesystem.hpp>
 
 using namespace MMAP;