diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index b1660559e6..ad9a6c76d9 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -28,6 +28,10 @@
 
 namespace MWClass
 {
+    Activator::Activator()
+        : MWWorld::RegisteredClass<Activator>(ESM::Activator::sRecordId)
+    {
+    }
 
     void Activator::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -84,13 +88,6 @@ namespace MWClass
         return ref->mBase->mScript;
     }
 
-    void Activator::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Activator);
-
-        registerClass (ESM::Activator::sRecordId, instance);
-    }
-
     bool Activator::hasToolTip (const MWWorld::ConstPtr& ptr) const
     {
         return !getName(ptr).empty();
diff --git a/apps/openmw/mwclass/activator.hpp b/apps/openmw/mwclass/activator.hpp
index 48a679e0b7..d5c251d9d1 100644
--- a/apps/openmw/mwclass/activator.hpp
+++ b/apps/openmw/mwclass/activator.hpp
@@ -1,19 +1,21 @@
 #ifndef GAME_MWCLASS_ACTIVATOR_H
 #define GAME_MWCLASS_ACTIVATOR_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Activator : public MWWorld::Class
+    class Activator final : public MWWorld::RegisteredClass<Activator>
     {
+            friend MWWorld::RegisteredClass<Activator>;
+
+            Activator();
 
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
             static int getSndGenTypeFromName(const std::string &name);
 
         public:
-
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
@@ -36,8 +38,6 @@ namespace MWClass
             std::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr, const MWWorld::Ptr& actor) const override;
             ///< Generate action for activation
 
-            static void registerSelf();
-
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
 
             bool useAnim() const override;
diff --git a/apps/openmw/mwclass/actor.hpp b/apps/openmw/mwclass/actor.hpp
index 82055e2500..f2d080a64f 100644
--- a/apps/openmw/mwclass/actor.hpp
+++ b/apps/openmw/mwclass/actor.hpp
@@ -17,7 +17,7 @@ namespace MWClass
     {
     protected:
 
-        Actor() = default;
+        explicit Actor(unsigned type) : Class(type) {}
 
         template <class GMST>
         float getSwimSpeedImpl(const MWWorld::Ptr& ptr, const GMST& gmst, const MWMechanics::MagicEffects& mageffects, float baseSpeed) const
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 76bee280bc..021e81346d 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -18,6 +18,10 @@
 
 namespace MWClass
 {
+    Apparatus::Apparatus()
+        : MWWorld::RegisteredClass<Apparatus>(ESM::Apparatus::sRecordId)
+    {
+    }
 
     void Apparatus::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -65,13 +69,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Apparatus::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Apparatus);
-
-        registerClass (ESM::Apparatus::sRecordId, instance);
-    }
-
     std::string Apparatus::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Apparatus Up");
diff --git a/apps/openmw/mwclass/apparatus.hpp b/apps/openmw/mwclass/apparatus.hpp
index 828abef25e..ec84a75196 100644
--- a/apps/openmw/mwclass/apparatus.hpp
+++ b/apps/openmw/mwclass/apparatus.hpp
@@ -1,12 +1,15 @@
 #ifndef GAME_MWCLASS_APPARATUS_H
 #define GAME_MWCLASS_APPARATUS_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Apparatus : public MWWorld::Class
+    class Apparatus : public MWWorld::RegisteredClass<Apparatus>
     {
+            friend MWWorld::RegisteredClass<Apparatus>;
+
+            Apparatus();
 
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
@@ -33,8 +36,6 @@ namespace MWClass
             MWGui::ToolTipInfo getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const override;
             ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 5dfc5e12f1..cffc112641 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -26,6 +26,10 @@
 
 namespace MWClass
 {
+    Armor::Armor()
+        : MWWorld::RegisteredClass<Armor>(ESM::Armor::sRecordId)
+    {
+    }
 
     void Armor::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -159,13 +163,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Armor::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Armor);
-
-        registerClass (ESM::Armor::sRecordId, instance);
-    }
-
     std::string Armor::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         int es = getEquipmentSkill(ptr);
diff --git a/apps/openmw/mwclass/armor.hpp b/apps/openmw/mwclass/armor.hpp
index f64f138a29..00fb23defa 100644
--- a/apps/openmw/mwclass/armor.hpp
+++ b/apps/openmw/mwclass/armor.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_ARMOR_H
 #define GAME_MWCLASS_ARMOR_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Armor : public MWWorld::Class
+    class Armor : public MWWorld::RegisteredClass<Armor>
     {
+            friend MWWorld::RegisteredClass<Armor>;
+
+            Armor();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -46,8 +50,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/bodypart.cpp b/apps/openmw/mwclass/bodypart.cpp
index 06b460f75c..ecc59f5459 100644
--- a/apps/openmw/mwclass/bodypart.cpp
+++ b/apps/openmw/mwclass/bodypart.cpp
@@ -7,6 +7,10 @@
 
 namespace MWClass
 {
+    BodyPart::BodyPart()
+        : MWWorld::RegisteredClass<BodyPart>(ESM::BodyPart::sRecordId)
+    {
+    }
 
     MWWorld::Ptr BodyPart::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
     {
@@ -32,13 +36,6 @@ namespace MWClass
         return false;
     }
 
-    void BodyPart::registerSelf()
-    {
-        std::shared_ptr<MWWorld::Class> instance (new BodyPart);
-
-        registerClass (ESM::BodyPart::sRecordId, instance);
-    }
-
     std::string BodyPart::getModel(const MWWorld::ConstPtr &ptr) const
     {
         const MWWorld::LiveCellRef<ESM::BodyPart> *ref = ptr.get<ESM::BodyPart>();
diff --git a/apps/openmw/mwclass/bodypart.hpp b/apps/openmw/mwclass/bodypart.hpp
index 0e372b884a..fb6c813f53 100644
--- a/apps/openmw/mwclass/bodypart.hpp
+++ b/apps/openmw/mwclass/bodypart.hpp
@@ -1,13 +1,17 @@
 #ifndef GAME_MWCLASS_BODYPART_H
 #define GAME_MWCLASS_BODYPART_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
 
-    class BodyPart : public MWWorld::Class
+    class BodyPart : public MWWorld::RegisteredClass<BodyPart>
     {
+        friend MWWorld::RegisteredClass<BodyPart>;
+
+        BodyPart();
+
         MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
     public:
@@ -21,8 +25,6 @@ namespace MWClass
         bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
         ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-        static void registerSelf();
-
         std::string getModel(const MWWorld::ConstPtr &ptr) const override;
     };
 
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index f9350222f1..1c826a049d 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -23,6 +23,10 @@
 
 namespace MWClass
 {
+    Book::Book()
+        : MWWorld::RegisteredClass<Book>(ESM::Book::sRecordId)
+    {
+    }
 
     void Book::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -82,13 +86,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Book::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Book);
-
-        registerClass (ESM::Book::sRecordId, instance);
-    }
-
     std::string Book::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Book Up");
diff --git a/apps/openmw/mwclass/book.hpp b/apps/openmw/mwclass/book.hpp
index f3d34c5168..d78d9c7500 100644
--- a/apps/openmw/mwclass/book.hpp
+++ b/apps/openmw/mwclass/book.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_BOOK_H
 #define GAME_MWCLASS_BOOK_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Book : public MWWorld::Class
+    class Book : public MWWorld::RegisteredClass<Book>
     {
+            friend MWWorld::RegisteredClass<Book>;
+
+            Book();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -30,8 +34,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index a5f5d828c9..02ab337a2b 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -21,6 +21,10 @@
 
 namespace MWClass
 {
+    Clothing::Clothing()
+        : MWWorld::RegisteredClass<Clothing>(ESM::Clothing::sRecordId)
+    {
+    }
 
     void Clothing::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -117,13 +121,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Clothing::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Clothing);
-
-        registerClass (ESM::Clothing::sRecordId, instance);
-    }
-
     std::string Clothing::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
diff --git a/apps/openmw/mwclass/clothing.hpp b/apps/openmw/mwclass/clothing.hpp
index 3d5c162aa4..a044b13804 100644
--- a/apps/openmw/mwclass/clothing.hpp
+++ b/apps/openmw/mwclass/clothing.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_CLOTHING_H
 #define GAME_MWCLASS_CLOTHING_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Clothing : public MWWorld::Class
+    class Clothing : public MWWorld::RegisteredClass<Clothing>
     {
+            friend MWWorld::RegisteredClass<Clothing>;
+
+            Clothing();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -38,8 +42,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index b98ba43df4..296813f155 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -54,8 +54,9 @@ namespace MWClass
     }
 
     Container::Container()
+        : MWWorld::RegisteredClass<Container>(ESM::Container::sRecordId)
+        , mHarvestEnabled(Settings::Manager::getBool("graphic herbalism", "Game"))
     {
-        mHarvestEnabled = Settings::Manager::getBool("graphic herbalism", "Game");
     }
 
     void Container::ensureCustomData (const MWWorld::Ptr& ptr) const
@@ -236,13 +237,6 @@ namespace MWClass
         return ref->mBase->mScript;
     }
 
-    void Container::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Container);
-
-        registerClass (ESM::Container::sRecordId, instance);
-    }
-
     bool Container::hasToolTip (const MWWorld::ConstPtr& ptr) const
     {
         if (const MWWorld::CustomData* data = ptr.getRefData().getCustomData())
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index 0b290a73e1..0da53508d2 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_MWCLASS_CONTAINER_H
 #define GAME_MWCLASS_CONTAINER_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/customdata.hpp"
 
@@ -26,9 +26,13 @@ namespace MWClass
         friend class Container;
     };
 
