diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 84d116848..be583ea74 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -57,7 +57,7 @@ add_openmw_dir (mwworld
     cells localscripts customdata weather inventorystore ptr actionopen actionread
     actionequip timestamp actionalchemy cellstore actionapply actioneat
     esmstore store recordcmp fallback actionrepair actionsoulgem livecellref actiondoor
-    contentloader esmloader omwloader actiontrap
+    contentloader esmloader omwloader actiontrap cellreflist
     )
 
 add_openmw_dir (mwclass
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 3d033838c..fd3978943 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -39,6 +39,12 @@ namespace ESM
     struct Spell;
     struct NPC;
     struct CellId;
+    struct Armor;
+    struct Weapon;
+    struct Clothing;
+    struct Enchantment;
+    struct Book;
+    struct EffectList;
 }
 
 namespace MWRender
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 81ca0ce2b..516a4c510 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -22,6 +22,7 @@
 #include "../mwworld/customdata.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/physicssystem.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "../mwrender/renderinginterface.hpp"
 #include "../mwrender/actors.hpp"
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index adaf62a96..6df6db297 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -3,6 +3,11 @@
 
 #include "../mwworld/class.hpp"
 
+namespace ESM
+{
+    struct GameSetting;
+}
+
 namespace MWClass
 {
     class Creature : public MWWorld::Class
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index 05ba0248b..2ac342a61 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_MWCLASS_DOOR_H
 #define GAME_MWCLASS_DOOR_H
 
+#include <components/esm/loaddoor.hpp>
+
 #include "../mwworld/class.hpp"
 
 namespace MWClass
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 3a95f3c29..e00c3b720 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -30,6 +30,7 @@
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/customdata.hpp"
 #include "../mwworld/physicssystem.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "../mwrender/actors.hpp"
 #include "../mwrender/renderinginterface.hpp"
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index bd7deca88..f8677dc20 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -5,6 +5,7 @@
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/physicssystem.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "../mwrender/objects.hpp"
 #include "../mwrender/renderinginterface.hpp"
@@ -25,7 +26,7 @@ namespace MWClass
         if(!model.empty())
             physics.addObject(ptr);
     }
-    
+
     std::string Static::getModel(const MWWorld::Ptr &ptr) const
     {
         MWWorld::LiveCellRef<ESM::Static> *ref =
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index cf8ea1176..b9284dc1a 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -13,6 +13,11 @@
 
 #include "../mwscript/compilercontext.hpp"
 
+namespace ESM
+{
+    struct Dialogue;
+}
+
 namespace MWDialogue
 {
     class DialogueManager : public MWBase::DialogueManager
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 846cff114..18ae7dd1b 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -8,8 +8,9 @@
 #include "../mwbase/dialoguemanager.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/creaturestats.hpp"
diff --git a/apps/openmw/mwgui/bookwindow.cpp b/apps/openmw/mwgui/bookwindow.cpp
index 98d963b22..884d567c5 100644
--- a/apps/openmw/mwgui/bookwindow.cpp
+++ b/apps/openmw/mwgui/bookwindow.cpp
@@ -2,6 +2,8 @@
 
 #include <boost/lexical_cast.hpp>
 
+#include <components/esm/loadbook.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -169,7 +171,7 @@ namespace MWGui
             }
             ++i;
         }
-        
+
         //If it is the last page, hide the button "Next Page"
         if (   (mCurrentPage+1)*2 == mPages.size()
             || (mCurrentPage+1)*2 == mPages.size() + 1)
@@ -194,7 +196,7 @@ namespace MWGui
         if (button->getAlign().isRight())
             button->setPosition(button->getPosition() + MyGUI::IntPoint(diff.width,0));
     }
-    
+
     void BookWindow::nextPage()
     {
         if ((mCurrentPage+1)*2 < mPages.size())
diff --git a/apps/openmw/mwgui/charactercreation.hpp b/apps/openmw/mwgui/charactercreation.hpp
index 924f40c28..03898093d 100644
--- a/apps/openmw/mwgui/charactercreation.hpp
+++ b/apps/openmw/mwgui/charactercreation.hpp
@@ -1,6 +1,9 @@
 #ifndef CHARACTER_CREATION_HPP
 #define CHARACTER_CREATION_HPP
 
+#include <components/esm/loadskil.hpp>
+#include <components/esm/loadclas.hpp>
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index f3805b255..01eb770f7 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -8,6 +8,8 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
+#include "../mwworld/esmstore.hpp"
+
 namespace MWGui
 {
     class ConsoleInterpreterContext : public MWScript::InterpreterContext
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index f56d80883..2f11a4d12 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -8,6 +8,8 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/fallback.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 267c761e2..51e160d26 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -7,7 +7,9 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
 #include "../mwworld/player.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "../mwrender/globalmap.hpp"
 
diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp
index 3c3335d8b..2a48e62a9 100644
--- a/apps/openmw/mwgui/merchantrepair.cpp
+++ b/apps/openmw/mwgui/merchantrepair.cpp
@@ -1,5 +1,7 @@
 #include "merchantrepair.hpp"
 
+#include <components/esm/loadgmst.hpp>
+
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/world.hpp"
@@ -10,6 +12,7 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp
index e1970004c..a084e6453 100644
--- a/apps/openmw/mwgui/scrollwindow.cpp
+++ b/apps/openmw/mwgui/scrollwindow.cpp
@@ -1,5 +1,7 @@
 #include "scrollwindow.hpp"
 
+#include <components/esm/loadbook.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index 3cf514dc5..74a4f88e7 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -1,5 +1,18 @@
 #include "sortfilteritemmodel.hpp"
 
+#include <components/esm/loadalch.hpp>
+#include <components/esm/loadappa.hpp>
+#include <components/esm/loadarmo.hpp>
+#include <components/esm/loadbook.hpp>
+#include <components/esm/loadclot.hpp>
+#include <components/esm/loadingr.hpp>
+#include <components/esm/loadlock.hpp>
+#include <components/esm/loadligh.hpp>
+#include <components/esm/loadmisc.hpp>
+#include <components/esm/loadprob.hpp>
+#include <components/esm/loadrepa.hpp>
+#include <components/esm/loadweap.hpp>
+
 #include "../mwworld/class.hpp"
 
 namespace
diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index 68aecf28d..77df46514 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -10,6 +10,8 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/containerstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 
diff --git a/apps/openmw/mwgui/tradeitemmodel.cpp b/apps/openmw/mwgui/tradeitemmodel.cpp
index 88c14b791..c9c65a152 100644
--- a/apps/openmw/mwgui/tradeitemmodel.cpp
+++ b/apps/openmw/mwgui/tradeitemmodel.cpp
@@ -1,5 +1,7 @@
 #include "tradeitemmodel.hpp"
 
+#include <components/misc/stringops.hpp>
+
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 348178d81..89d73215d 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -13,6 +13,8 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/cellstore.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index fd487c87f..9417d2a4b 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -10,6 +10,7 @@
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/class.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index ba9684589..f44078256 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -18,6 +18,7 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "console.hpp"
 #include "journalwindow.hpp"
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 66d93469c..314053799 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -15,13 +15,16 @@
 
 #include "../engine.hpp"
 
-#include "../mwworld/player.hpp"
-#include "../mwworld/class.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/statemanager.hpp"
+
+#include "../mwworld/player.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwworld/esmstore.hpp"
+
 #include "../mwmechanics/creaturestats.hpp"
 
 using namespace ICS;
@@ -169,7 +172,7 @@ namespace MWInput
             switch (action)
             {
             case A_GameMenu:
-                if(!(MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_Running 
+                if(!(MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_Running
                     && MWBase::Environment::get().getWindowManager()->getMode() == MWGui::GM_MainMenu))
                         toggleMainMenu ();
                 break;
@@ -283,7 +286,7 @@ namespace MWInput
 
         // Disable movement in Gui mode
         if (MWBase::Environment::get().getWindowManager()->isGuiMode()
-            || MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_Running) 
+            || MWBase::Environment::get().getStateManager()->getState() != MWBase::StateManager::State_Running)
                 return;
 
 
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 994798b0b..0c5bd9afa 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -1,8 +1,14 @@
 #include "activespells.hpp"
 
+#include <components/misc/stringops.hpp>
+
+#include <components/esm/loadmgef.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwworld/esmstore.hpp"
+
 namespace MWMechanics
 {
     void ActiveSpells::update() const
@@ -40,7 +46,7 @@ namespace MWMechanics
     void ActiveSpells::rebuildEffects() const
     {
         MWWorld::TimeStamp now = MWBase::Environment::get().getWorld()->getTimeStamp();
-    
+
         mEffects = MagicEffects();
 
         for (TIterator iter (begin()); iter!=end(); ++iter)
@@ -59,7 +65,7 @@ namespace MWMechanics
                 if (end>now)
                     mEffects.add(effectIt->mKey, MWMechanics::EffectParam(effectIt->mMagnitude));
             }
-        }    
+        }
     }
 
     ActiveSpells::ActiveSpells()
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index ea146625a..bdd7c8f3b 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -1,14 +1,14 @@
 #include "aiactivate.hpp"
-#include <iostream>
-
-#include "movement.hpp"
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
 #include "../mwworld/class.hpp"
 #include "../mwworld/action.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "steering.hpp"
+#include "movement.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index b0e0c2f7b..5be90bf2c 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -7,6 +7,8 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/timestamp.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index a58bfef05..b54f1d39c 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -1,14 +1,15 @@
 #include "aiescort.hpp"
 
-#include "movement.hpp"
-
-#include "../mwworld/class.hpp"
-#include "../mwworld/timestamp.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/timestamp.hpp"
+
 #include "steering.hpp"
+#include "movement.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index ef6ead9d7..284937546 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -1,12 +1,14 @@
 #include "aifollow.hpp"
-#include <iostream>
+
+#include <OgreMath.h>
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwworld/class.hpp"
-#include "movement.hpp"
 
-#include <OgreMath.h>
+#include "../mwworld/class.hpp"
+#include "../mwworld/cellstore.hpp"
 
+#include "movement.hpp"
 #include "steering.hpp"
 
 MWMechanics::AiFollow::AiFollow(const std::string &actorId,float duration, float x, float y, float z)
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 41226ad79..1fd719c60 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -2,7 +2,9 @@
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
 #include "../mwworld/class.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "steering.hpp"
 #include "movement.hpp"
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 012f71b72..9a95822f5 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -1,17 +1,19 @@
 #include "aiwander.hpp"
 
-#include "movement.hpp"
+#include <OgreVector3.h>
 
-#include "../mwworld/class.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/dialoguemanager.hpp"
 
-#include "creaturestats.hpp"
-#include <OgreVector3.h>
+#include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/cellstore.hpp"
 
+#include "creaturestats.hpp"
 #include "steering.hpp"
+#include "movement.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwmechanics/alchemy.hpp b/apps/openmw/mwmechanics/alchemy.hpp
index 957e3122c..31cafa4dc 100644
--- a/apps/openmw/mwmechanics/alchemy.hpp
+++ b/apps/openmw/mwmechanics/alchemy.hpp
@@ -8,6 +8,11 @@
 
 #include "../mwworld/ptr.hpp"
 
+namespace ESM
+{
+    struct Potion;
+}
+
 namespace MWMechanics
 {
     struct EffectKey;
@@ -16,29 +21,29 @@ namespace MWMechanics
     class Alchemy
     {
         public:
-        
+
             typedef std::vector<MWWorld::Ptr> TToolsContainer;
             typedef TToolsContainer::const_iterator TToolsIterator;
-    
+
             typedef std::vector<MWWorld::Ptr> TIngredientsContainer;
             typedef TIngredientsContainer::const_iterator TIngredientsIterator;
 
             typedef std::vector<ESM::ENAMstruct> TEffectsContainer;
             typedef TEffectsContainer::const_iterator TEffectsIterator;
-    
+
             enum Result
             {
                 Result_Success,
-                
+
                 Result_NoMortarAndPestle,
                 Result_LessThanTwoIngredients,
                 Result_NoName,
                 Result_NoEffects,
                 Result_RandomFailure
             };
-    
+
         private:
-    
+
             MWWorld::Ptr mAlchemist;
             TToolsContainer mTools;
             TIngredientsContainer mIngredients;
@@ -51,61 +56,61 @@ namespace MWMechanics
             void applyTools (int flags, float& value) const;
 
             void updateEffects();
-            
+
             const ESM::Potion *getRecord() const;
             ///< Return existing recrod for created potion (may return 0)
-            
+
             void removeIngredients();
             ///< Remove selected ingredients from alchemist's inventory, cleanup selected ingredients and
             /// update effect list accordingly.
 
             void addPotion (const std::string& name);
             ///< Add a potion to the alchemist's inventory.
-            
+
             void increaseSkill();
             ///< Increase alchemist's skill.
-            
+
             float getChance() const;
             ///< Return chance of success.
-            
+
             int countIngredients() const;
-            
+
         public:
-        
+
             void setAlchemist (const MWWorld::Ptr& npc);
             ///< Set alchemist and configure alchemy setup accordingly. \a npc may be empty to indicate that
             /// there is no alchemist (alchemy session has ended).
-            
+
             TToolsIterator beginTools() const;
             ///< \attention Iterates over tool slots, not over tools. Some of the slots may be empty.
-            
+
             TToolsIterator endTools() const;
-            
+
             TIngredientsIterator beginIngredients() const;
             ///< \attention Iterates over ingredient slots, not over ingredients. Some of the slots may be empty.
-            
+
             TIngredientsIterator endIngredients() const;
-            
+
             void clear();
             ///< Remove alchemist, tools and ingredients.
-            
+
             int addIngredient (const MWWorld::Ptr& ingredient);
             ///< Add ingredient into the next free slot.
             ///
             /// \return Slot index or -1, if adding failed because of no free slot or the ingredient type being
             /// listed already.
-            
+
             void removeIngredient (int index);
             ///< Remove ingredient from slot (calling this function on an empty slot is a no-op).
-            
+
             TEffectsIterator beginEffects() const;
-            
+
             TEffectsIterator endEffects() const;
-            
+
             std::string getPotionName() const;
             ///< Return the name of the potion that would be created when calling create (if a record for such
             /// a potion already exists) or return an empty string.
-            
+
             Result create (const std::string& name);
             ///< Try to create a potion from the ingredients, place it in the inventory of the alchemist and
             /// adjust the skills of the alchemist accordingly.
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index c2a26ced3..d19f32507 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -36,6 +36,7 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 namespace
 {
@@ -562,7 +563,7 @@ bool CharacterController::updateWeaponState()
             getWeaponGroup(weaptype, weapgroup);
             mAnimation->showWeapons(false);
             mAnimation->setWeaponGroup(weapgroup);
-            
+
             mAnimation->play(weapgroup, Priority_Weapon,
                              MWRender::Animation::Group_UpperBody, true,
                              1.0f, "equip start", "equip stop", 0.0f, 0);
@@ -751,7 +752,7 @@ bool CharacterController::updateWeaponState()
                                  MWRender::Animation::Group_UpperBody, false,
                                  weapSpeed, mAttackType+" start", mAttackType+" min attack",
                                  0.0f, 0);
-                mUpperBodyState = UpperCharState_StartToMinAttack;   
+                mUpperBodyState = UpperCharState_StartToMinAttack;
             }
         }
 
@@ -855,7 +856,7 @@ bool CharacterController::updateWeaponState()
 
             mUpperBodyState = UpperCharState_WeapEquiped;
             //don't allow to continue playing hit animation on UpperBody after actor had attacked during it
-            if(mHitState == CharState_Hit) 
+            if(mHitState == CharState_Hit)
             {
                 mAnimation->changeGroups(mCurrentHit, MWRender::Animation::Group_LowerBody);
                 //commenting out following 2 lines will give a bit different combat dynamics(slower)
@@ -932,7 +933,7 @@ bool CharacterController::updateWeaponState()
                                  weapSpeed, start, stop, 0.0f, 0);
         }
     }
