4 files changed, 20 insertions, 19 deletions
diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp
index a17b9fd8b59..43bf59857b8 100644
--- a/src/server/scripts/Pet/pet_dk.cpp
+++ b/src/server/scripts/Pet/pet_dk.cpp
@@ -21,12 +21,11 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
 #include "CombatAI.h"
-#include "Cell.h"
 #include "CellImpl.h"
-#include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
+#include "MotionMaster.h"
+#include "ScriptedCreature.h"
 
 enum DeathKnightSpells
 {
diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp
index 3f08f8273ac..f45afa95901 100644
--- a/src/server/scripts/Pet/pet_generic.cpp
+++ b/src/server/scripts/Pet/pet_generic.cpp
@@ -28,9 +28,13 @@
  EndContentData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
+#include "DBCStructure.h"
+#include "Map.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
 #include "PassiveAI.h"
 #include "Player.h"
+#include "ScriptedCreature.h"
 
 enum BabyBlizzardBearMisc
 {
diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp
index d7acbed9ab5..b68511ea7f5 100644
--- a/src/server/scripts/Pet/pet_hunter.cpp
+++ b/src/server/scripts/Pet/pet_hunter.cpp
@@ -21,9 +21,11 @@
  */
 
 #include "ScriptMgr.h"
+#include "CreatureAIImpl.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 #include "SpellAuraEffects.h"
+#include "TemporarySummon.h"
 
 enum HunterSpells
 {
@@ -168,10 +170,11 @@ class spell_pet_charge : public SpellScriptLoader
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
-                if (!sSpellMgr->GetSpellInfo(SPELL_PET_SWOOP) ||
-                    !sSpellMgr->GetSpellInfo(SPELL_PET_CHARGE))
-                    return false;
-                return true;
+                return ValidateSpellInfo(
+                {
+                    SPELL_PET_SWOOP,
+                    SPELL_PET_CHARGE
+                });
             }
 
             void HandleDummy(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo)
@@ -214,9 +217,7 @@ class spell_pet_guard_dog : public SpellScriptLoader
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
-                if (!sSpellMgr->GetSpellInfo(SPELL_PET_GUARD_DOG_HAPPINESS))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_PET_GUARD_DOG_HAPPINESS });
             }
 
             bool CheckProc(ProcEventInfo& eventInfo)
@@ -266,9 +267,7 @@ class spell_pet_silverback : public SpellScriptLoader
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
-                if (!sSpellMgr->GetSpellInfo(SPELL_PET_GUARD_DOG_HAPPINESS))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_PET_GUARD_DOG_HAPPINESS });
             }
 
             bool CheckProc(ProcEventInfo& eventInfo)
diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp
index fa2e65f7104..b782f550c3b 100644
--- a/src/server/scripts/Pet/pet_mage.cpp
+++ b/src/server/scripts/Pet/pet_mage.cpp
@@ -21,14 +21,13 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
+#include "CellImpl.h"
 #include "CombatAI.h"
+#include "GridNotifiersImpl.h"
+#include "MotionMaster.h"
 #include "Pet.h"
 #include "PetAI.h"
-#include "Cell.h"
-#include "CellImpl.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
+#include "ScriptedCreature.h"
 
 enum MageSpells
 {