-    class Container : public MWWorld::Class
+    class Container : public MWWorld::RegisteredClass<Container>
     {
-            bool mHarvestEnabled;
+            friend MWWorld::RegisteredClass<Container>;
+
+            const bool mHarvestEnabled;
+
+            Container();
 
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
@@ -37,8 +41,6 @@ namespace MWClass
             bool canBeHarvested(const MWWorld::ConstPtr& ptr) const;
 
         public:
-            Container();
-
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
 
@@ -81,8 +83,6 @@ namespace MWClass
             void writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const override;
             ///< Write additional state from \a ptr into \a state.
 
-            static void registerSelf();
-
             void respawn (const MWWorld::Ptr& ptr) const override;
 
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 6a633bc668..68aea5730f 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -78,6 +78,11 @@ namespace MWClass
     {
     }
 
+    Creature::Creature()
+        : MWWorld::RegisteredClass<Creature, Actor>(ESM::Creature::sRecordId)
+    {
+    }
+
     const Creature::GMST& Creature::getGmst()
     {
         static const GMST staticGmst = []
@@ -496,13 +501,6 @@ namespace MWClass
         return isFlagBitSet(ptr, ESM::Creature::Essential);
     }
 
-    void Creature::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Creature);
-
-        registerClass (ESM::Creature::sRecordId, instance);
-    }
-
     float Creature::getMaxSpeed(const MWWorld::Ptr &ptr) const
     {
         const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 5bb5030348..3b1c070ce7 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_MWCLASS_CREATURE_H
 #define GAME_MWCLASS_CREATURE_H
 
+#include "../mwworld/registeredclass.hpp"
+
 #include "actor.hpp"
 
 namespace ESM
@@ -10,8 +12,12 @@ namespace ESM
 
 namespace MWClass
 {
-    class Creature : public Actor
+    class Creature : public MWWorld::RegisteredClass<Creature, Actor>
     {
+            friend MWWorld::RegisteredClass<Creature, Actor>;
+
+            Creature();
+
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
@@ -96,8 +102,6 @@ namespace MWClass
 
             float getMaxSpeed (const MWWorld::Ptr& ptr) const override;
 
-            static void registerSelf();
-
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
 
             void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index de40030a80..f22fbaebaa 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -28,6 +28,11 @@ namespace MWClass
         }
     };
 
+    CreatureLevList::CreatureLevList()
+        : MWWorld::RegisteredClass<CreatureLevList>(ESM::CreatureLevList::sRecordId)
+    {
+    }
+
     MWWorld::Ptr CreatureLevList::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
     {
         const MWWorld::LiveCellRef<ESM::CreatureLevList> *ref = ptr.get<ESM::CreatureLevList>();
@@ -91,13 +96,6 @@ namespace MWClass
             customData.mSpawn = true;
     }
 
-    void CreatureLevList::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new CreatureLevList);
-
-        registerClass (ESM::CreatureLevList::sRecordId, instance);
-    }
-
     void CreatureLevList::getModelsToPreload(const MWWorld::Ptr &ptr, std::vector<std::string> &models) const
     {
         // disable for now, too many false positives
diff --git a/apps/openmw/mwclass/creaturelevlist.hpp b/apps/openmw/mwclass/creaturelevlist.hpp
index b3a940682c..81c2f80070 100644
--- a/apps/openmw/mwclass/creaturelevlist.hpp
+++ b/apps/openmw/mwclass/creaturelevlist.hpp
@@ -1,13 +1,17 @@
 #ifndef GAME_MWCLASS_CREATURELEVLIST_H
 #define GAME_MWCLASS_CREATURELEVLIST_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class CreatureLevList : public MWWorld::Class
+    class CreatureLevList : public MWWorld::RegisteredClass<CreatureLevList>
     {
-        void ensureCustomData (const MWWorld::Ptr& ptr) const;
+            friend MWWorld::RegisteredClass<CreatureLevList>;
+
+            CreatureLevList();
+
+            void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
         public:
 
@@ -17,8 +21,6 @@ namespace MWClass
             bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
             ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            static void registerSelf();
-
             void getModelsToPreload(const MWWorld::Ptr& ptr, std::vector<std::string>& models) const override;
             ///< Get a list of models to preload that this object may use (directly or indirectly). default implementation: list getModel().
 
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index da8eb193d5..ff4efbc1ba 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -46,6 +46,11 @@ namespace MWClass
         }
     };
 
+    Door::Door()
+        : MWWorld::RegisteredClass<Door>(ESM::Door::sRecordId)
+    {
+    }
+
     void Door::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
         if (!model.empty())
@@ -259,13 +264,6 @@ namespace MWClass
         return ref->mBase->mScript;
     }
 
-    void Door::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Door);
-
-        registerClass (ESM::Door::sRecordId, instance);
-    }
-
     MWGui::ToolTipInfo Door::getToolTipInfo (const MWWorld::ConstPtr& ptr, int count) const
     {
         const MWWorld::LiveCellRef<ESM::Door> *ref = ptr.get<ESM::Door>();
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index e09d0de6c0..fd824c4732 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -3,12 +3,16 @@
 
 #include <components/esm3/loaddoor.hpp>
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Door : public MWWorld::Class
+    class Door : public MWWorld::RegisteredClass<Door>
     {
+            friend MWWorld::RegisteredClass<Door>;
+
+            Door();
+
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
@@ -46,8 +50,6 @@ namespace MWClass
             std::string getScript (const MWWorld::ConstPtr& ptr) const override;
             ///< Return name of the script attached to ptr
 
-            static void registerSelf();
-
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
 
             MWWorld::DoorState getDoorState (const MWWorld::ConstPtr &ptr) const override;
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 424996e417..e0e71902c7 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -20,6 +20,10 @@
 
 namespace MWClass
 {
+    Ingredient::Ingredient()
+        : MWWorld::RegisteredClass<Ingredient>(ESM::Ingredient::sRecordId)
+    {
+    }
 
     void Ingredient::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -77,13 +81,6 @@ namespace MWClass
         return action;
     }
 
-    void Ingredient::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Ingredient);
-
-        registerClass (ESM::Ingredient::sRecordId, instance);
-    }
-
     std::string Ingredient::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Ingredient Up");
diff --git a/apps/openmw/mwclass/ingredient.hpp b/apps/openmw/mwclass/ingredient.hpp
index 2aa831f868..2abb2f343c 100644
--- a/apps/openmw/mwclass/ingredient.hpp
+++ b/apps/openmw/mwclass/ingredient.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_INGREDIENT_H
 #define GAME_MWCLASS_INGREDIENT_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Ingredient : public MWWorld::Class
+    class Ingredient : public MWWorld::RegisteredClass<Ingredient>
     {
+            friend MWWorld::RegisteredClass<Ingredient>;
+
+            Ingredient();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -32,8 +36,6 @@ namespace MWClass
 
             std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
-            
-            static void registerSelf();
 
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
diff --git a/apps/openmw/mwclass/itemlevlist.cpp b/apps/openmw/mwclass/itemlevlist.cpp
index 920c6a5d22..2624be4aa8 100644
--- a/apps/openmw/mwclass/itemlevlist.cpp
+++ b/apps/openmw/mwclass/itemlevlist.cpp
@@ -4,6 +4,10 @@
 
 namespace MWClass
 {
+    ItemLevList::ItemLevList()
+        : MWWorld::RegisteredClass<ItemLevList>(ESM::ItemLevList::sRecordId)
+    {
+    }
 
     std::string ItemLevList::getName (const MWWorld::ConstPtr& ptr) const
     {
@@ -14,11 +18,4 @@ namespace MWClass
     {
         return false;
     }
-
-    void ItemLevList::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new ItemLevList);
-
-        registerClass (ESM::ItemLevList::sRecordId, instance);
-    }
 }
diff --git a/apps/openmw/mwclass/itemlevlist.hpp b/apps/openmw/mwclass/itemlevlist.hpp
index 771f8b7a76..d7377bbcb4 100644
--- a/apps/openmw/mwclass/itemlevlist.hpp
+++ b/apps/openmw/mwclass/itemlevlist.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_ITEMLEVLIST_H
 #define GAME_MWCLASS_ITEMLEVLIST_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class ItemLevList : public MWWorld::Class
+    class ItemLevList : public MWWorld::RegisteredClass<ItemLevList>
     {
+            friend MWWorld::RegisteredClass<ItemLevList>;
+
+            ItemLevList();
+
         public:
 
             std::string getName (const MWWorld::ConstPtr& ptr) const override;
@@ -14,8 +18,6 @@ namespace MWClass
 
             bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
             ///< @return true if this object has a tooltip when focused (default implementation: true)
-
-            static void registerSelf();
     };
 }
 
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 070b769b83..90080784a9 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -23,6 +23,10 @@
 
 namespace MWClass
 {
+    Light::Light()
+        : MWWorld::RegisteredClass<Light>(ESM::Light::sRecordId)
+    {
+    }
 
     void Light::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -120,13 +124,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Light::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Light);
-
-        registerClass (ESM::Light::sRecordId, instance);
-    }
-
     std::string Light::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Misc Up");
diff --git a/apps/openmw/mwclass/light.hpp b/apps/openmw/mwclass/light.hpp
index e8aa4e5878..7a7f670a2a 100644
--- a/apps/openmw/mwclass/light.hpp
+++ b/apps/openmw/mwclass/light.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_LIGHT_H
 #define GAME_MWCLASS_LIGHT_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Light : public MWWorld::Class
+    class Light : public MWWorld::RegisteredClass<Light>
     {
+            friend MWWorld::RegisteredClass<Light>;
+
+            Light();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -44,8 +48,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index b97093ae2c..1e451ca7fe 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -20,6 +20,10 @@
 
 namespace MWClass
 {
+    Lockpick::Lockpick()
+        : MWWorld::RegisteredClass<Lockpick>(ESM::Lockpick::sRecordId)
+    {
+    }
 
     void Lockpick::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -76,13 +80,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Lockpick::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Lockpick);
-
-        registerClass (ESM::Lockpick::sRecordId, instance);
-    }
-
     std::string Lockpick::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Lockpick Up");
diff --git a/apps/openmw/mwclass/lockpick.hpp b/apps/openmw/mwclass/lockpick.hpp
index d4b265e397..b51aaa05a6 100644
--- a/apps/openmw/mwclass/lockpick.hpp
+++ b/apps/openmw/mwclass/lockpick.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_LOCKPICK_H
 #define GAME_MWCLASS_LOCKPICK_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Lockpick : public MWWorld::Class
+    class Lockpick : public MWWorld::RegisteredClass<Lockpick>
     {
+            friend MWWorld::RegisteredClass<Lockpick>;
+
+            Lockpick();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -34,8 +38,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index 4fbe8ea04e..759eea5ccc 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -21,6 +21,11 @@
 
 namespace MWClass
 {
+    Miscellaneous::Miscellaneous()
+        : MWWorld::RegisteredClass<Miscellaneous>(ESM::Miscellaneous::sRecordId)
+    {
+    }
+
     bool Miscellaneous::isGold (const MWWorld::ConstPtr& ptr) const
     {
         return Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), "gold_001")
@@ -102,13 +107,6 @@ namespace MWClass
         return value;
     }
 
-    void Miscellaneous::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Miscellaneous);
-
-        registerClass (ESM::Miscellaneous::sRecordId, instance);
-    }
-
     std::string Miscellaneous::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         if (isGold(ptr))
diff --git a/apps/openmw/mwclass/misc.hpp b/apps/openmw/mwclass/misc.hpp
index 18788c7ed8..59c31a219c 100644
--- a/apps/openmw/mwclass/misc.hpp
+++ b/apps/openmw/mwclass/misc.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_MISC_H
 #define GAME_MWCLASS_MISC_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Miscellaneous : public MWWorld::Class
+    class Miscellaneous : public MWWorld::RegisteredClass<Miscellaneous>
     {
+            friend MWWorld::RegisteredClass<Miscellaneous>;
+
+            Miscellaneous();
+
         public:
 
             MWWorld::Ptr copyToCell(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell, int count) const override;
@@ -30,8 +34,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 94027e5039..cc4b3f7528 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -245,6 +245,10 @@ namespace
 
 namespace MWClass
 {
+    Npc::Npc()
+        : MWWorld::RegisteredClass<Npc, Actor>(ESM::NPC::sRecordId)
+    {
+    }
 
     class NpcCustomData : public MWWorld::TypedCustomData<NpcCustomData>
     {
@@ -1039,12 +1043,6 @@ namespace MWClass
         return (ref->mBase->mFlags & ESM::NPC::Essential) != 0;
     }
 
-    void Npc::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Npc);
-        registerClass (ESM::NPC::sRecordId, instance);
-    }
-
     bool Npc::hasToolTip(const MWWorld::ConstPtr& ptr) const
     {
         if (!ptr.getRefData().getCustomData() || MWBase::Environment::get().getWindowManager()->isGuiMode())
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 612763d12e..574d133934 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_MWCLASS_NPC_H
 #define GAME_MWCLASS_NPC_H
 
+#include "../mwworld/registeredclass.hpp"
+
 #include "actor.hpp"
 
 namespace ESM
@@ -10,8 +12,12 @@ namespace ESM
 
 namespace MWClass
 {
-    class Npc : public Actor
+    class Npc : public MWWorld::RegisteredClass<Npc, Actor>
     {
+            friend MWWorld::RegisteredClass<Npc, Actor>;
+
+            Npc();
+
             void ensureCustomData (const MWWorld::Ptr& ptr) const;
 
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
@@ -125,8 +131,6 @@ namespace MWClass
 
             std::string getSoundIdFromSndGen(const MWWorld::Ptr &ptr, const std::string &name) const override;
 
-            static void registerSelf();
-
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
 
             float getSkill(const MWWorld::Ptr& ptr, int skill) const override;
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 9e7aeffbe5..6357d8938a 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -22,6 +22,10 @@
 
 namespace MWClass
 {
+    Potion::Potion()
+        : MWWorld::RegisteredClass<Potion>(ESM::Potion::sRecordId)
+    {
+    }
 
     void Potion::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -70,13 +74,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Potion::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Potion);
-
-        registerClass (ESM::Potion::sRecordId, instance);
-    }
-
     std::string Potion::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Potion Up");
diff --git a/apps/openmw/mwclass/potion.hpp b/apps/openmw/mwclass/potion.hpp
index 75b962164b..2b979e2f37 100644
--- a/apps/openmw/mwclass/potion.hpp
+++ b/apps/openmw/mwclass/potion.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_POTION_H
 #define GAME_MWCLASS_POTION_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Potion : public MWWorld::Class
+    class Potion : public MWWorld::RegisteredClass<Potion>
     {
+            friend MWWorld::RegisteredClass<Potion>;
+
+            Potion();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -33,8 +37,6 @@ namespace MWClass
             std::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr, bool force=false) const override;
             ///< Generate action for using via inventory menu
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index f705e51435..7db6a3e955 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -20,6 +20,10 @@
 
 namespace MWClass
 {
+    Probe::Probe()
+        : MWWorld::RegisteredClass<Probe>(ESM::Probe::sRecordId)
+    {
+    }
 
     void Probe::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -76,13 +80,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Probe::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Probe);
-
-        registerClass (ESM::Probe::sRecordId, instance);
-    }
-
     std::string Probe::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Probe Up");
diff --git a/apps/openmw/mwclass/probe.hpp b/apps/openmw/mwclass/probe.hpp
index ef9273a379..06bd2ababb 100644
--- a/apps/openmw/mwclass/probe.hpp
+++ b/apps/openmw/mwclass/probe.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_PROBE_H
 #define GAME_MWCLASS_PROBE_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Probe : public MWWorld::Class
+    class Probe : public MWWorld::RegisteredClass<Probe>
     {
+            friend MWWorld::RegisteredClass<Probe>;
+
+            Probe();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -34,8 +38,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index 64fcd08d78..463257696c 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -17,6 +17,10 @@
 
 namespace MWClass
 {
+    Repair::Repair()
+        : MWWorld::RegisteredClass<Repair>(ESM::Repair::sRecordId)
+    {
+    }
 
     void Repair::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -65,13 +69,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Repair::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Repair);
-
-        registerClass (ESM::Repair::sRecordId, instance);
-    }
-
     std::string Repair::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         return std::string("Item Repair Up");
diff --git a/apps/openmw/mwclass/repair.hpp b/apps/openmw/mwclass/repair.hpp
index c403449e18..b79ad2b124 100644
--- a/apps/openmw/mwclass/repair.hpp
+++ b/apps/openmw/mwclass/repair.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_REPAIR_H
 #define GAME_MWCLASS_REPAIR_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Repair : public MWWorld::Class
+    class Repair : public MWWorld::RegisteredClass<Repair>
     {
+            friend MWWorld::RegisteredClass<Repair>;
+
+            Repair();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -30,8 +34,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index 1fa445e428..8b793dbc67 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -13,6 +13,10 @@
 
 namespace MWClass
 {
+    Static::Static()
+        : MWWorld::RegisteredClass<Static>(ESM::Static::sRecordId)
+    {
+    }
 
     void Static::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -54,13 +58,6 @@ namespace MWClass
         return false;
     }
 
-    void Static::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Static);
-
-        registerClass (ESM::Static::sRecordId, instance);
-    }
-
     MWWorld::Ptr Static::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
     {
         const MWWorld::LiveCellRef<ESM::Static> *ref = ptr.get<ESM::Static>();
diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp
index c747eebf2f..6dbeb46662 100644
--- a/apps/openmw/mwclass/static.hpp
+++ b/apps/openmw/mwclass/static.hpp
@@ -1,12 +1,16 @@
 #ifndef GAME_MWCLASS_STATIC_H
 #define GAME_MWCLASS_STATIC_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Static : public MWWorld::Class
+    class Static : public MWWorld::RegisteredClass<Static>
     {
+            friend MWWorld::RegisteredClass<Static>;
+
+            Static();
+
             MWWorld::Ptr copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
@@ -23,8 +27,6 @@ namespace MWClass
             bool hasToolTip (const MWWorld::ConstPtr& ptr) const override;
             ///< @return true if this object has a tooltip when focused (default implementation: true)
 
-            static void registerSelf();
-
             std::string getModel(const MWWorld::ConstPtr &ptr) const override;
     };
 }
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index a0ec4bd0e5..261ada1e75 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -26,6 +26,10 @@
 
 namespace MWClass
 {
+    Weapon::Weapon()
+        : MWWorld::RegisteredClass<Weapon>(ESM::Weapon::sRecordId)
+    {
+    }
 
     void Weapon::insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -121,13 +125,6 @@ namespace MWClass
         return ref->mBase->mData.mValue;
     }
 
-    void Weapon::registerSelf()
-    {
-        std::shared_ptr<Class> instance (new Weapon);
-
-        registerClass (ESM::Weapon::sRecordId, instance);
-    }
-
     std::string Weapon::getUpSoundId (const MWWorld::ConstPtr& ptr) const
     {
         const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
diff --git a/apps/openmw/mwclass/weapon.hpp b/apps/openmw/mwclass/weapon.hpp
index db17e6b70f..61b2a70c26 100644
--- a/apps/openmw/mwclass/weapon.hpp
+++ b/apps/openmw/mwclass/weapon.hpp
@@ -1,16 +1,19 @@
 #ifndef GAME_MWCLASS_WEAPON_H
 #define GAME_MWCLASS_WEAPON_H
 
-#include "../mwworld/class.hpp"
+#include "../mwworld/registeredclass.hpp"
 
 namespace MWClass
 {
-    class Weapon : public MWWorld::Class
+    class Weapon : public MWWorld::RegisteredClass<Weapon>
     {
+            friend MWWorld::RegisteredClass<Weapon>;
+
             MWWorld::Ptr
             copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const override;
 
         public:
+            Weapon();
 
             void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const override;
             ///< Add reference into a cell for rendering
@@ -45,8 +48,6 @@ namespace MWClass
             int getValue (const MWWorld::ConstPtr& ptr) const override;
             ///< Return trade value of the object. Throws an exception, if the object can't be traded.
 
-            static void registerSelf();
-
             std::string getUpSoundId (const MWWorld::ConstPtr& ptr) const override;
             ///< Return the pick up sound Id
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 34a2b49c7b..b67f173ee5 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -21,7 +21,11 @@
 
 namespace MWWorld
 {
-    std::map<unsigned int, std::shared_ptr<Class> > Class::sClasses;
+    std::map<unsigned, Class*>& Class::getClasses()
+    {
+        static std::map<unsigned, Class*> values;
+        return values;
+    }
 
     void Class::insertObjectRendering (const Ptr& ptr, const std::string& mesh, MWRender::RenderingInterface& renderingInterface) const
     {
@@ -228,9 +232,10 @@ namespace MWWorld
 
     const Class& Class::get (unsigned int key)
     {
-        auto iter = sClasses.find (key);
+        const auto& classes = getClasses();
+        auto iter = classes.find(key);
 
-        if (iter==sClasses.end())
+        if (iter == classes.end())
             throw std::logic_error ("Class::get(): unknown class key: " + std::to_string(key));
 
         return *iter->second;
@@ -241,10 +246,9 @@ namespace MWWorld
         throw std::runtime_error ("class does not support persistence");
     }
 
-    void Class::registerClass(unsigned int key, std::shared_ptr<Class> instance)
+    void Class::registerClass(Class& instance)
     {
-        instance->mType = key;
-        sClasses.insert(std::make_pair(key, instance));
+        getClasses().emplace(instance.getType(), &instance);
     }
 
     std::string Class::getUpSoundId (const ConstPtr& ptr) const
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 64ac873960..f12b7ba192 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -54,12 +54,13 @@ namespace MWWorld
     /// \brief Base class for referenceable esm records
     class Class
     {
-            static std::map<unsigned int, std::shared_ptr<Class> > sClasses;
-            unsigned int mType;
+            const unsigned mType;
+
+            static std::map<unsigned, Class*>& getClasses();
 
         protected:
 
-            Class() = default;
+            explicit Class(unsigned type) : mType(type) {}
 
             std::shared_ptr<Action> defaultItemActivate(const Ptr &ptr, const Ptr &actor) const;
             ///< Generate default action for activating inventory items
@@ -340,7 +341,7 @@ namespace MWWorld
             static const Class& get (unsigned int key);
             ///< If there is no class for this \a key, an exception is thrown.
 
-            static void registerClass (unsigned int key,  std::shared_ptr<Class> instance);
+            static void registerClass(Class& instance);
 
             virtual int getBaseGold(const MWWorld::ConstPtr& ptr) const;
 
diff --git a/apps/openmw/mwworld/registeredclass.hpp b/apps/openmw/mwworld/registeredclass.hpp
new file mode 100644
index 0000000000..7ed9632129
--- /dev/null
+++ b/apps/openmw/mwworld/registeredclass.hpp
@@ -0,0 +1,23 @@
+#ifndef GAME_MWWORLD_REGISTEREDCLASS_H
+#define GAME_MWWORLD_REGISTEREDCLASS_H
+
+#include "class.hpp"
+
+namespace MWWorld
+{
+    template <class Derived, class Base = Class>
+    class RegisteredClass : public Base
+    {
+        public:
+            static void registerSelf()
+            {
+                static Derived instance;
+                Base::registerClass(instance);
+            }
+
+        protected:
+            explicit RegisteredClass(unsigned type) : Base(type) {}
+    };
+}
+
+#endif