-    
+
      //if playing combat animation and lowerbody is not busy switch to whole body animation
     if((weaptype != WeapType_None || UpperCharState_UnEquipingWeap) && animPlaying)
     {
@@ -1431,7 +1432,7 @@ void CharacterController::updateVisibility()
 void CharacterController::determineAttackType()
 {
     float * move = mPtr.getClass().getMovementSettings(mPtr).mPosition;
-    
+
     if(mPtr.getClass().hasInventoryStore(mPtr))
     {
         if (move[0] && !move[1]) //sideway
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 204264106..6aeb90dad 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -10,6 +10,7 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/windowmanager.hpp"
 
diff --git a/apps/openmw/mwmechanics/disease.hpp b/apps/openmw/mwmechanics/disease.hpp
index d3ea825cf..5f73e8acd 100644
--- a/apps/openmw/mwmechanics/disease.hpp
+++ b/apps/openmw/mwmechanics/disease.hpp
@@ -6,6 +6,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
 #include "../mwmechanics/spells.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 
diff --git a/apps/openmw/mwmechanics/pathfinding.cpp b/apps/openmw/mwmechanics/pathfinding.cpp
index 2503181ae..efa2bdf69 100644
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@@ -1,13 +1,15 @@
 #include "pathfinding.hpp"
 
-#include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
+#include <map>
 
 #include "OgreMath.h"
 #include "OgreVector3.h"
 
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
 
-#include <map>
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/cellstore.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwmechanics/pickpocket.cpp b/apps/openmw/mwmechanics/pickpocket.cpp
index 53681caf8..14abcd643 100644
--- a/apps/openmw/mwmechanics/pickpocket.cpp
+++ b/apps/openmw/mwmechanics/pickpocket.cpp
@@ -1,8 +1,11 @@
 #include "pickpocket.hpp"
 
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
 #include "npcstats.hpp"
 
 namespace MWMechanics
diff --git a/apps/openmw/mwmechanics/repair.cpp b/apps/openmw/mwmechanics/repair.cpp
index 1b17f8305..48179d344 100644
--- a/apps/openmw/mwmechanics/repair.cpp
+++ b/apps/openmw/mwmechanics/repair.cpp
@@ -10,6 +10,7 @@
 
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
diff --git a/apps/openmw/mwmechanics/security.cpp b/apps/openmw/mwmechanics/security.cpp
index 2e5eaecfd..edec45e15 100644
--- a/apps/openmw/mwmechanics/security.cpp
+++ b/apps/openmw/mwmechanics/security.cpp
@@ -2,6 +2,7 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 30072a8cc..9745cdebe 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -14,6 +14,7 @@
 #include "../mwworld/actionteleport.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "../mwrender/animation.hpp"
 
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 74dc490ea..44402fe7b 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -5,6 +5,16 @@
 
 #include <OgreVector3.h>
 
+#include <components/esm/loadskil.hpp>
+
+namespace ESM
+{
+    struct Spell;
+    struct Ingredient;
+    struct Potion;
+    struct EffectList;
+}
+
 namespace MWMechanics
 {
     class EffectKey;
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index cc239a650..354b1fd0b 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -4,6 +4,8 @@
 #include <map>
 #include <string>
 
+#include <components/misc/stringops.hpp>
+
 #include "../mwworld/ptr.hpp"
 
 #include "magiceffects.hpp"
diff --git a/apps/openmw/mwrender/activatoranimation.cpp b/apps/openmw/mwrender/activatoranimation.cpp
index 7f4be9a68..de0457e57 100644
--- a/apps/openmw/mwrender/activatoranimation.cpp
+++ b/apps/openmw/mwrender/activatoranimation.cpp
@@ -1,9 +1,11 @@
 #include "activatoranimation.hpp"
 
-#include "renderconst.hpp"
+#include <components/esm/loadacti.hpp>
 
 #include "../mwbase/world.hpp"
 
+#include "renderconst.hpp"
+
 namespace MWRender
 {
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 820857137..2ddea7682 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -11,18 +11,26 @@
 #include <OgreControllerManager.h>
 #include <OgreStaticGeometry.h>
 
+#include <components/esm/loadligh.hpp>
+#include <components/esm/loadweap.hpp>
+#include <components/esm/loadench.hpp>
+#include <components/esm/loadstat.hpp>
+
 #include <libs/openengine/ogre/lights.hpp>
 
+#include <extern/shiny/Main/Factory.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include <extern/shiny/Main/Factory.hpp>
-
 #include "../mwmechanics/character.hpp"
 #include "../mwmechanics/creaturestats.hpp"
+
 #include "../mwworld/class.hpp"
 #include "../mwworld/fallback.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "renderconst.hpp"
 
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index c0cb18010..564bb73ef 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -8,6 +8,10 @@
 
 #include "../mwworld/ptr.hpp"
 
+namespace ESM
+{
+    struct Light;
+}
 
 namespace MWRender
 {
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index e2aa9a2b8..8ef584154 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -4,12 +4,14 @@
 #include <OgreSkeletonInstance.h>
 #include <OgreBone.h>
 
-#include "renderconst.hpp"
+#include <components/esm/loadcrea.hpp>
 
 #include "../mwbase/world.hpp"
 
 #include "../mwworld/class.hpp"
 
+#include "renderconst.hpp"
+
 namespace MWRender
 {
 
diff --git a/apps/openmw/mwrender/debugging.cpp b/apps/openmw/mwrender/debugging.cpp
index 0cfcf826f..241f7e470 100644
--- a/apps/openmw/mwrender/debugging.cpp
+++ b/apps/openmw/mwrender/debugging.cpp
@@ -13,12 +13,12 @@
 #include <components/esm/loadstat.hpp>
 #include <components/esm/loadpgrd.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwbase/world.hpp" // these includes can be removed once the static-hack is gone
 #include "../mwbase/environment.hpp"
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "renderconst.hpp"
 
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 554ba22fa..772813c73 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -7,12 +7,13 @@
 #include <OgreCamera.h>
 #include <OgreTextureManager.h>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/cellstore.hpp"
+
 #include "renderconst.hpp"
 #include "renderingmanager.hpp"
 
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index e721477ee..c97e5279a 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -11,11 +11,15 @@
 #include <OgreParticleEmitter.h>
 #include <OgreStaticGeometry.h>
 
+#include <components/esm/loadligh.hpp>
+#include <components/esm/loadstat.hpp>
+
 #include <components/nifogre/ogrenifloader.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "renderconst.hpp"
 #include "animation.hpp"
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 0311c90b3..844be52d8 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -24,6 +24,7 @@
 
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "../mwbase/world.hpp" // these includes can be removed once the static-hack is gone
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index 4d1c15f1e..903612258 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -13,6 +13,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwworld/player.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "interpretercontext.hpp"
 
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index fc21c5712..d489bfaf1 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -14,6 +14,8 @@
 #include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
 
+#include <components/esm/loadskil.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
@@ -284,7 +286,7 @@ namespace MWScript
                 virtual void execute(Interpreter::Runtime &runtime)
                 {
                     MWWorld::Ptr ptr = R()(runtime);
-      
+
                     const std::string &name = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 0c60e1c94..fa8441aa5 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -13,12 +13,16 @@
 #include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
 
+#include <components/esm/loadmgef.hpp>
+#include <components/esm/loadcrea.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/scriptmanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/creaturestats.hpp"
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 13e152e68..0720e798a 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -9,6 +9,7 @@
 #include "../mwbase/statemanager.hpp"
 
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "sound_output.hpp"
 #include "sound_decoder.hpp"
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 8c59247f4..2ca7d76b3 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -23,6 +23,7 @@
 
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 
diff --git a/apps/openmw/mwworld/actioneat.cpp b/apps/openmw/mwworld/actioneat.cpp
index f5d7e2636..020bdb0ff 100644
--- a/apps/openmw/mwworld/actioneat.cpp
+++ b/apps/openmw/mwworld/actioneat.cpp
@@ -3,6 +3,8 @@
 
 #include <cstdlib>
 
+#include <components/esm/loadskil.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
@@ -19,10 +21,10 @@ namespace MWWorld
 
         // apply to actor
         std::string id = Class::get (getTarget()).getId (getTarget());
-            
+
         if (Class::get (actor).apply (actor, id, actor))
             Class::get (actor).skillUsageSucceeded (actor, ESM::Skill::Alchemy, 1);
-    }    
+    }
 
     ActionEat::ActionEat (const MWWorld::Ptr& object) : Action (false, object) {}
 }
diff --git a/apps/openmw/mwworld/cellreflist.hpp b/apps/openmw/mwworld/cellreflist.hpp
new file mode 100644
index 000000000..8240fbd2d
--- /dev/null
+++ b/apps/openmw/mwworld/cellreflist.hpp
@@ -0,0 +1,44 @@
+#ifndef GAME_MWWORLD_CELLREFLIST_H
+#define GAME_MWWORLD_CELLREFLIST_H
+
+#include <list>
+
+#include "livecellref.hpp"
+
+namespace MWWorld
+{
+    /// \brief Collection of references of one type
+    template <typename X>
+    struct CellRefList
+    {
+        typedef LiveCellRef<X> LiveRef;
+        typedef std::list<LiveRef> List;
+        List mList;
+
+        /// Search for the given reference in the given reclist from
+        /// ESMStore. Insert the reference into the list if a match is
+        /// found. If not, throw an exception.
+        /// Moved to cpp file, as we require a custom compare operator for it,
+        /// and the build will fail with an ugly three-way cyclic header dependence
+        /// so we need to pass the instantiation of the method to the linker, when
+        /// all methods are known.
+        void load (ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore);
+
+        LiveRef *find (const std::string& name)
+        {
+            for (typename List::iterator iter (mList.begin()); iter!=mList.end(); ++iter)
+                if (iter->mData.getCount() > 0 && iter->mRef.mRefID == name)
+                    return &*iter;
+
+            return 0;
+        }
+
+        LiveRef &insert (const LiveRef &item)
+        {
+            mList.push_back(item);
+            return mList.back();
+        }
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 8ce7d4fe8..74df0f79d 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -11,6 +11,7 @@
 #include "class.hpp"
 #include "esmstore.hpp"
 #include "containerstore.hpp"
+#include "cellstore.hpp"
 
 MWWorld::CellStore *MWWorld::Cells::getCellStore (const ESM::Cell *cell)
 {
diff --git a/apps/openmw/mwworld/cells.hpp b/apps/openmw/mwworld/cells.hpp
index 7ee8a3f6c..0df55b586 100644
--- a/apps/openmw/mwworld/cells.hpp
+++ b/apps/openmw/mwworld/cells.hpp
@@ -12,6 +12,7 @@ namespace ESM
     class ESMReader;
     class ESMWriter;
     struct CellId;
+    struct Cell;
 }
 
 namespace MWWorld
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 428890764..c576a0609 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -6,6 +6,7 @@
 
 #include "livecellref.hpp"
 #include "esmstore.hpp"
+#include "cellreflist.hpp"
 
 namespace ESM
 {
@@ -16,40 +17,6 @@ namespace MWWorld
 {
     class Ptr;
 
-  /// A list of cell references
-  template <typename X>
-  struct CellRefList
-  {
-    typedef LiveCellRef<X> LiveRef;
-    typedef std::list<LiveRef> List;
-    List mList;
-
-    // Search for the given reference in the given reclist from
-    // ESMStore. Insert the reference into the list if a match is
-    // found. If not, throw an exception.
-    // Moved to cpp file, as we require a custom compare operator for it,
-    // and the build will fail with an ugly three-way cyclic header dependence
-    // so we need to pass the instantiation of the method to the lnker, when
-    // all methods are known.
-    void load(ESM::CellRef &ref, bool deleted, const MWWorld::ESMStore &esmStore);
-
-    LiveRef *find (const std::string& name)
-    {
-        for (typename std::list<LiveRef>::iterator iter (mList.begin()); iter!=mList.end(); ++iter)
-        {
-            if (iter->mData.getCount() > 0 && iter->mRef.mRefID == name)
-                return &*iter;
-        }
-
-        return 0;
-    }
-
-    LiveRef &insert(const LiveRef &item) {
-        mList.push_back(item);
-        return mList.back();
-    }
-  };
-
   /// \brief Mutable state of a cell
   class CellStore
   {
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index acf429891..dd0c1b002 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -3,6 +3,19 @@
 
 #include <iterator>
 
+#include <components/esm/loadalch.hpp>
+#include <components/esm/loadappa.hpp>
+#include <components/esm/loadarmo.hpp>
+#include <components/esm/loadbook.hpp>
+#include <components/esm/loadclot.hpp>
+#include <components/esm/loadingr.hpp>
+#include <components/esm/loadlock.hpp>
+#include <components/esm/loadligh.hpp>
+#include <components/esm/loadmisc.hpp>
+#include <components/esm/loadprob.hpp>
+#include <components/esm/loadrepa.hpp>
+#include <components/esm/loadweap.hpp>
+
 #include "ptr.hpp"
 
 namespace ESM
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index 714ba47da..b4b275b6a 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -5,6 +5,11 @@
 
 #include "../mwmechanics/magiceffects.hpp"
 
+namespace ESM
+{
+    struct MagicEffect;
+}
+
 namespace MWMechanics
 {
     class NpcStats;
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 56d19c8be..1a16870da 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -15,13 +15,15 @@
 
 #include <components/nifbullet/bulletnifloader.hpp>
 
+#include <components/esm/loadgmst.hpp>
+
 #include "../mwbase/world.hpp" // FIXME
 #include "../mwbase/environment.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 
-#include <components/esm/loadgmst.hpp>
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "ptr.hpp"
 #include "class.hpp"
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index ba816d6d5..6d551ecf1 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -7,19 +7,20 @@
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/player.hpp>
 #include <components/esm/defs.hpp>
+#include <components/esm/loadbsgn.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/inventorystore.hpp"
-
 #include "../mwmechanics/movement.hpp"
 #include "../mwmechanics/npcstats.hpp"
 
 #include "class.hpp"
+#include "ptr.hpp"
+#include "inventorystore.hpp"
+#include "cellstore.hpp"
 
 namespace MWWorld
 {
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 4529ae279..b83069283 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -1,12 +1,18 @@
 #ifndef GAME_MWWORLD_PTR_H
 #define GAME_MWWORLD_PTR_H
 
-#include "cellstore.hpp"
+#include <cassert>
+
+#include <string>
+#include <sstream>
+
+#include "cellreflist.hpp"
 #include "livecellref.hpp"
 
 namespace MWWorld
 {
     class ContainerStore;
+    class CellStore;
 
     /// \brief Pointer to a LiveCellRef
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 06141db54..248d452c1 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -17,8 +17,8 @@
 #include "localscripts.hpp"
 #include "esmstore.hpp"
 #include "class.hpp"
-
 #include "cellfunctors.hpp"
+#include "cellstore.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index 665274831..af833f331 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -21,6 +21,11 @@ namespace Files
     class Collections;
 }
 
+namespace Loading
+{
+    class Listener;
+}
+
 namespace Render
 {
     class OgreRenderer;
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index c79d7ee4f..5f38ee286 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -9,6 +9,7 @@
 #include "player.hpp"
 #include "esmstore.hpp"
 #include "fallback.hpp"
+#include "cellstore.hpp"
 
 using namespace Ogre;
 using namespace MWWorld;