diff --git a/apps/opencs/model/doc/saving.cpp b/apps/opencs/model/doc/saving.cpp
index 7e0b10d66b..c9035cfd43 100644
--- a/apps/opencs/model/doc/saving.cpp
+++ b/apps/opencs/model/doc/saving.cpp
@@ -1,8 +1,6 @@
 
 #include "saving.hpp"
 
-#include <components/esm/defs.hpp>
-
 #include "../world/data.hpp"
 #include "../world/idcollection.hpp"
 
@@ -18,37 +16,37 @@ CSMDoc::Saving::Saving (Document& document)
     appendStage (new WriteHeaderStage (mDocument, mState));
 
     appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Global> >
-        (mDocument.getData().getGlobals(), mState, ESM::REC_GLOB));
+        (mDocument.getData().getGlobals(), mState));
 
     appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::GameSetting> >
-        (mDocument.getData().getGmsts(), mState, ESM::REC_GMST));
+        (mDocument.getData().getGmsts(), mState));
 
     appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Skill> >
-        (mDocument.getData().getSkills(), mState, ESM::REC_SKIL));
+        (mDocument.getData().getSkills(), mState));
 
     appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Class> >
-        (mDocument.getData().getClasses(), mState, ESM::REC_CLAS));
+        (mDocument.getData().getClasses(), mState));
 
     appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Faction> >
-        (mDocument.getData().getFactions(), mState, ESM::REC_FACT));
+        (mDocument.getData().getFactions(), mState));
 
     appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Race> >
-        (mDocument.getData().getRaces(), mState, ESM::REC_RACE));
+        (mDocument.getData().getRaces(), mState));
 
     appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Sound> >
-        (mDocument.getData().getSounds(), mState, ESM::REC_SOUN));
+        (mDocument.getData().getSounds(), mState));
 
     appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Script> >
-        (mDocument.getData().getScripts(), mState, ESM::REC_SCPT));
+        (mDocument.getData().getScripts(), mState));
 
     appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Region> >
-        (mDocument.getData().getRegions(), mState, ESM::REC_REGN));
+        (mDocument.getData().getRegions(), mState));
 
     appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::BirthSign> >
-        (mDocument.getData().getBirthsigns(), mState, ESM::REC_BSGN));
+        (mDocument.getData().getBirthsigns(), mState));
 
     appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::Spell> >
-        (mDocument.getData().getSpells(), mState, ESM::REC_SPEL));
+        (mDocument.getData().getSpells(), mState));
 
 
     appendStage (new CloseSaveStage (mState));
diff --git a/apps/opencs/model/doc/savingstages.hpp b/apps/opencs/model/doc/savingstages.hpp
index 96b1fe17f6..d5c4a69af7 100644
--- a/apps/opencs/model/doc/savingstages.hpp
+++ b/apps/opencs/model/doc/savingstages.hpp
@@ -1,8 +1,6 @@
 #ifndef CSM_DOC_SAVINGSTAGES_H
 #define CSM_DOC_SAVINGSTAGES_H
 
-#include <components/esm/defs.hpp>
-
 #include "stage.hpp"
 
 #include "savingstate.hpp"
@@ -52,12 +50,10 @@ namespace CSMDoc
     {
             const CollectionT& mCollection;
             SavingState& mState;
-            ESM::RecNameInts mRecordType;
 
         public:
 
-            WriteCollectionStage (const CollectionT& collection, SavingState& state,
-                ESM::RecNameInts recordType);
+            WriteCollectionStage (const CollectionT& collection, SavingState& state);
 
             virtual int setup();
             ///< \return number of steps
@@ -68,8 +64,8 @@ namespace CSMDoc
 
     template<class CollectionT>
     WriteCollectionStage<CollectionT>::WriteCollectionStage (const CollectionT& collection,
-        SavingState& state, ESM::RecNameInts recordType)
-    : mCollection (collection), mState (state), mRecordType (recordType)
+        SavingState& state)
+    : mCollection (collection), mState (state)
     {}
 
     template<class CollectionT>
@@ -89,7 +85,7 @@ namespace CSMDoc
             std::string type;
             for (int i=0; i<4; ++i)
                 /// \todo make endianess agnostic (change ESMWriter interface?)
-                type += reinterpret_cast<const char *> (&mRecordType)[i];
+                type += reinterpret_cast<const char *> (&mCollection.getRecord (stage).mModified.sRecordId)[i];
 
             mState.getWriter().startRecord (type);
             mState.getWriter().writeHNCString ("NAME", mCollection.getId (stage));
