diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index ed8972f050..3ded41e911 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -1312,40 +1312,6 @@ namespace MWMechanics
         return true;
     }
 
-    std::string getSummonedCreature(int effectId)
-    {
-        static const std::map<int, std::string> summonMap
-        {
-            {ESM::MagicEffect::SummonAncestralGhost, "sMagicAncestralGhostID"},
-            {ESM::MagicEffect::SummonBonelord, "sMagicBonelordID"},
-            {ESM::MagicEffect::SummonBonewalker, "sMagicLeastBonewalkerID"},
-            {ESM::MagicEffect::SummonCenturionSphere, "sMagicCenturionSphereID"},
-            {ESM::MagicEffect::SummonClannfear, "sMagicClannfearID"},
-            {ESM::MagicEffect::SummonDaedroth, "sMagicDaedrothID"},
-            {ESM::MagicEffect::SummonDremora, "sMagicDremoraID"},
-            {ESM::MagicEffect::SummonFabricant, "sMagicFabricantID"},
-            {ESM::MagicEffect::SummonFlameAtronach, "sMagicFlameAtronachID"},
-            {ESM::MagicEffect::SummonFrostAtronach, "sMagicFrostAtronachID"},
-            {ESM::MagicEffect::SummonGoldenSaint, "sMagicGoldenSaintID"},
-            {ESM::MagicEffect::SummonGreaterBonewalker, "sMagicGreaterBonewalkerID"},
-            {ESM::MagicEffect::SummonHunger, "sMagicHungerID"},
-            {ESM::MagicEffect::SummonScamp, "sMagicScampID"},
-            {ESM::MagicEffect::SummonSkeletalMinion, "sMagicSkeletalMinionID"},
-            {ESM::MagicEffect::SummonStormAtronach, "sMagicStormAtronachID"},
-            {ESM::MagicEffect::SummonWingedTwilight, "sMagicWingedTwilightID"},
-            {ESM::MagicEffect::SummonWolf, "sMagicCreature01ID"},
-            {ESM::MagicEffect::SummonBear, "sMagicCreature02ID"},
-            {ESM::MagicEffect::SummonBonewolf, "sMagicCreature03ID"},
-            {ESM::MagicEffect::SummonCreature04, "sMagicCreature04ID"},
-            {ESM::MagicEffect::SummonCreature05, "sMagicCreature05ID"}
-        };
-
-        auto it = summonMap.find(effectId);
-        if (it != summonMap.end())
-            return MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(it->second)->mValue.getString();
-        return std::string();
-    }
-
     void ApplyLoopingParticlesVisitor::visit (MWMechanics::EffectKey key,
                         const std::string& /*sourceName*/, const std::string& /*sourceId*/, int /*casterActorId*/,
                         float /*magnitude*/, float /*remainingTime*/, float /*totalTime*/)
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 85e732e03d..bca93c7340 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -75,8 +75,6 @@ namespace MWMechanics
     /// @return Was the effect a tickable effect with a magnitude?
     bool effectTick(CreatureStats& creatureStats, const MWWorld::Ptr& actor, const MWMechanics::EffectKey& effectKey, float magnitude);
 
-    std::string getSummonedCreature(int effectId);
-
     class CastSpell
     {
     private:
diff --git a/apps/openmw/mwmechanics/summoning.cpp b/apps/openmw/mwmechanics/summoning.cpp
index 86d0faa9d5..d4973925b3 100644
--- a/apps/openmw/mwmechanics/summoning.cpp
+++ b/apps/openmw/mwmechanics/summoning.cpp
@@ -20,13 +20,42 @@
 namespace MWMechanics
 {
 
-    UpdateSummonedCreatures::UpdateSummonedCreatures(const MWWorld::Ptr &actor)
-        : mActor(actor)
+    std::string getSummonedCreature(int effectId)
     {
+        static const std::map<int, std::string> summonMap
+        {
+            {ESM::MagicEffect::SummonAncestralGhost, "sMagicAncestralGhostID"},
+            {ESM::MagicEffect::SummonBonelord, "sMagicBonelordID"},
+            {ESM::MagicEffect::SummonBonewalker, "sMagicLeastBonewalkerID"},
+            {ESM::MagicEffect::SummonCenturionSphere, "sMagicCenturionSphereID"},
+            {ESM::MagicEffect::SummonClannfear, "sMagicClannfearID"},
+            {ESM::MagicEffect::SummonDaedroth, "sMagicDaedrothID"},
+            {ESM::MagicEffect::SummonDremora, "sMagicDremoraID"},
+            {ESM::MagicEffect::SummonFabricant, "sMagicFabricantID"},
+            {ESM::MagicEffect::SummonFlameAtronach, "sMagicFlameAtronachID"},
+            {ESM::MagicEffect::SummonFrostAtronach, "sMagicFrostAtronachID"},
+            {ESM::MagicEffect::SummonGoldenSaint, "sMagicGoldenSaintID"},
+            {ESM::MagicEffect::SummonGreaterBonewalker, "sMagicGreaterBonewalkerID"},
+            {ESM::MagicEffect::SummonHunger, "sMagicHungerID"},
+            {ESM::MagicEffect::SummonScamp, "sMagicScampID"},
+            {ESM::MagicEffect::SummonSkeletalMinion, "sMagicSkeletalMinionID"},
+            {ESM::MagicEffect::SummonStormAtronach, "sMagicStormAtronachID"},
+            {ESM::MagicEffect::SummonWingedTwilight, "sMagicWingedTwilightID"},
+            {ESM::MagicEffect::SummonWolf, "sMagicCreature01ID"},
+            {ESM::MagicEffect::SummonBear, "sMagicCreature02ID"},
+            {ESM::MagicEffect::SummonBonewolf, "sMagicCreature03ID"},
+            {ESM::MagicEffect::SummonCreature04, "sMagicCreature04ID"},
+            {ESM::MagicEffect::SummonCreature05, "sMagicCreature05ID"}
+        };
 
+        auto it = summonMap.find(effectId);
+        if (it != summonMap.end())
+            return MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(it->second)->mValue.getString();
+        return std::string();
     }
 
-    UpdateSummonedCreatures::~UpdateSummonedCreatures()
+    UpdateSummonedCreatures::UpdateSummonedCreatures(const MWWorld::Ptr &actor)
+        : mActor(actor)
     {
     }
 
diff --git a/apps/openmw/mwmechanics/summoning.hpp b/apps/openmw/mwmechanics/summoning.hpp
index 9329dcb830..e638155a92 100644
--- a/apps/openmw/mwmechanics/summoning.hpp
+++ b/apps/openmw/mwmechanics/summoning.hpp
@@ -9,13 +9,14 @@
 
 namespace MWMechanics
 {
-
     class CreatureStats;
 
+    std::string getSummonedCreature(int effectId);
+
     struct UpdateSummonedCreatures : public EffectSourceVisitor
     {
         UpdateSummonedCreatures(const MWWorld::Ptr& actor);
-        virtual ~UpdateSummonedCreatures();
+        virtual ~UpdateSummonedCreatures() = default;
 
         virtual void visit (MWMechanics::EffectKey key,
                                  const std::string& sourceName, const std::string& sourceId, int casterActorId,
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ce06d887ca..37123099af 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -41,6 +41,7 @@
 #include "../mwmechanics/levelledlist.hpp"
 #include "../mwmechanics/combat.hpp"
 #include "../mwmechanics/aiavoiddoor.hpp" //Used to tell actors to avoid doors
+#include "../mwmechanics/summoning.hpp"
 
 #include "../mwrender/animation.hpp"
 #include "../mwrender/npcanimation.hpp"