diff --git a/libs/xassets/xd3dbasetexture.h b/libs/xassets/xd3dbasetexture.h
index edb39d7..b0d8599 100644
--- a/libs/xassets/xd3dbasetexture.h
+++ b/libs/xassets/xd3dbasetexture.h
@@ -2,7 +2,9 @@
 #define XD3DBASETEXTURE_H
 
 #include "xasset.h"
-#include "xd3dresource.h"
+
+class XGpuTextureFetchConstant;
+class XD3DResource;
 
 class XD3DBaseTexture : public XAsset
 {
diff --git a/libs/xassets/xd3dcubetexture.cpp b/libs/xassets/xd3dcubetexture.cpp
index f74b2df..a8d01c4 100644
--- a/libs/xassets/xd3dcubetexture.cpp
+++ b/libs/xassets/xd3dcubetexture.cpp
@@ -1,5 +1,7 @@
 #include "xgfximageloaddef.h"
 
+#include "xgfxtexture.h"
+
 XGfxImageLoadDef::XGfxImageLoadDef()
     : XAsset()
     , mLevelCount(0)
diff --git a/libs/xassets/xd3dcubetexture.h b/libs/xassets/xd3dcubetexture.h
index 24ee35e..0750c92 100644
--- a/libs/xassets/xd3dcubetexture.h
+++ b/libs/xassets/xd3dcubetexture.h
@@ -1,23 +1,8 @@
-#ifndef XGFXIMAGELOADDEF_H
-#define XGFXIMAGELOADDEF_H
+#ifndef XD3DCUBETEXTURE_H
+#define XD3DCUBETEXTURE_H
 
-#include "xasset.h"
+#include "xd3dbasetexture.h"
 
-class XGfxImageLoadDef : public XAsset
-{
-public:
-    XGfxImageLoadDef();
-    ~XGfxImageLoadDef();
+typedef XD3DBaseTexture XD3DCubeTexture;
 
-    virtual void ParseData(QDataStream* aStream) override;
-    virtual void Clear() override;
-
-private:
-    quint8 mLevelCount;
-    quint8 mFlags;
-    QVector<qint16> mDimensions;
-    int mFormat;
-    XGfxTexture* mTexture;
-};
-
-#endif // XGFXIMAGELOADDEF_H
+#endif // XD3DCUBETEXTURE_H
diff --git a/libs/xassets/xd3dvolumetexture.h b/libs/xassets/xd3dvolumetexture.h
index 24ee35e..9faa957 100644
--- a/libs/xassets/xd3dvolumetexture.h
+++ b/libs/xassets/xd3dvolumetexture.h
@@ -1,23 +1,8 @@
-#ifndef XGFXIMAGELOADDEF_H
-#define XGFXIMAGELOADDEF_H
+#ifndef XD3DVOLUMETEXTURE_H
+#define XD3DVOLUMETEXTURE_H
 
-#include "xasset.h"
+#include "xd3dbasetexture.h"
 
-class XGfxImageLoadDef : public XAsset
-{
-public:
-    XGfxImageLoadDef();
-    ~XGfxImageLoadDef();
+typedef XD3DBaseTexture XD3DVolumeTexture;
 
-    virtual void ParseData(QDataStream* aStream) override;
-    virtual void Clear() override;
-
-private:
-    quint8 mLevelCount;
-    quint8 mFlags;
-    QVector<qint16> mDimensions;
-    int mFormat;
-    XGfxTexture* mTexture;
-};
-
-#endif // XGFXIMAGELOADDEF_H
+#endif // XD3DVOLUMETEXTURE_H