diff --git a/components/esm/loadacti.cpp b/components/esm/loadacti.cpp
index dcae845d0a..6ba0df0b36 100644
--- a/components/esm/loadacti.cpp
+++ b/components/esm/loadacti.cpp
@@ -2,9 +2,12 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Activator::sRecordId = REC_ACTI;
+
 void Activator::load(ESMReader &esm)
 {
     mModel = esm.getHNString("MODL");
diff --git a/components/esm/loadacti.hpp b/components/esm/loadacti.hpp
index 6b072ee11e..88f27de27e 100644
--- a/components/esm/loadacti.hpp
+++ b/components/esm/loadacti.hpp
@@ -11,6 +11,8 @@ class ESMWriter;
 
 struct Activator
 {
+    static unsigned int sRecordId;
+
     std::string mId, mName, mScript, mModel;
 
     void load(ESMReader &esm);
diff --git a/components/esm/loadalch.cpp b/components/esm/loadalch.cpp
index 187069c2ef..f6bfc6a11d 100644
--- a/components/esm/loadalch.cpp
+++ b/components/esm/loadalch.cpp
@@ -2,9 +2,12 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Potion::sRecordId = REC_ALCH;
+
 void Potion::load(ESMReader &esm)
 {
     mModel = esm.getHNString("MODL");
diff --git a/components/esm/loadalch.hpp b/components/esm/loadalch.hpp
index 8f0435292e..141765aa82 100644
--- a/components/esm/loadalch.hpp
+++ b/components/esm/loadalch.hpp
@@ -17,6 +17,8 @@ class ESMWriter;
 
 struct Potion
 {
+    static unsigned int sRecordId;
+
     struct ALDTstruct
     {
         float mWeight;
diff --git a/components/esm/loadappa.cpp b/components/esm/loadappa.cpp
index 01233a0558..29ea78acc0 100644
--- a/components/esm/loadappa.cpp
+++ b/components/esm/loadappa.cpp
@@ -2,9 +2,12 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Apparatus::sRecordId = REC_APPA;
+
 void Apparatus::load(ESMReader &esm)
 {
     // we will not treat duplicated subrecords as errors here
diff --git a/components/esm/loadappa.hpp b/components/esm/loadappa.hpp
index d47643c6ce..adc8e071f1 100644
--- a/components/esm/loadappa.hpp
+++ b/components/esm/loadappa.hpp
@@ -15,6 +15,8 @@ class ESMWriter;
 
 struct Apparatus
 {
+    static unsigned int sRecordId;
+
     enum AppaType
     {
         MortarPestle = 0,
diff --git a/components/esm/loadarmo.cpp b/components/esm/loadarmo.cpp
index 4dbdf1314d..ec8ff4f20c 100644
--- a/components/esm/loadarmo.cpp
+++ b/components/esm/loadarmo.cpp
@@ -2,6 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
@@ -28,6 +29,8 @@ void PartReferenceList::save(ESMWriter &esm) const
     }
 }
 
+unsigned int Armor::sRecordId = REC_ARMO;
+
 void Armor::load(ESMReader &esm)
 {
     mModel = esm.getHNString("MODL");
diff --git a/components/esm/loadarmo.hpp b/components/esm/loadarmo.hpp
index 5a38605e3d..991f4e1855 100644
--- a/components/esm/loadarmo.hpp
+++ b/components/esm/loadarmo.hpp
@@ -61,6 +61,8 @@ struct PartReferenceList
 
 struct Armor
 {
+    static unsigned int sRecordId;
+
     enum Type
     {
         Helmet = 0,
diff --git a/components/esm/loadbody.cpp b/components/esm/loadbody.cpp
index a5d986f65d..4015e6c91a 100644
--- a/components/esm/loadbody.cpp
+++ b/components/esm/loadbody.cpp
@@ -2,9 +2,12 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int BodyPart::sRecordId = REC_BODY;
+
 
 void BodyPart::load(ESMReader &esm)
 {
diff --git a/components/esm/loadbody.hpp b/components/esm/loadbody.hpp
index a8fd36aef4..9623caa31e 100644
--- a/components/esm/loadbody.hpp
+++ b/components/esm/loadbody.hpp
@@ -11,6 +11,8 @@ class ESMWriter;
 
 struct BodyPart
 {
+    static unsigned int sRecordId;
+
     enum MeshPart
     {
         MP_Head = 0,
diff --git a/components/esm/loadbook.cpp b/components/esm/loadbook.cpp
index d9db118899..c8b7e94789 100644
--- a/components/esm/loadbook.cpp
+++ b/components/esm/loadbook.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Book::sRecordId = REC_BOOK;
 
 void Book::load(ESMReader &esm)
 {
diff --git a/components/esm/loadbook.hpp b/components/esm/loadbook.hpp
index 688e9dd75e..f96fbd709b 100644
--- a/components/esm/loadbook.hpp
+++ b/components/esm/loadbook.hpp
@@ -14,6 +14,8 @@ class ESMWriter;
 
 struct Book
 {
+    static unsigned int sRecordId;
+
     struct BKDTstruct
     {
         float mWeight;
diff --git a/components/esm/loadbsgn.cpp b/components/esm/loadbsgn.cpp
index 9d19f02c7e..55e1e7f65a 100644
--- a/components/esm/loadbsgn.cpp
+++ b/components/esm/loadbsgn.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int BirthSign::sRecordId = REC_BSGN;
 
 void BirthSign::load(ESMReader &esm)
 {
diff --git a/components/esm/loadbsgn.hpp b/components/esm/loadbsgn.hpp
index 1ecb5e418e..9f9435c8f1 100644
--- a/components/esm/loadbsgn.hpp
+++ b/components/esm/loadbsgn.hpp
@@ -13,6 +13,8 @@ class ESMWriter;
 
 struct BirthSign
 {
+    static unsigned int sRecordId;
+
     std::string mId, mName, mDescription, mTexture;
 
     // List of powers and abilities that come with this birth sign.
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index 9b3aa09e86..c22c1b22b6 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -7,9 +7,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Cell::sRecordId = REC_CELL;
 
 /// Some overloaded compare operators.
 bool operator==(const MovedCellRef& ref, int pRefnum)
diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp
index c417fceab8..61d586b9d8 100644
--- a/components/esm/loadcell.hpp
+++ b/components/esm/loadcell.hpp
@@ -16,7 +16,6 @@ namespace MWWorld
 
 namespace ESM
 {
-
 class ESMReader;
 class ESMWriter;
 
@@ -55,6 +54,8 @@ typedef std::list<CellRef> CellRefTracker;
  */
 struct Cell
 {
+    static unsigned int sRecordId;
+
   enum Flags
     {
       Interior  = 0x01, // Interior cell
diff --git a/components/esm/loadclas.cpp b/components/esm/loadclas.cpp
index ef07430c7a..33489eec46 100644
--- a/components/esm/loadclas.cpp
+++ b/components/esm/loadclas.cpp
@@ -4,9 +4,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Class::sRecordId = REC_CLAS;
 
 const Class::Specialization Class::sSpecializationIds[3] = {
   Class::Combat,
diff --git a/components/esm/loadclas.hpp b/components/esm/loadclas.hpp
index f241dca8da..3e489bb58a 100644
--- a/components/esm/loadclas.hpp
+++ b/components/esm/loadclas.hpp
@@ -17,6 +17,8 @@ class ESMWriter;
 // class
 struct Class
 {
+    static unsigned int sRecordId;
+
     enum AutoCalc
     {
         Weapon = 0x00001,
diff --git a/components/esm/loadclot.cpp b/components/esm/loadclot.cpp
index c623155dfa..d64564d77f 100644
--- a/components/esm/loadclot.cpp
+++ b/components/esm/loadclot.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Clothing::sRecordId = REC_CLOT;
 
 void Clothing::load(ESMReader &esm)
 {
diff --git a/components/esm/loadclot.hpp b/components/esm/loadclot.hpp
index 13fae865b4..50896622aa 100644
--- a/components/esm/loadclot.hpp
+++ b/components/esm/loadclot.hpp
@@ -17,6 +17,8 @@ class ESMWriter;
 
 struct Clothing
 {
+    static unsigned int sRecordId;
+
     enum Type
     {
         Pants = 0,
diff --git a/components/esm/loadcont.cpp b/components/esm/loadcont.cpp
index 0cbb4acd1e..7bdf9f05b1 100644
--- a/components/esm/loadcont.cpp
+++ b/components/esm/loadcont.cpp
@@ -2,6 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
@@ -24,6 +25,8 @@ void InventoryList::save(ESMWriter &esm) const
     }
 }
 
+    unsigned int Container::sRecordId = REC_CONT;
+
 void Container::load(ESMReader &esm)
 {
     mModel = esm.getHNString("MODL");
diff --git a/components/esm/loadcont.hpp b/components/esm/loadcont.hpp
index c854b52907..2808b67b56 100644
--- a/components/esm/loadcont.hpp
+++ b/components/esm/loadcont.hpp
@@ -32,6 +32,8 @@ struct InventoryList
 
 struct Container
 {
+    static unsigned int sRecordId;
+
     enum Flags
     {
         Organic = 1, // Objects cannot be placed in this container
diff --git a/components/esm/loadcrea.cpp b/components/esm/loadcrea.cpp
index 30b70b35b6..650de08011 100644
--- a/components/esm/loadcrea.cpp
+++ b/components/esm/loadcrea.cpp
@@ -2,9 +2,12 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM {
 
+    unsigned int Creature::sRecordId = REC_CREA;
+
 void Creature::load(ESMReader &esm)
 {
     mPersistent = esm.getRecordFlags() & 0x0400;
diff --git a/components/esm/loadcrea.hpp b/components/esm/loadcrea.hpp
index 80e0fbd1c9..99c4f52257 100644
--- a/components/esm/loadcrea.hpp
+++ b/components/esm/loadcrea.hpp
@@ -20,6 +20,8 @@ class ESMWriter;
 
 struct Creature
 {
+    static unsigned int sRecordId;
+
     // Default is 0x48?
     enum Flags
     {
diff --git a/components/esm/loadcrec.hpp b/components/esm/loadcrec.hpp
index 2b840ccf46..280739acad 100644
--- a/components/esm/loadcrec.hpp
+++ b/components/esm/loadcrec.hpp
@@ -17,6 +17,8 @@ class ESMWriter;
 /// Changes a creature
 struct LoadCREC
 {
+    static unsigned int sRecordId;
+
     std::string mId;
 
     void load(ESMReader &esm)
diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp
index e014ca37e8..f64ecb5a06 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Dialogue::sRecordId = REC_DIAL;
 
 void Dialogue::load(ESMReader &esm)
 {
diff --git a/components/esm/loaddial.hpp b/components/esm/loaddial.hpp
index 0fe5027dc9..3997d77537 100644
--- a/components/esm/loaddial.hpp
+++ b/components/esm/loaddial.hpp
@@ -19,6 +19,8 @@ class ESMWriter;
 
 struct Dialogue
 {
+    static unsigned int sRecordId;
+
     enum Type
     {
         Topic = 0,
diff --git a/components/esm/loaddoor.cpp b/components/esm/loaddoor.cpp
index f666ac67a9..c56b063379 100644
--- a/components/esm/loaddoor.cpp
+++ b/components/esm/loaddoor.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Door::sRecordId = REC_DOOR;
 
 void Door::load(ESMReader &esm)
 {
diff --git a/components/esm/loaddoor.hpp b/components/esm/loaddoor.hpp
index 2b927c56e0..ee2b7f7ac5 100644
--- a/components/esm/loaddoor.hpp
+++ b/components/esm/loaddoor.hpp
@@ -11,6 +11,8 @@ class ESMWriter;
 
 struct Door
 {
+    static unsigned int sRecordId;
+
     std::string mId, mName, mModel, mScript, mOpenSound, mCloseSound;
 
     void load(ESMReader &esm);
diff --git a/components/esm/loadench.cpp b/components/esm/loadench.cpp
index 4b4c3a1ec5..a1e885f23b 100644
--- a/components/esm/loadench.cpp
+++ b/components/esm/loadench.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Enchantment::sRecordId = REC_ENCH;
 
 void Enchantment::load(ESMReader &esm)
 {
diff --git a/components/esm/loadench.hpp b/components/esm/loadench.hpp
index 3cdc3a0bd0..f6ba8c6ab3 100644
--- a/components/esm/loadench.hpp
+++ b/components/esm/loadench.hpp
@@ -17,6 +17,8 @@ class ESMWriter;
 
 struct Enchantment
 {
+    static unsigned int sRecordId;
+
     enum Type
     {
         CastOnce = 0,
diff --git a/components/esm/loadfact.cpp b/components/esm/loadfact.cpp
index c8be518028..61fa902639 100644
--- a/components/esm/loadfact.cpp
+++ b/components/esm/loadfact.cpp
@@ -4,9 +4,12 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Faction::sRecordId = REC_FACT;
+
     int& Faction::FADTstruct::getSkill (int index, bool ignored)
     {
         if (index<0 || index>=6)
diff --git a/components/esm/loadfact.hpp b/components/esm/loadfact.hpp
index 11f65a87f5..9c257e068e 100644
--- a/components/esm/loadfact.hpp
+++ b/components/esm/loadfact.hpp
@@ -29,6 +29,8 @@ struct RankData
 
 struct Faction
 {
+    static unsigned int sRecordId;
+
     std::string mId, mName;
 
     struct FADTstruct
diff --git a/components/esm/loadglob.cpp b/components/esm/loadglob.cpp
index e1c2d44087..a78ed1a1be 100644
--- a/components/esm/loadglob.cpp
+++ b/components/esm/loadglob.cpp
@@ -1,7 +1,11 @@
 #include "loadglob.hpp"
 
+#include "defs.hpp"
+
 namespace ESM
 {
+    unsigned int Global::sRecordId = REC_GLOB;
+
     void Global::load (ESMReader &esm)
     {
         mValue.read (esm, ESM::Variant::Format_Global);
diff --git a/components/esm/loadglob.hpp b/components/esm/loadglob.hpp
index 06ff97ef20..51b2e2dc98 100644
--- a/components/esm/loadglob.hpp
+++ b/components/esm/loadglob.hpp
@@ -17,6 +17,8 @@ class ESMWriter;
 
 struct Global
 {
+    static unsigned int sRecordId;
+
     std::string mId;
     Variant mValue;
 
diff --git a/components/esm/loadgmst.cpp b/components/esm/loadgmst.cpp
index 3a7df45065..21d66339a9 100644
--- a/components/esm/loadgmst.cpp
+++ b/components/esm/loadgmst.cpp
@@ -1,7 +1,11 @@
 #include "loadgmst.hpp"
 
+#include "defs.hpp"
+
 namespace ESM
 {
+    unsigned int GameSetting::sRecordId = REC_GMST;
+
     void GameSetting::load (ESMReader &esm)
     {
         mValue.read (esm, ESM::Variant::Format_Gmst);
diff --git a/components/esm/loadgmst.hpp b/components/esm/loadgmst.hpp
index 9c37c7da09..6b66ac832d 100644
--- a/components/esm/loadgmst.hpp
+++ b/components/esm/loadgmst.hpp
@@ -18,6 +18,8 @@ class ESMWriter;
 
 struct GameSetting
 {
+    static unsigned int sRecordId;
+
     std::string mId;
 
     Variant mValue;
diff --git a/components/esm/loadinfo.cpp b/components/esm/loadinfo.cpp
index 1985da2cd9..4f248cc65f 100644
--- a/components/esm/loadinfo.cpp
+++ b/components/esm/loadinfo.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int DialInfo::sRecordId = REC_INFO;
 
 void DialInfo::load(ESMReader &esm)
 {
diff --git a/components/esm/loadinfo.hpp b/components/esm/loadinfo.hpp
index 351768e96f..2589ea7b87 100644
--- a/components/esm/loadinfo.hpp
+++ b/components/esm/loadinfo.hpp
@@ -20,6 +20,8 @@ class ESMWriter;
 
 struct DialInfo
 {
+    static unsigned int sRecordId;
+
     enum Gender
     {
         Male = 0,
diff --git a/components/esm/loadingr.cpp b/components/esm/loadingr.cpp
index 1bc9ae41c6..0e02433621 100644
--- a/components/esm/loadingr.cpp
+++ b/components/esm/loadingr.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Ingredient::sRecordId = REC_INGR;
 
 void Ingredient::load(ESMReader &esm)
 {
diff --git a/components/esm/loadingr.hpp b/components/esm/loadingr.hpp
index 03e67924c5..85f2d5e7d2 100644
--- a/components/esm/loadingr.hpp
+++ b/components/esm/loadingr.hpp
@@ -15,6 +15,8 @@ class ESMWriter;
 
 struct Ingredient
 {
+    static unsigned int sRecordId;
+
     struct IRDTstruct
     {
         float mWeight;
diff --git a/components/esm/loadland.cpp b/components/esm/loadland.cpp
index 8e54bcc5c9..ede200d79d 100644
--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Land::sRecordId = REC_LAND;
 
 void Land::LandData::save(ESMWriter &esm)
 {
diff --git a/components/esm/loadland.hpp b/components/esm/loadland.hpp
index 3d3bcd67bb..5649f99801 100644
--- a/components/esm/loadland.hpp
+++ b/components/esm/loadland.hpp
@@ -17,6 +17,8 @@ class ESMWriter;
 
 struct Land
 {
+    static unsigned int sRecordId;
+
     Land();
     ~Land();
 
diff --git a/components/esm/loadlevlist.cpp b/components/esm/loadlevlist.cpp
index ab3f5e9e66..6385b9a718 100644
--- a/components/esm/loadlevlist.cpp
+++ b/components/esm/loadlevlist.cpp
@@ -2,6 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
@@ -52,4 +53,8 @@ void LeveledListBase::save(ESMWriter &esm) const
         mChanceNone = 0;
         mList.clear();
     }
+
+    unsigned int CreatureLevList::sRecordId = REC_LEVC;
+
+    unsigned int ItemLevList::sRecordId = REC_LEVI;
 }
diff --git a/components/esm/loadlevlist.hpp b/components/esm/loadlevlist.hpp
index f5fb7fd5b1..9dcc6177a1 100644
--- a/components/esm/loadlevlist.hpp
+++ b/components/esm/loadlevlist.hpp
@@ -59,6 +59,8 @@ struct LeveledListBase
 
 struct CreatureLevList: LeveledListBase
 {
+    static unsigned int sRecordId;
+
     CreatureLevList()
     {
         mRecName = "CNAM";
@@ -67,6 +69,8 @@ struct CreatureLevList: LeveledListBase
 
 struct ItemLevList: LeveledListBase
 {
+    static unsigned int sRecordId;
+
     ItemLevList()
     {
         mRecName = "INAM";
diff --git a/components/esm/loadligh.cpp b/components/esm/loadligh.cpp
index 3f279c7c83..c02bb46b69 100644
--- a/components/esm/loadligh.cpp
+++ b/components/esm/loadligh.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Light::sRecordId = REC_LIGH;
 
 void Light::load(ESMReader &esm)
 {
diff --git a/components/esm/loadligh.hpp b/components/esm/loadligh.hpp
index 9a341f0de5..74eb37197e 100644
--- a/components/esm/loadligh.hpp
+++ b/components/esm/loadligh.hpp
@@ -16,6 +16,8 @@ class ESMWriter;
 
 struct Light
 {
+    static unsigned int sRecordId;
+
     enum Flags
     {
         Dynamic     = 0x001,
diff --git a/components/esm/loadlock.cpp b/components/esm/loadlock.cpp
index 318769ec08..9ffce78a7d 100644
--- a/components/esm/loadlock.cpp
+++ b/components/esm/loadlock.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Lockpick::sRecordId = REC_LOCK;
 
 void Lockpick::load(ESMReader &esm)
 {
diff --git a/components/esm/loadlock.hpp b/components/esm/loadlock.hpp
index aea5a4f31d..c44e2b0063 100644
--- a/components/esm/loadlock.hpp
+++ b/components/esm/loadlock.hpp
@@ -11,6 +11,8 @@ class ESMWriter;
 
 struct Lockpick
 {
+    static unsigned int sRecordId;
+
     struct Data
     {
         float mWeight;
diff --git a/components/esm/loadltex.cpp b/components/esm/loadltex.cpp
index dc1bc164b4..bd28c84883 100644
--- a/components/esm/loadltex.cpp
+++ b/components/esm/loadltex.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int LandTexture::sRecordId = REC_LTEX;
 
 void LandTexture::load(ESMReader &esm)
 {
diff --git a/components/esm/loadltex.hpp b/components/esm/loadltex.hpp
index 3d08169484..5e84428b29 100644
--- a/components/esm/loadltex.hpp
+++ b/components/esm/loadltex.hpp
@@ -27,6 +27,8 @@ class ESMWriter;
 
 struct LandTexture
 {
+    static unsigned int sRecordId;
+
     std::string mId, mTexture;
     int mIndex;
 
diff --git a/components/esm/loadmgef.cpp b/components/esm/loadmgef.cpp
index 9eaeff7046..332c27786f 100644
--- a/components/esm/loadmgef.cpp
+++ b/components/esm/loadmgef.cpp
@@ -6,6 +6,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace
 {
@@ -34,6 +35,7 @@ namespace
 
 namespace ESM
 {
+    unsigned int MagicEffect::sRecordId = REC_MGEF;
 
 void MagicEffect::load(ESMReader &esm)
 {
diff --git a/components/esm/loadmgef.hpp b/components/esm/loadmgef.hpp
index 220b3bdf39..613cbd2d86 100644
--- a/components/esm/loadmgef.hpp
+++ b/components/esm/loadmgef.hpp
@@ -12,6 +12,8 @@ class ESMWriter;
 
 struct MagicEffect
 {
+    static unsigned int sRecordId;
+
     enum Flags
     {
         TargetSkill = 0x1, // Affects a specific skill, which is specified elsewhere in the effect structure.
diff --git a/components/esm/loadmisc.cpp b/components/esm/loadmisc.cpp
index a183821b74..2ca09e8aec 100644
--- a/components/esm/loadmisc.cpp
+++ b/components/esm/loadmisc.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Miscellaneous::sRecordId = REC_MISC;
 
 void Miscellaneous::load(ESMReader &esm)
 {
diff --git a/components/esm/loadmisc.hpp b/components/esm/loadmisc.hpp
index 452eea53e0..576bd18c0f 100644
--- a/components/esm/loadmisc.hpp
+++ b/components/esm/loadmisc.hpp
@@ -16,6 +16,8 @@ class ESMWriter;
 
 struct Miscellaneous
 {
+    static unsigned int sRecordId;
+
     struct MCDTstruct
     {
         float mWeight;
diff --git a/components/esm/loadnpc.cpp b/components/esm/loadnpc.cpp
index 7c26cb549b..9fff2d885d 100644
--- a/components/esm/loadnpc.cpp
+++ b/components/esm/loadnpc.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int NPC::sRecordId = REC_NPC_;
 
 void NPC::load(ESMReader &esm)
 {
diff --git a/components/esm/loadnpc.hpp b/components/esm/loadnpc.hpp
index 009548c596..d9e691669c 100644
--- a/components/esm/loadnpc.hpp
+++ b/components/esm/loadnpc.hpp
@@ -20,6 +20,8 @@ class ESMWriter;
 
 struct NPC
 {
+    static unsigned int sRecordId;
+
   // Services
   enum Services
     {
diff --git a/components/esm/loadnpcc.hpp b/components/esm/loadnpcc.hpp
index f023fd2172..c87c2545f7 100644
--- a/components/esm/loadnpcc.hpp
+++ b/components/esm/loadnpcc.hpp
@@ -78,6 +78,8 @@ class ESMWriter;
 
 struct LoadNPCC
 {
+    static unsigned int sRecordId;
+
     std::string mId;
 
   void load(ESMReader &esm)
diff --git a/components/esm/loadpgrd.cpp b/components/esm/loadpgrd.cpp
index 65d1f80553..3b5330e9fd 100644
--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Pathgrid::sRecordId = REC_PGRD;
 
 void Pathgrid::load(ESMReader &esm)
 {
diff --git a/components/esm/loadpgrd.hpp b/components/esm/loadpgrd.hpp
index d14433a786..9ee49552db 100644
--- a/components/esm/loadpgrd.hpp
+++ b/components/esm/loadpgrd.hpp
@@ -15,6 +15,8 @@ class ESMWriter;
  */
 struct Pathgrid
 {
+    static unsigned int sRecordId;
+
     struct DATAstruct
     {
         int mX, mY; // Grid location, matches cell for exterior cells
diff --git a/components/esm/loadprob.cpp b/components/esm/loadprob.cpp
index 0fb4c97507..caa3d7e0e7 100644
--- a/components/esm/loadprob.cpp
+++ b/components/esm/loadprob.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Probe::sRecordId = REC_PROB;
 
 void Probe::load(ESMReader &esm)
 {
diff --git a/components/esm/loadprob.hpp b/components/esm/loadprob.hpp
index d0a8256ab6..b89b2ddeb6 100644
--- a/components/esm/loadprob.hpp
+++ b/components/esm/loadprob.hpp
@@ -11,6 +11,8 @@ class ESMWriter;
 
 struct Probe
 {
+    static unsigned int sRecordId;
+
     struct Data
     {
         float mWeight;
diff --git a/components/esm/loadrace.cpp b/components/esm/loadrace.cpp
index e9e1d0d797..e50e43a744 100644
--- a/components/esm/loadrace.cpp
+++ b/components/esm/loadrace.cpp
@@ -2,9 +2,12 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Race::sRecordId = REC_RACE;
+
     int Race::MaleFemale::getValue (bool male) const
     {
         return male ? mMale : mFemale;
diff --git a/components/esm/loadrace.hpp b/components/esm/loadrace.hpp
index a53a980701..7d5736d9b7 100644
--- a/components/esm/loadrace.hpp
+++ b/components/esm/loadrace.hpp
@@ -17,6 +17,8 @@ class ESMWriter;
 
 struct Race
 {
+    static unsigned int sRecordId;
+
     struct SkillBonus
     {
         int mSkill; // SkillEnum
diff --git a/components/esm/loadregn.cpp b/components/esm/loadregn.cpp
index fd42b9ee83..fa4271e26a 100644
--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Region::sRecordId = REC_REGN;
 
 void Region::load(ESMReader &esm)
 {
diff --git a/components/esm/loadregn.hpp b/components/esm/loadregn.hpp
index a6075d65ae..1992c951b4 100644
--- a/components/esm/loadregn.hpp
+++ b/components/esm/loadregn.hpp
@@ -18,6 +18,8 @@ class ESMWriter;
 
 struct Region
 {
+    static unsigned int sRecordId;
+
 #pragma pack(push)
 #pragma pack(1)
     struct WEATstruct
diff --git a/components/esm/loadrepa.cpp b/components/esm/loadrepa.cpp
index 59bfa01695..a7132828d4 100644
--- a/components/esm/loadrepa.cpp
+++ b/components/esm/loadrepa.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Repair::sRecordId = REC_REPA;
 
 void Repair::load(ESMReader &esm)
 {
diff --git a/components/esm/loadrepa.hpp b/components/esm/loadrepa.hpp
index 771e7ead07..5b404b0e4c 100644
--- a/components/esm/loadrepa.hpp
+++ b/components/esm/loadrepa.hpp
@@ -11,6 +11,8 @@ class ESMWriter;
 
 struct Repair
 {
+    static unsigned int sRecordId;
+
     struct Data
     {
         float mWeight;
diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index 8afb85602d..30460c17a6 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -2,6 +2,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
@@ -12,6 +13,8 @@ struct SCHD
     Script::SCHDstruct  mData;
 };
 
+    unsigned int Script::sRecordId = REC_SCPT;
+
 void Script::load(ESMReader &esm)
 {
     SCHD data;
diff --git a/components/esm/loadscpt.hpp b/components/esm/loadscpt.hpp
index 450224faa4..d5200d4c12 100644
--- a/components/esm/loadscpt.hpp
+++ b/components/esm/loadscpt.hpp
@@ -19,6 +19,8 @@ class ESMWriter;
 class Script
 {
 public:
+    static unsigned int sRecordId;
+
     struct SCHDstruct
     {
         /* Script name.
diff --git a/components/esm/loadskil.cpp b/components/esm/loadskil.cpp
index f6a2c49503..b6724e9381 100644
--- a/components/esm/loadskil.cpp
+++ b/components/esm/loadskil.cpp
@@ -6,6 +6,7 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
@@ -126,6 +127,8 @@ namespace ESM
         HandToHand
     }};
 
+    unsigned int Skill::sRecordId = REC_SKIL;
+
 void Skill::load(ESMReader &esm)
 {
     esm.getHNT(mIndex, "INDX");
diff --git a/components/esm/loadskil.hpp b/components/esm/loadskil.hpp
index 2436173cbb..1b9db5bcff 100644
--- a/components/esm/loadskil.hpp
+++ b/components/esm/loadskil.hpp
@@ -19,6 +19,8 @@ class ESMWriter;
 
 struct Skill
 {
+    static unsigned int sRecordId;
+
     std::string mId;
 
   struct SKDTstruct
diff --git a/components/esm/loadsndg.cpp b/components/esm/loadsndg.cpp
index 9b992c9606..1a8ca63354 100644
--- a/components/esm/loadsndg.cpp
+++ b/components/esm/loadsndg.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int SoundGenerator::sRecordId = REC_SNDG;
 
 void SoundGenerator::load(ESMReader &esm)
 {
diff --git a/components/esm/loadsndg.hpp b/components/esm/loadsndg.hpp
index 2756676ef1..5509661c18 100644
--- a/components/esm/loadsndg.hpp
+++ b/components/esm/loadsndg.hpp
@@ -15,6 +15,8 @@ class ESMWriter;
 
 struct SoundGenerator
 {
+    static unsigned int sRecordId;
+
     enum Type
     {
         LeftFoot = 0,
diff --git a/components/esm/loadsoun.cpp b/components/esm/loadsoun.cpp
index 0f6b0f84a7..49c9eb54e2 100644
--- a/components/esm/loadsoun.cpp
+++ b/components/esm/loadsoun.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Sound::sRecordId = REC_SOUN;
 
 void Sound::load(ESMReader &esm)
 {
diff --git a/components/esm/loadsoun.hpp b/components/esm/loadsoun.hpp
index 6c9bb1fed3..04a0984fda 100644
--- a/components/esm/loadsoun.hpp
+++ b/components/esm/loadsoun.hpp
@@ -16,6 +16,8 @@ struct SOUNstruct
 
 struct Sound
 {
+    static unsigned int sRecordId;
+
     SOUNstruct mData;
     std::string mId, mSound;
 
diff --git a/components/esm/loadspel.cpp b/components/esm/loadspel.cpp
index 5c0bd956f7..2c98d796d3 100644
--- a/components/esm/loadspel.cpp
+++ b/components/esm/loadspel.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Spell::sRecordId = REC_SPEL;
 
 void Spell::load(ESMReader &esm)
 {
diff --git a/components/esm/loadspel.hpp b/components/esm/loadspel.hpp
index b34bd29f18..cbf5366c4b 100644
--- a/components/esm/loadspel.hpp
+++ b/components/esm/loadspel.hpp
@@ -13,6 +13,8 @@ class ESMWriter;
 
 struct Spell
 {
+    static unsigned int sRecordId;
+
     enum SpellType
     {
         ST_Spell = 0,   // Normal spell, must be cast and costs mana
diff --git a/components/esm/loadsscr.cpp b/components/esm/loadsscr.cpp
index f51b7be479..69b04bb237 100644
--- a/components/esm/loadsscr.cpp
+++ b/components/esm/loadsscr.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int StartScript::sRecordId = REC_SSCR;
 
 void StartScript::load(ESMReader &esm)
 {
diff --git a/components/esm/loadsscr.hpp b/components/esm/loadsscr.hpp
index 2326f00f43..d09ad883eb 100644
--- a/components/esm/loadsscr.hpp
+++ b/components/esm/loadsscr.hpp
@@ -19,6 +19,8 @@ class ESMWriter;
 
 struct StartScript
 {
+    static unsigned int sRecordId;
+
     std::string mData;
     std::string mId, mScript;
 
diff --git a/components/esm/loadstat.cpp b/components/esm/loadstat.cpp
index 38206422bb..a71f22dc23 100644
--- a/components/esm/loadstat.cpp
+++ b/components/esm/loadstat.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Static::sRecordId = REC_STAT;
 
 void Static::load(ESMReader &esm)
 {
diff --git a/components/esm/loadstat.hpp b/components/esm/loadstat.hpp
index df42c0c491..d912d10583 100644
--- a/components/esm/loadstat.hpp
+++ b/components/esm/loadstat.hpp
@@ -22,6 +22,8 @@ class ESMWriter;
 
 struct Static
 {
+    static unsigned int sRecordId;
+
   std::string mId, mModel;
 
   void load(ESMReader &esm);
diff --git a/components/esm/loadtes3.cpp b/components/esm/loadtes3.cpp
index 74d578ba7d..a86c9b6f4f 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm/loadtes3.cpp
@@ -4,6 +4,7 @@
 #include "esmcommon.hpp"
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 void ESM::Header::blank()
 {
diff --git a/components/esm/loadweap.cpp b/components/esm/loadweap.cpp
index e21d8924a1..1d0b149df1 100644
--- a/components/esm/loadweap.cpp
+++ b/components/esm/loadweap.cpp
@@ -2,9 +2,11 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
+#include "defs.hpp"
 
 namespace ESM
 {
+    unsigned int Weapon::sRecordId = REC_WEAP;
 
 void Weapon::load(ESMReader &esm)
 {
diff --git a/components/esm/loadweap.hpp b/components/esm/loadweap.hpp
index 42810d3afb..fde716b916 100644
--- a/components/esm/loadweap.hpp
+++ b/components/esm/loadweap.hpp
@@ -15,6 +15,8 @@ class ESMWriter;
 
 struct Weapon
 {
+    static unsigned int sRecordId;
+
     enum Type
     {
         ShortBladeOneHand = 0,