diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index 596e5a36e7..b75b092c28 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -6,7 +6,7 @@
 #include <dolphin/mtx.h>
 #include "global.h"
 
-class J3DTransformInfo;
+struct J3DTransformInfo;
 
 struct JUTDataBlockHeader {
     /* 0x0 */ u32 mType;
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index ed26d73694..9380c39328 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -100,7 +100,7 @@ protected:
 
 class J3DMaterial;
 class J3DVertexData;
-class J3DDrawMtxData;
+struct J3DDrawMtxData;
 
 enum J3DShpFlag {
     J3DShpFlag_Visible    = 0x0001,
diff --git a/include/JSystem/JAudio2/JAISeq.h b/include/JSystem/JAudio2/JAISeq.h
index 3752e0adc7..3f272159f3 100644
--- a/include/JSystem/JAudio2/JAISeq.h
+++ b/include/JSystem/JAudio2/JAISeq.h
@@ -6,7 +6,7 @@
 #include "JSystem/JSupport/JSUList.h"
 
 class JAISeqMgr;
-class JAISoundChild;
+struct JAISoundChild;
 
 /**
  * @ingroup jsystem-jaudio
diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h
index 3e1e36b9ad..96e6d96d9a 100644
--- a/include/JSystem/JAudio2/JAISound.h
+++ b/include/JSystem/JAudio2/JAISound.h
@@ -250,10 +250,10 @@ public:
 
 class JAISoundHandle;
 class JAIAudible;
-class JAIAudience;
+struct JAIAudience;
 class JAISe;
 class JAISeq;
-class JAISoundChild;
+struct JAISoundChild;
 class JAIStream;
 class JAITempoMgr;
 
diff --git a/include/JSystem/JAudio2/JAIStreamMgr.h b/include/JSystem/JAudio2/JAIStreamMgr.h
index 3b2b9c7f42..7c8e68a852 100644
--- a/include/JSystem/JAudio2/JAIStreamMgr.h
+++ b/include/JSystem/JAudio2/JAIStreamMgr.h
@@ -6,7 +6,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 
 class JAIStreamAramMgr;
-class JAIStreamDataMgr;
+struct JAIStreamDataMgr;
 
 /**
  * @ingroup jsystem-jaudio
diff --git a/include/JSystem/JAudio2/JASBank.h b/include/JSystem/JAudio2/JASBank.h
index f99d245d89..9c70772a10 100644
--- a/include/JSystem/JAudio2/JASBank.h
+++ b/include/JSystem/JAudio2/JASBank.h
@@ -4,7 +4,7 @@
 #include <dolphin/types.h>
 
 class JASChannel;
-class JASInstParam;
+struct JASInstParam;
 class JASWaveBank;
 
 namespace JASDsp {
diff --git a/include/JSystem/JAudio2/JASHeapCtrl.h b/include/JSystem/JAudio2/JASHeapCtrl.h
index 6c219ac091..90d2fe728e 100644
--- a/include/JSystem/JAudio2/JASHeapCtrl.h
+++ b/include/JSystem/JAudio2/JASHeapCtrl.h
@@ -7,7 +7,7 @@
 #include <dolphin/os.h>
 #include <dolphin/os.h>
 
-class JASDisposer;
+struct JASDisposer;
 class JKRHeap;
 class JKRSolidHeap;
 
diff --git a/include/JSystem/JAudio2/JASSeqParser.h b/include/JSystem/JAudio2/JASSeqParser.h
index b9368b28ed..e8f425de84 100644
--- a/include/JSystem/JAudio2/JASSeqParser.h
+++ b/include/JSystem/JAudio2/JASSeqParser.h
@@ -3,7 +3,7 @@
 
 #include <dolphin/types.h>
 
-class JASTrack;
+struct JASTrack;
 
 /**
  * @ingroup jsystem-jaudio
diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/include/JSystem/JAudio2/JAUSectionHeap.h
index a7535500a4..e02b7df164 100644
--- a/include/JSystem/JAudio2/JAUSectionHeap.h
+++ b/include/JSystem/JAudio2/JAUSectionHeap.h
@@ -6,16 +6,16 @@
 #include "JSystem/JKernel/JKRDisposer.h"
 #include <bitset>
 
-class JAISeqData;
-class JAISeqDataMgr;
-class JAISeqDataUser;
-class JAIStreamDataMgr;
+struct JAISeqData;
+struct JAISeqDataMgr;
+struct JAISeqDataUser;
+struct JAIStreamDataMgr;
 class JASVoiceBank;
 class JAUBankTableLink;
 class JAUDisposer_;
 class JAUSectionHeap;
-class JAUSoundTable;
-class JAUSoundNameTable;
+struct JAUSoundTable;
+struct JAUSoundNameTable;
 class JKRArchive;
 class JKRSolidHeap;
 
diff --git a/include/d/d_meter2_info.h b/include/d/d_meter2_info.h
index eee959a9a3..72ca6ad9b2 100644
--- a/include/d/d_meter2_info.h
+++ b/include/d/d_meter2_info.h
@@ -5,7 +5,7 @@
 
 class CPaneMgr;
 class J2DTextBox;
-struct JMSMesgEntry_c;
+class JMSMesgEntry_c;
 class JUTFont;
 
 struct dMenu_LetterData {
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index 35e81f0059..c351ddad9d 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -221,7 +221,7 @@ private:
     /* 0x14 */ J3DAnmCluster* mpAnm;
 };
 
-class J3DTransformInfo;
+struct J3DTransformInfo;
 
 class mDoExt_AnmRatioPack {
 public: