diff --git a/apps/openmw/mwworld/cell.hpp b/apps/openmw/mwworld/cell.hpp
index 3a0d063e02..f8545f40e3 100644
--- a/apps/openmw/mwworld/cell.hpp
+++ b/apps/openmw/mwworld/cell.hpp
@@ -22,7 +22,7 @@ namespace MWWorld
 {
     class CellStore;
 
-    struct Cell : public ESM::CellVariant
+    class Cell : public ESM::CellVariant
     {
         friend MWWorld::CellStore;
         struct MoodData
diff --git a/components/esm/esmbridge.hpp b/components/esm/esmbridge.hpp
index e50b73e61b..1439f271c1 100644
--- a/components/esm/esmbridge.hpp
+++ b/components/esm/esmbridge.hpp
@@ -18,7 +18,7 @@ namespace ESM
     struct CellId;
     struct RefId;
 
-    struct CellVariant
+    class CellVariant
     {
     protected:
         std::variant<const ESM4::Cell*, const ESM::Cell*> mVariant;