4 files changed, 10 insertions, 9 deletions
diff --git a/src/JSystem/J2DGraph/J2DAnimation.cpp b/src/JSystem/J2DGraph/J2DAnimation.cpp
index bf19ea1546..9a0405c4d9 100644
--- a/src/JSystem/J2DGraph/J2DAnimation.cpp
+++ b/src/JSystem/J2DGraph/J2DAnimation.cpp
@@ -3,6 +3,7 @@
 #include "JSystem/J2DGraph/J2DAnimation.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
+#include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "JSystem/JUtility/JUTPalette.h"
 #include "JSystem/JUtility/JUTResource.h"
 #include <dolphin/os.h>
diff --git a/src/JSystem/J2DGraph/J2DPane.cpp b/src/JSystem/J2DGraph/J2DPane.cpp
index ccaa67aaa4..23f40cd375 100644
--- a/src/JSystem/J2DGraph/J2DPane.cpp
+++ b/src/JSystem/J2DGraph/J2DPane.cpp
@@ -4,6 +4,7 @@
 #include "JSystem/J2DGraph/J2DAnimation.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
+#include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include "JSystem/JUtility/JUTResource.h"
 
diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
index 6b9a2d2250..28b80c58f1 100644
--- a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
@@ -1,6 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
+#include "JSystem/J3DGraphAnimator/J3DModelData.h"
 #include "JSystem/J3DGraphBase/J3DStruct.h"
 #include "JSystem/JMath/JMath.h"
 
diff --git a/src/d/d_bg_parts.cpp b/src/d/d_bg_parts.cpp
index 7d4dcd38f2..3799fe52da 100644
--- a/src/d/d_bg_parts.cpp
+++ b/src/d/d_bg_parts.cpp
@@ -7,15 +7,13 @@
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 
-// NONMATCHING
 void dBgp_c::material_c::draw() {
-    material_c* material;
+    material_c* material = this;
     do {
-        drawSimple();
-    } while ((material = getNext()) != NULL);
+        material->drawSimple();
+    } while ((material = material->getNext()) != NULL);
 }
 
-// NONMATCHING - regalloc
 void dBgp_c::modelMaterial_c::drawSimple() {
     if (mpMaterial->getInvalid()) {
         OSReport_Warning("Share Material Nothing !!\n");
@@ -33,7 +31,7 @@ void dBgp_c::modelMaterial_c::drawSimple() {
     int spC = 0;
     void* vatCmd = NULL;
 
-    if (getMaterial()->getShape()->checkFlag(1)) {
+    if (modelMaterial->getMaterial()->getShape()->checkFlag(1)) {
         modelMaterial = modelMaterial->getChild();
     }
 
@@ -106,7 +104,7 @@ void dBgp_c::modelMaterial_c::set(J3DModelData* i_modelData, J3DMaterial* i_mate
 
 void dBgp_c::model_c::create(J3DModelData* i_modelData, Mtx i_mtx) {
     const void* binary = i_modelData->getBinary();
-    
+
     mId = *(u32*)((char*)binary + 0x1C);
     if (mId != 0xFFFF) {
         addShare(mId);
@@ -230,7 +228,7 @@ void dBgp_c::share_c::set(u16 i_id) {
     if (mCount++ == 0) {
         mStatus = 1;
         mId = i_id;
-        
+
         int rt = dComIfG_setObjectRes(getArcName(), 0, (JKRHeap*)NULL);
         JUT_ASSERT(446, rt != 0);
     }
@@ -295,7 +293,7 @@ int dBgp_c::share_c::execute() {
         for (u16 i = 0; i < mModelData->getMaterialNum(); i++) {
             J3DMaterial* material = mModelData->getMaterialNodePointer(i);
             mMaterial[i].set(mModelData, material, cMtx_getIdentity());
-            
+
             J3DShape* shape = material->getShape();
             shape->hide();