diff --git a/include/JSystem/J3DGraphAnimator/J3DCluster.h b/include/JSystem/J3DGraphAnimator/J3DCluster.h
index bc86b6641..00038a877 100644
--- a/include/JSystem/J3DGraphAnimator/J3DCluster.h
+++ b/include/JSystem/J3DGraphAnimator/J3DCluster.h
@@ -1,11 +1,15 @@
 #ifndef J3DCLUSTER_H
 #define J3DCLUSTER_H
 
+#include "JSystem/JUtility/JUTAssert.h"
 #include "dolphin/types.h"
 
 class J3DDeformer;
 class J3DClusterKey;
 class J3DClusterVertex;
+class J3DModel;
+class J3DVertexBuffer;
+class JUTNameTab;
 
 class J3DCluster {
 public:
@@ -57,6 +61,41 @@ public:
     /* 0x08 */ u16* mNrmFlag;
 };  // Size: 0x0C
 
+class J3DDeformData {
+public:
+    J3DDeformData();
+    void clear();
+    void deform(J3DVertexBuffer*);
+    void deform(J3DModel*);
+
+    u16 getClusterNum() const { return mClusterNum; }
+    u16 getClusterKeyNum() const { return mClusterKeyNum; }
+    J3DCluster* getClusterPointer(u16 index) {
+        J3D_ASSERT(186, (index < mClusterNum),"Error : range over.");
+        return &mClusterPointer[index];
+    }
+    J3DClusterKey* getClusterKeyPointer(u16 i) { return &mClusterKeyPointer[i]; }
+    f32* getVtxPos() { return mVtxPos; }
+    f32* getVtxNrm() { return mVtxNrm; }
+
+private:
+    friend class J3DClusterLoader;
+    friend class J3DClusterLoader_v15;
+
+    /* 0x00 */ u16 mClusterNum;
+    /* 0x02 */ u16 mClusterKeyNum;
+    /* 0x04 */ u16 mClusterVertexNum;
+    /* 0x08 */ J3DCluster* mClusterPointer;
+    /* 0x0C */ J3DClusterKey* mClusterKeyPointer;
+    /* 0x10 */ J3DClusterVertex* mClusterVertex;
+    /* 0x14 */ u16 mVtxPosNum;
+    /* 0x16 */ u16 mVtxNrmNum;
+    /* 0x18 */ f32* mVtxPos;
+    /* 0x1C */ f32* mVtxNrm;
+    /* 0x20 */ JUTNameTab* mClusterName;
+    /* 0x24 */ JUTNameTab* mClusterKeyName;
+};  // Size: 0x28
+
 class J3DClusterVertex {
 public:
     void operator=(const J3DClusterVertex& other) {
diff --git a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
index 467520324..c7be046fd 100644
--- a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
+++ b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/J3DGraphAnimator/J3DCluster.h"
 #include "JSystem/J3DGraphBase/J3DTransform.h"
-#include "JSystem/JUtility/JUTAssert.h"
 #include "dolphin/types.h"
 #include "global.h"
 
@@ -11,42 +10,6 @@ class J3DModelData;
 class J3DModel;
 class J3DVertexBuffer;
 class J3DAnmCluster;
-class JUTNameTab;
-
-class J3DDeformData {
-public:
-    J3DDeformData();
-    void clear();
-    void deform(J3DVertexBuffer*);
-    void deform(J3DModel*);
-
-    u16 getClusterNum() const { return mClusterNum; }
-    u16 getClusterKeyNum() const { return mClusterKeyNum; }
-    J3DCluster* getClusterPointer(u16 index) {
-        J3D_ASSERT(186, (index < mClusterNum),"Error : range over.");
-        return &mClusterPointer[index];
-    }
-    J3DClusterKey* getClusterKeyPointer(u16 i) { return &mClusterKeyPointer[i]; }
-    f32* getVtxPos() { return mVtxPos; }
-    f32* getVtxNrm() { return mVtxNrm; }
-
-private:
-    friend class J3DClusterLoader;
-    friend class J3DClusterLoader_v15;
-
-    /* 0x00 */ u16 mClusterNum;
-    /* 0x02 */ u16 mClusterKeyNum;
-    /* 0x04 */ u16 mClusterVertexNum;
-    /* 0x08 */ J3DCluster* mClusterPointer;
-    /* 0x0C */ J3DClusterKey* mClusterKeyPointer;
-    /* 0x10 */ J3DClusterVertex* mClusterVertex;
-    /* 0x14 */ u16 mVtxPosNum;
-    /* 0x16 */ u16 mVtxNrmNum;
-    /* 0x18 */ f32* mVtxPos;
-    /* 0x1C */ f32* mVtxNrm;
-    /* 0x20 */ JUTNameTab* mClusterName;
-    /* 0x24 */ JUTNameTab* mClusterKeyName;
-};  // Size: 0x28
 
 class J3DSkinDeform {
 public: