diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index c349d9a248..ffb286772b 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -103,7 +103,7 @@ add_component_dir (sceneutil
     )
 
 add_component_dir (nif
-    base controlled controller data effect extra niffile nifkey nifstream niftypes node particle physics property record record_ptr
+    base controller data effect extra niffile nifkey nifstream niftypes node particle physics property record record_ptr texture
     )
 
 add_component_dir (nifosg
diff --git a/components/nif/controller.cpp b/components/nif/controller.cpp
index ba6fa025c7..1355ce21d3 100644
--- a/components/nif/controller.cpp
+++ b/components/nif/controller.cpp
@@ -1,9 +1,9 @@
 #include "controller.hpp"
 
-#include "controlled.hpp"
 #include "data.hpp"
 #include "node.hpp"
 #include "particle.hpp"
+#include "texture.hpp"
 
 namespace Nif
 {
diff --git a/components/nif/effect.cpp b/components/nif/effect.cpp
index 3b90d50564..e5dd2282b6 100644
--- a/components/nif/effect.cpp
+++ b/components/nif/effect.cpp
@@ -1,7 +1,7 @@
 #include "effect.hpp"
 
-#include "controlled.hpp"
 #include "node.hpp"
+#include "texture.hpp"
 
 namespace Nif
 {
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 59e73196fb..e147ee3528 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -10,7 +10,6 @@
 #include <sstream>
 #include <stdexcept>
 
-#include "controlled.hpp"
 #include "controller.hpp"
 #include "data.hpp"
 #include "effect.hpp"
@@ -20,6 +19,7 @@
 #include "particle.hpp"
 #include "physics.hpp"
 #include "property.hpp"
+#include "texture.hpp"
 
 namespace Nif
 {
diff --git a/components/nif/property.cpp b/components/nif/property.cpp
index 3c1c424de9..39a7cbff23 100644
--- a/components/nif/property.cpp
+++ b/components/nif/property.cpp
@@ -1,7 +1,7 @@
 #include "property.hpp"
 
-#include "controlled.hpp"
 #include "data.hpp"
+#include "texture.hpp"
 
 namespace Nif
 {
diff --git a/components/nif/controlled.cpp b/components/nif/texture.cpp
similarity index 98%
rename from components/nif/controlled.cpp
rename to components/nif/texture.cpp
index fd38a4909d..0e86c04079 100644
--- a/components/nif/controlled.cpp
+++ b/components/nif/texture.cpp
@@ -1,4 +1,4 @@
-#include "controlled.hpp"
+#include "texture.hpp"
 
 #include "data.hpp"
 
diff --git a/components/nif/controlled.hpp b/components/nif/texture.hpp
similarity index 89%
rename from components/nif/controlled.hpp
rename to components/nif/texture.hpp
index 1a5cc6db42..b74b44bec0 100644
--- a/components/nif/controlled.hpp
+++ b/components/nif/texture.hpp
@@ -1,12 +1,16 @@
-#ifndef OPENMW_COMPONENTS_NIF_CONTROLLED_HPP
-#define OPENMW_COMPONENTS_NIF_CONTROLLED_HPP
+#ifndef OPENMW_COMPONENTS_NIF_TEXTURE_HPP
+#define OPENMW_COMPONENTS_NIF_TEXTURE_HPP
 
 #include "base.hpp"
 
 namespace Nif
 {
 
-    struct NiSourceTexture : public Named
+    struct NiTexture : public Named
+    {
+    };
+
+    struct NiSourceTexture : public NiTexture
     {
         // Is this an external (references a separate texture file) or
         // internal (data is inside the nif itself) texture?
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index b9fd2cd986..3a8e3017c9 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -42,13 +42,14 @@
 #include <osg/TexEnvCombine>
 #include <osg/Texture2D>
 
-#include <components/nif/controlled.hpp>
 #include <components/nif/effect.hpp>
 #include <components/nif/exception.hpp>
 #include <components/nif/extra.hpp>
 #include <components/nif/niffile.hpp>
 #include <components/nif/node.hpp>
+#include <components/nif/particle.hpp>
 #include <components/nif/property.hpp>
+#include <components/nif/texture.hpp>
 #include <components/sceneutil/depth.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/riggeometry.hpp>
diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp
index 40f305a6a4..8be0d4ba4f 100644
--- a/components/nifosg/particle.cpp
+++ b/components/nifosg/particle.cpp
@@ -9,7 +9,6 @@
 
 #include <components/debug/debuglog.hpp>
 #include <components/misc/rng.hpp>
-#include <components/nif/controlled.hpp>
 #include <components/nif/data.hpp>
 #include <components/sceneutil/morphgeometry.hpp>
 #include <components/sceneutil/riggeometry.hpp>