diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6aaa5c57f..0caec9fd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,6 +143,7 @@ if(ENTT_INCLUDE_HEADERS)
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/fwd.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/group.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/handle.hpp>
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/mixin.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/helper.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/observer.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/organizer.hpp>
@@ -151,7 +152,6 @@ if(ENTT_INCLUDE_HEADERS)
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/snapshot.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/sparse_set.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/storage.hpp>
-            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/storage_mixin.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/entity/view.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/graph/adjacency_matrix.hpp>
             $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src/entt/graph/dot.hpp>
diff --git a/src/entt/entity/storage_mixin.hpp b/src/entt/entity/mixin.hpp
similarity index 99%
rename from src/entt/entity/storage_mixin.hpp
rename to src/entt/entity/mixin.hpp
index d854d5104..044098f0f 100644
--- a/src/entt/entity/storage_mixin.hpp
+++ b/src/entt/entity/mixin.hpp
@@ -1,5 +1,5 @@
-#ifndef ENTT_ENTITY_STORAGE_MIXIN_HPP
-#define ENTT_ENTITY_STORAGE_MIXIN_HPP
+#ifndef ENTT_ENTITY_MIXIN_HPP
+#define ENTT_ENTITY_MIXIN_HPP
 
 #include <utility>
 #include "../config/config.h"
diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp
index aa9d55b3c..0c2c7d9fc 100644
--- a/src/entt/entity/registry.hpp
+++ b/src/entt/entity/registry.hpp
@@ -23,9 +23,9 @@
 #include "entity.hpp"
 #include "fwd.hpp"
 #include "group.hpp"
+#include "mixin.hpp"
 #include "sparse_set.hpp"
 #include "storage.hpp"
-#include "storage_mixin.hpp"
 #include "view.hpp"
 
 namespace entt {
diff --git a/src/entt/entt.hpp b/src/entt/entt.hpp
index 3544fb605..249fd5251 100644
--- a/src/entt/entt.hpp
+++ b/src/entt/entt.hpp
@@ -24,6 +24,7 @@
 #include "entity/group.hpp"
 #include "entity/handle.hpp"
 #include "entity/helper.hpp"
+#include "entity/mixin.hpp"
 #include "entity/observer.hpp"
 #include "entity/organizer.hpp"
 #include "entity/registry.hpp"
@@ -31,7 +32,6 @@
 #include "entity/snapshot.hpp"
 #include "entity/sparse_set.hpp"
 #include "entity/storage.hpp"
-#include "entity/storage_mixin.hpp"
 #include "entity/view.hpp"
 #include "graph/adjacency_matrix.hpp"
 #include "graph/dot.hpp"
diff --git a/test/entt/entity/sigh_mixin.cpp b/test/entt/entity/sigh_mixin.cpp
index 5c6f0de12..0d8bfd382 100644
--- a/test/entt/entity/sigh_mixin.cpp
+++ b/test/entt/entity/sigh_mixin.cpp
@@ -1,8 +1,8 @@
 #include <iterator>
 #include <gtest/gtest.h>
+#include <entt/entity/mixin.hpp>
 #include <entt/entity/registry.hpp>
 #include <entt/entity/storage.hpp>
-#include <entt/entity/storage_mixin.hpp>
 #include "../common/throwing_allocator.hpp"
 #include "../common/throwing_type.hpp"