diff --git a/libs/xassets/xdmaterial.h b/libs/xassets/xdmaterial.h
index 62fa94f..24ca21d 100644
--- a/libs/xassets/xdmaterial.h
+++ b/libs/xassets/xdmaterial.h
@@ -1,9 +1,3 @@
-
-
-
-
-
-
 #ifndef XDMATERIAL_H
 #define XDMATERIAL_H
 
diff --git a/libs/xassets/xgameworldmp.h b/libs/xassets/xgameworldmp.h
index 115691c..a55c485 100644
--- a/libs/xassets/xgameworldmp.h
+++ b/libs/xassets/xgameworldmp.h
@@ -1,5 +1,3 @@
-
-
 #ifndef XGAMEWORLDMP_H
 #define XGAMEWORLDMP_H
 
diff --git a/libs/xassets/xgfximage.h b/libs/xassets/xgfximage.h
index bd8c1aa..2f04323 100644
--- a/libs/xassets/xgfximage.h
+++ b/libs/xassets/xgfximage.h
@@ -1,31 +1,41 @@
 #ifndef XGFXIMAGE_H
 #define XGFXIMAGE_H
 
-#include "material.h"
 #include "xasset.h"
 #include "xcardmemory.h"
+#include "xgfxtexture.h"
+#include "xmaptype.h"
+
+#include <QString>
 
 class XGfxImage : public XAsset
 {
-    MapType mapType;
-    XGfxTexture texture;
-    quint8 semantic;
-    XCardMemory cardMemory;
-    quint16 width;
-    quint16 height;
-    quint16 depth;
-    quint8 category;
-    bool delayLoadPixels;
+public:
+    explicit XGfxImage();
 
-    qint32 pixelsPtr;
-    quint8 *pixels;
+    virtual void ParseData(QDataStream* aStream) override;
+    virtual void Clear() override;
 
-    unsigned int baseSize;
-    quint16 streamSlot;
-    bool streaming;
+private:
+    XMapType mMapType;
+    XGfxTexture mTexture;
+    quint8 mSemantic;
+    XCardMemory mCardMemory;
+    quint16 mWidth;
+    quint16 mHeight;
+    quint16 mDepth;
+    quint8 mCategory;
+    bool mDelayLoadPixels;
 
-    qint32 namePtr;
-    QString name;
+    qint32 mPixelsPtr;
+    quint8 *mPixels;
+
+    unsigned int mBaseSize;
+    quint16 mStreamSlot;
+    bool mStreaming;
+
+    qint32 mNamePtr;
+    QString mName;
 };
 
 #endif // XGFXIMAGE_H
diff --git a/libs/xassets/xgfximageloaddef.h b/libs/xassets/xgfximageloaddef.h
index 24ee35e..b7be951 100644
--- a/libs/xassets/xgfximageloaddef.h
+++ b/libs/xassets/xgfximageloaddef.h
@@ -3,6 +3,10 @@
 
 #include "xasset.h"
 
+#include <QVector>
+
+class XGfxTexture;
+
 class XGfxImageLoadDef : public XAsset
 {
 public: