diff --git a/conf/playerbots.conf.dist b/conf/playerbots.conf.dist
index 3d0866f44..3e72a5058 100644
--- a/conf/playerbots.conf.dist
+++ b/conf/playerbots.conf.dist
@@ -32,7 +32,7 @@
 #        LEVELS
 #        GEAR
 #        QUESTS
-#        ACTIVITIES
+#        ACTIVITY
 #        SPELLS
 #        STRATEGIES
 #        RPG STRATEGY
diff --git a/src/Ai/Raid/Aq20/RaidAq20TriggerContext.h b/src/Ai/Raid/Aq20/RaidAq20TriggerContext.h
index b49ae1c6b..b0307ca6a 100644
--- a/src/Ai/Raid/Aq20/RaidAq20TriggerContext.h
+++ b/src/Ai/Raid/Aq20/RaidAq20TriggerContext.h
@@ -1,7 +1,6 @@
 #ifndef _PLAYERBOT_RAIDAQ20TRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDAQ20TRIGGERCONTEXT_H
 
-#include "AiObjectContext.h"
 #include "NamedObjectContext.h"
 #include "RaidAq20Triggers.h"
 
diff --git a/src/Ai/Raid/Aq20/Strategy/RaidAq20Strategy.h b/src/Ai/Raid/Aq20/Strategy/RaidAq20Strategy.h
index 97ff7453a..86bcf8e47 100644
--- a/src/Ai/Raid/Aq20/Strategy/RaidAq20Strategy.h
+++ b/src/Ai/Raid/Aq20/Strategy/RaidAq20Strategy.h
@@ -1,8 +1,6 @@
 #ifndef _PLAYERBOT_RAIDAQ20STRATEGY_H
 #define _PLAYERBOT_RAIDAQ20STRATEGY_H
 
-#include "AiObjectContext.h"
-#include "Multiplier.h"
 #include "Strategy.h"
 
 class RaidAq20Strategy : public Strategy
diff --git a/src/Ai/Raid/BlackwingLair/RaidBwlTriggerContext.h b/src/Ai/Raid/BlackwingLair/RaidBwlTriggerContext.h
index aa6b57c9f..de2ce0058 100644
--- a/src/Ai/Raid/BlackwingLair/RaidBwlTriggerContext.h
+++ b/src/Ai/Raid/BlackwingLair/RaidBwlTriggerContext.h
@@ -1,7 +1,6 @@
 #ifndef _PLAYERBOT_RAIDBWLTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDBWLTRIGGERCONTEXT_H
 
-#include "AiObjectContext.h"
 #include "NamedObjectContext.h"
 #include "RaidBwlTriggers.h"
 
diff --git a/src/Ai/Raid/BlackwingLair/Strategy/RaidBwlStrategy.h b/src/Ai/Raid/BlackwingLair/Strategy/RaidBwlStrategy.h
index 4308871c8..e09ea2f3e 100644
--- a/src/Ai/Raid/BlackwingLair/Strategy/RaidBwlStrategy.h
+++ b/src/Ai/Raid/BlackwingLair/Strategy/RaidBwlStrategy.h
@@ -2,8 +2,6 @@
 #ifndef _PLAYERBOT_RAIDBWLSTRATEGY_H
 #define _PLAYERBOT_RAIDBWLSTRATEGY_H
 
-#include "AiObjectContext.h"
-#include "Multiplier.h"
 #include "Strategy.h"
 
 class RaidBwlStrategy : public Strategy
diff --git a/src/Ai/Raid/EyeOfEternity/RaidEoETriggerContext.h b/src/Ai/Raid/EyeOfEternity/RaidEoETriggerContext.h
index 0c58f6cbf..c545e10eb 100644
--- a/src/Ai/Raid/EyeOfEternity/RaidEoETriggerContext.h
+++ b/src/Ai/Raid/EyeOfEternity/RaidEoETriggerContext.h
@@ -1,7 +1,6 @@
 #ifndef _PLAYERBOT_RAIDEOETRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDEOETRIGGERCONTEXT_H
 
-#include "AiObjectContext.h"
 #include "NamedObjectContext.h"
 #include "RaidEoETriggers.h"
 
diff --git a/src/Ai/Raid/EyeOfEternity/Strategy/RaidEoEStrategy.h b/src/Ai/Raid/EyeOfEternity/Strategy/RaidEoEStrategy.h
index eb7a147bd..ba9802116 100644
--- a/src/Ai/Raid/EyeOfEternity/Strategy/RaidEoEStrategy.h
+++ b/src/Ai/Raid/EyeOfEternity/Strategy/RaidEoEStrategy.h
@@ -1,8 +1,6 @@
 #ifndef _PLAYERBOT_RAIDEOESTRATEGY_H
 #define _PLAYERBOT_RAIDEOESTRATEGY_H
 
-#include "AiObjectContext.h"
-#include "Multiplier.h"
 #include "Strategy.h"
 
 class RaidEoEStrategy : public Strategy
diff --git a/src/Ai/Raid/GruulsLair/RaidGruulsLairTriggerContext.h b/src/Ai/Raid/GruulsLair/RaidGruulsLairTriggerContext.h
index d12b0ce46..35a0f138e 100644
--- a/src/Ai/Raid/GruulsLair/RaidGruulsLairTriggerContext.h
+++ b/src/Ai/Raid/GruulsLair/RaidGruulsLairTriggerContext.h
@@ -2,7 +2,7 @@
 #define _PLAYERBOT_RAIDGRUULSLAIRTRIGGERCONTEXT_H
 
 #include "RaidGruulsLairTriggers.h"
-#include "AiObjectContext.h"
+#include "NamedObjectContext.h"
 
 class RaidGruulsLairTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/GruulsLair/Strategy/RaidGruulsLairStrategy.h b/src/Ai/Raid/GruulsLair/Strategy/RaidGruulsLairStrategy.h
index ba6f33f07..0d41d57a8 100644
--- a/src/Ai/Raid/GruulsLair/Strategy/RaidGruulsLairStrategy.h
+++ b/src/Ai/Raid/GruulsLair/Strategy/RaidGruulsLairStrategy.h
@@ -2,7 +2,6 @@
 #define _PLAYERBOT_RAIDGRUULSLAIRSTRATEGY_H
 
 #include "Strategy.h"
-#include "Multiplier.h"
 
 class RaidGruulsLairStrategy : public Strategy
 {
diff --git a/src/Ai/Raid/Icecrown/RaidIccTriggerContext.h b/src/Ai/Raid/Icecrown/RaidIccTriggerContext.h
index 64c320c72..83f300466 100644
--- a/src/Ai/Raid/Icecrown/RaidIccTriggerContext.h
+++ b/src/Ai/Raid/Icecrown/RaidIccTriggerContext.h
@@ -1,7 +1,6 @@
 #ifndef _PLAYERBOT_RAIDICCTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDICCTRIGGERCONTEXT_H
 
-#include "AiObjectContext.h"
 #include "NamedObjectContext.h"
 #include "RaidIccTriggers.h"
 
diff --git a/src/Ai/Raid/Icecrown/Strategy/RaidIccStrategy.h b/src/Ai/Raid/Icecrown/Strategy/RaidIccStrategy.h
index 53967c334..fbd54cc64 100644
--- a/src/Ai/Raid/Icecrown/Strategy/RaidIccStrategy.h
+++ b/src/Ai/Raid/Icecrown/Strategy/RaidIccStrategy.h
@@ -1,10 +1,7 @@
 #ifndef _PLAYERBOT_RAIDICCSTRATEGY_H
 #define _PLAYERBOT_RAIDICCSTRATEGY_H
 
-#include "AiObjectContext.h"
-#include "Multiplier.h"
 #include "Strategy.h"
-#include "RaidIccMultipliers.h"
 
 class RaidIccStrategy : public Strategy
 {
diff --git a/src/Ai/Raid/Karazhan/RaidKarazhanTriggerContext.h b/src/Ai/Raid/Karazhan/RaidKarazhanTriggerContext.h
index e3f606c94..a9c430734 100644
--- a/src/Ai/Raid/Karazhan/RaidKarazhanTriggerContext.h
+++ b/src/Ai/Raid/Karazhan/RaidKarazhanTriggerContext.h
@@ -2,7 +2,7 @@
 #define _PLAYERBOT_RAIDKARAZHANTRIGGERCONTEXT_H
 
 #include "RaidKarazhanTriggers.h"
-#include "AiObjectContext.h"
+#include "NamedObjectContext.h"
 
 class RaidKarazhanTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/Karazhan/Strategy/RaidKarazhanStrategy.h b/src/Ai/Raid/Karazhan/Strategy/RaidKarazhanStrategy.h
index 7d6b16dee..4f95bf7b4 100644
--- a/src/Ai/Raid/Karazhan/Strategy/RaidKarazhanStrategy.h
+++ b/src/Ai/Raid/Karazhan/Strategy/RaidKarazhanStrategy.h
@@ -2,7 +2,6 @@
 #define _PLAYERBOT_RAIDKARAZHANSTRATEGY_H_
 
 #include "Strategy.h"
-#include "Multiplier.h"
 
 class RaidKarazhanStrategy : public Strategy
 {
diff --git a/src/Ai/Raid/Magtheridon/RaidMagtheridonTriggerContext.h b/src/Ai/Raid/Magtheridon/RaidMagtheridonTriggerContext.h
index 525fe496e..482152e0e 100644
--- a/src/Ai/Raid/Magtheridon/RaidMagtheridonTriggerContext.h
+++ b/src/Ai/Raid/Magtheridon/RaidMagtheridonTriggerContext.h
@@ -2,7 +2,7 @@
 #define _PLAYERBOT_RAIDMAGTHERIDONTRIGGERCONTEXT_H
 
 #include "RaidMagtheridonTriggers.h"
-#include "AiObjectContext.h"
+#include "NamedObjectContext.h"
 
 class RaidMagtheridonTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/Magtheridon/Strategy/RaidMagtheridonStrategy.h b/src/Ai/Raid/Magtheridon/Strategy/RaidMagtheridonStrategy.h
index 7b8ab8f9b..4d21464ae 100644
--- a/src/Ai/Raid/Magtheridon/Strategy/RaidMagtheridonStrategy.h
+++ b/src/Ai/Raid/Magtheridon/Strategy/RaidMagtheridonStrategy.h
@@ -2,7 +2,6 @@
 #define _PLAYERBOT_RAIDMAGTHERIDONSTRATEGY_H
 
 #include "Strategy.h"
-#include "Multiplier.h"
 
 class RaidMagtheridonStrategy : public Strategy
 {
diff --git a/src/Ai/Raid/MoltenCore/RaidMcTriggerContext.h b/src/Ai/Raid/MoltenCore/RaidMcTriggerContext.h
index a62d851dc..1f694fe65 100644
--- a/src/Ai/Raid/MoltenCore/RaidMcTriggerContext.h
+++ b/src/Ai/Raid/MoltenCore/RaidMcTriggerContext.h
@@ -1,7 +1,6 @@
 #ifndef _PLAYERBOT_RAIDMCTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDMCTRIGGERCONTEXT_H
 
-#include "AiObjectContext.h"
 #include "BossAuraTriggers.h"
 #include "NamedObjectContext.h"
 #include "RaidMcTriggers.h"
diff --git a/src/Ai/Raid/MoltenCore/Strategy/RaidMcStrategy.h b/src/Ai/Raid/MoltenCore/Strategy/RaidMcStrategy.h
index 45b503e93..6e77910ec 100644
--- a/src/Ai/Raid/MoltenCore/Strategy/RaidMcStrategy.h
+++ b/src/Ai/Raid/MoltenCore/Strategy/RaidMcStrategy.h
@@ -1,8 +1,6 @@
 #ifndef _PLAYERBOT_RAIDMCSTRATEGY_H
 #define _PLAYERBOT_RAIDMCSTRATEGY_H
 
-#include "AiObjectContext.h"
-#include "Multiplier.h"
 #include "Strategy.h"
 
 class RaidMcStrategy : public Strategy
diff --git a/src/Ai/Raid/Naxxramas/RaidNaxxTriggerContext.h b/src/Ai/Raid/Naxxramas/RaidNaxxTriggerContext.h
index 4d1557d56..83afc273d 100644
--- a/src/Ai/Raid/Naxxramas/RaidNaxxTriggerContext.h
+++ b/src/Ai/Raid/Naxxramas/RaidNaxxTriggerContext.h
@@ -6,7 +6,6 @@
 #ifndef _PLAYERBOT_RAIDNAXXTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDNAXXTRIGGERCONTEXT_H
 
-#include "AiObjectContext.h"
 #include "NamedObjectContext.h"
 #include "RaidNaxxTriggers.h"
 
diff --git a/src/Ai/Raid/Naxxramas/Strategy/RaidNaxxStrategy.h b/src/Ai/Raid/Naxxramas/Strategy/RaidNaxxStrategy.h
index 4b8a9a7c0..d2ce821a8 100644
--- a/src/Ai/Raid/Naxxramas/Strategy/RaidNaxxStrategy.h
+++ b/src/Ai/Raid/Naxxramas/Strategy/RaidNaxxStrategy.h
@@ -2,8 +2,6 @@
 #ifndef _PLAYERBOT_RAIDNAXXSTRATEGY_H
 #define _PLAYERBOT_RAIDNAXXSTRATEGY_H
 
-#include "AiObjectContext.h"
-#include "Multiplier.h"
 #include "Strategy.h"
 
 class RaidNaxxStrategy : public Strategy
diff --git a/src/Ai/Raid/ObsidianSanctum/RaidOsTriggerContext.h b/src/Ai/Raid/ObsidianSanctum/RaidOsTriggerContext.h
index b8a1f4b31..3c1d40692 100644
--- a/src/Ai/Raid/ObsidianSanctum/RaidOsTriggerContext.h
+++ b/src/Ai/Raid/ObsidianSanctum/RaidOsTriggerContext.h
@@ -1,7 +1,6 @@
 #ifndef _PLAYERBOT_RAIDOSTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDOSTRIGGERCONTEXT_H
 
-#include "AiObjectContext.h"
 #include "NamedObjectContext.h"
 #include "RaidOsTriggers.h"
 
diff --git a/src/Ai/Raid/ObsidianSanctum/Strategy/RaidOsStrategy.h b/src/Ai/Raid/ObsidianSanctum/Strategy/RaidOsStrategy.h
index 44983f1fa..0d9ae7871 100644
--- a/src/Ai/Raid/ObsidianSanctum/Strategy/RaidOsStrategy.h
+++ b/src/Ai/Raid/ObsidianSanctum/Strategy/RaidOsStrategy.h
@@ -1,8 +1,6 @@
 #ifndef _PLAYERBOT_RAIDOSSTRATEGY_H
 #define _PLAYERBOT_RAIDOSSTRATEGY_H
 
-#include "AiObjectContext.h"
-#include "Multiplier.h"
 #include "Strategy.h"
 
 class RaidOsStrategy : public Strategy
diff --git a/src/Ai/Raid/Onyxia/RaidOnyxiaTriggerContext.h b/src/Ai/Raid/Onyxia/RaidOnyxiaTriggerContext.h
index dba18f564..daf624a0b 100644
--- a/src/Ai/Raid/Onyxia/RaidOnyxiaTriggerContext.h
+++ b/src/Ai/Raid/Onyxia/RaidOnyxiaTriggerContext.h
@@ -1,7 +1,6 @@
 #ifndef _PLAYERBOT_RAIDONYXIATRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDONYXIATRIGGERCONTEXT_H
 
-#include "AiObjectContext.h"
 #include "NamedObjectContext.h"
 #include "RaidOnyxiaTriggers.h"
 
diff --git a/src/Ai/Raid/SerpentshrineCavern/RaidSSCTriggerContext.h b/src/Ai/Raid/SerpentshrineCavern/RaidSSCTriggerContext.h
index 737fd3a38..5b0f8d5e3 100644
--- a/src/Ai/Raid/SerpentshrineCavern/RaidSSCTriggerContext.h
+++ b/src/Ai/Raid/SerpentshrineCavern/RaidSSCTriggerContext.h
@@ -7,7 +7,7 @@
 #define _PLAYERBOT_RAIDSSCTRIGGERCONTEXT_H
 
 #include "RaidSSCTriggers.h"
-#include "AiObjectContext.h"
+#include "NamedObjectContext.h"
 
 class RaidSSCTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/SerpentshrineCavern/Strategy/RaidSSCStrategy.h b/src/Ai/Raid/SerpentshrineCavern/Strategy/RaidSSCStrategy.h
index a994600ba..08d315d5a 100644
--- a/src/Ai/Raid/SerpentshrineCavern/Strategy/RaidSSCStrategy.h
+++ b/src/Ai/Raid/SerpentshrineCavern/Strategy/RaidSSCStrategy.h
@@ -7,7 +7,6 @@
 #define _PLAYERBOT_RAIDSSCSTRATEGY_H_
 
 #include "Strategy.h"
-#include "Multiplier.h"
 
 class RaidSSCStrategy : public Strategy
 {
diff --git a/src/Ai/Raid/TempestKeep/RaidTempestKeepTriggerContext.h b/src/Ai/Raid/TempestKeep/RaidTempestKeepTriggerContext.h
index c6b4922d7..0bf1d0fdc 100644
--- a/src/Ai/Raid/TempestKeep/RaidTempestKeepTriggerContext.h
+++ b/src/Ai/Raid/TempestKeep/RaidTempestKeepTriggerContext.h
@@ -2,7 +2,7 @@
 #define _PLAYERBOT_RAIDTEMPESTKEEPTRIGGERCONTEXT_H
 
 #include "RaidTempestKeepTriggers.h"
-#include "AiObjectContext.h"
+#include "NamedObjectContext.h"
 
 class RaidTempestKeepTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/TempestKeep/Strategy/RaidTempestKeepStrategy.h b/src/Ai/Raid/TempestKeep/Strategy/RaidTempestKeepStrategy.h
index 77fd29c36..b19600bab 100644
--- a/src/Ai/Raid/TempestKeep/Strategy/RaidTempestKeepStrategy.h
+++ b/src/Ai/Raid/TempestKeep/Strategy/RaidTempestKeepStrategy.h
@@ -2,7 +2,6 @@
 #define _PLAYERBOT_RAIDTEMPESTKEEPSTRATEGY_H_
 
 #include "Strategy.h"
-#include "Multiplier.h"
 
 class RaidTempestKeepStrategy : public Strategy
 {
diff --git a/src/Ai/Raid/Ulduar/RaidUlduarTriggerContext.h b/src/Ai/Raid/Ulduar/RaidUlduarTriggerContext.h
index e4243fb10..e093f5797 100644
--- a/src/Ai/Raid/Ulduar/RaidUlduarTriggerContext.h
+++ b/src/Ai/Raid/Ulduar/RaidUlduarTriggerContext.h
@@ -6,7 +6,6 @@
 #ifndef _PLAYERBOT_RAIDULDUARTRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDULDUARTRIGGERCONTEXT_H
 
-#include "AiObjectContext.h"
 #include "NamedObjectContext.h"
 #include "RaidUlduarTriggers.h"
 #include "BossAuraTriggers.h"
diff --git a/src/Ai/Raid/Ulduar/Strategy/RaidUlduarStrategy.h b/src/Ai/Raid/Ulduar/Strategy/RaidUlduarStrategy.h
index bb2feefe4..c391f6bdb 100644
--- a/src/Ai/Raid/Ulduar/Strategy/RaidUlduarStrategy.h
+++ b/src/Ai/Raid/Ulduar/Strategy/RaidUlduarStrategy.h
@@ -2,7 +2,6 @@
 #ifndef _PLAYERBOT_RAIDULDUARSTRATEGY_H
 #define _PLAYERBOT_RAIDULDUARSTRATEGY_H
 
-#include "AiObjectContext.h"
 #include "Strategy.h"
 
 class RaidUlduarStrategy : public Strategy
diff --git a/src/Ai/Raid/VaultOfArchavon/RaidVoATriggerContext.h b/src/Ai/Raid/VaultOfArchavon/RaidVoATriggerContext.h
index 6566793fd..6cb5e0f38 100644
--- a/src/Ai/Raid/VaultOfArchavon/RaidVoATriggerContext.h
+++ b/src/Ai/Raid/VaultOfArchavon/RaidVoATriggerContext.h
@@ -6,7 +6,6 @@
 #ifndef _PLAYERBOT_RAIDVOATRIGGERCONTEXT_H
 #define _PLAYERBOT_RAIDVOATRIGGERCONTEXT_H
 
-#include "AiObjectContext.h"
 #include "BossAuraTriggers.h"
 #include "NamedObjectContext.h"
 #include "RaidVoATriggers.h"
diff --git a/src/Ai/Raid/VaultOfArchavon/Strategy/RaidVoAStrategy.h b/src/Ai/Raid/VaultOfArchavon/Strategy/RaidVoAStrategy.h
index 04ed2ac3a..c30261fe8 100644
--- a/src/Ai/Raid/VaultOfArchavon/Strategy/RaidVoAStrategy.h
+++ b/src/Ai/Raid/VaultOfArchavon/Strategy/RaidVoAStrategy.h
@@ -3,10 +3,6 @@
 #define _PLAYERBOT_RAIDVOASTRATEGY_H
 
 #include "Strategy.h"
-#include "PlayerbotAI.h"
-#include "string"
-#include "Trigger.h"
-#include "vector"
 
 class RaidVoAStrategy : public Strategy
 {
diff --git a/src/Ai/Raid/ZulAman/RaidZulAmanTriggerContext.h b/src/Ai/Raid/ZulAman/RaidZulAmanTriggerContext.h
index 5be8bad7f..cb8bac864 100644
--- a/src/Ai/Raid/ZulAman/RaidZulAmanTriggerContext.h
+++ b/src/Ai/Raid/ZulAman/RaidZulAmanTriggerContext.h
@@ -7,7 +7,7 @@
 #define _PLAYERBOT_RAIDZULAMANTRIGGERCONTEXT_H
 
 #include "RaidZulAmanTriggers.h"
-#include "AiObjectContext.h"
+#include "NamedObjectContext.h"
 
 class RaidZulAmanTriggerContext : public NamedObjectContext<Trigger>
 {
diff --git a/src/Ai/Raid/ZulAman/Strategy/RaidZulAmanStrategy.h b/src/Ai/Raid/ZulAman/Strategy/RaidZulAmanStrategy.h
index c49e08888..2cb5e8171 100644
--- a/src/Ai/Raid/ZulAman/Strategy/RaidZulAmanStrategy.h
+++ b/src/Ai/Raid/ZulAman/Strategy/RaidZulAmanStrategy.h
@@ -7,7 +7,6 @@
 #define _PLAYERBOT_RAIDZULAMANSTRATEGY_H_
 
 #include "Strategy.h"
-#include "Multiplier.h"
 
 class RaidZulAmanStrategy : public Strategy
 {
diff --git a/src/Bot/PlayerbotAI.cpp b/src/Bot/PlayerbotAI.cpp
index 357678928..8feb87cb5 100644
--- a/src/Bot/PlayerbotAI.cpp
+++ b/src/Bot/PlayerbotAI.cpp
@@ -54,9 +54,9 @@
 #include "Unit.h"
 #include "UpdateTime.h"
 #include "Vehicle.h"
-#include "../../../../src/server/scripts/Spells/spell_dk.cpp"
 
-const int SPELL_TITAN_GRIP = 49152;
+constexpr uint32 SPELL_TITAN_GRIP = 49152;
+constexpr uint32 SPELL_DK_FROST_PRESENCE = 48263;
 
 std::vector<std::string> PlayerbotAI::dispel_whitelist = {
     "mutating injection",