diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index dbfb745faec..00bd2b8655e 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -338,6 +338,7 @@ private:
 };  // Size: 0x28
 
 class J3DAnmTransformFull : public J3DAnmTransform {
+public:
     /* 8032C2AC */ virtual ~J3DAnmTransformFull();
     /* 8032C318 */ virtual s32 getKind() const;
     /* 80328E90 */ virtual void getTransform(u16, J3DTransformInfo*) const;
@@ -347,14 +348,15 @@ private:
 };  // Size: 0x24
 
 class J3DAnmTransformFullWithLerp : public J3DAnmTransformFull {
+public:
     /* 8032C228 */ virtual ~J3DAnmTransformFullWithLerp();
     /* 8032C2A4 */ virtual s32 getKind() const;
     /* 803291F0 */ virtual void getTransform(u16, J3DTransformInfo*) const;
 };  // Size: 0x24
 
 struct J3DTextureSRTInfo;
-struct J3DModelData;
-struct J3DMaterialTable;
+class J3DModelData;
+class J3DMaterialTable;
 
 class J3DAnmTextureSRTKey : public J3DAnmBase {
 public:
diff --git a/include/JSystem/J3DGraphAnimator/J3DCluster.h b/include/JSystem/J3DGraphAnimator/J3DCluster.h
index 3cf06bebd9b..511c17eed2b 100644
--- a/include/JSystem/J3DGraphAnimator/J3DCluster.h
+++ b/include/JSystem/J3DGraphAnimator/J3DCluster.h
@@ -3,7 +3,7 @@
 
 #include "dolphin/types.h"
 
-struct J3DDeformer;
+class J3DDeformer;
 
 struct J3DCluster {
     /* 0x00 */ f32 field_0x0;
diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
index d7926836063..2dd47be9f86 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
@@ -11,7 +11,7 @@ struct J3DModelHierarchy {
     /* 0x2 */ u16 mValue;
 };
 
-struct J3DMaterialTable;
+class J3DMaterialTable;
 
 struct J3DDrawMtxData {
     /* 803115E0 */ J3DDrawMtxData();
diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
index 343006df807..1891eedb96d 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
@@ -3,12 +3,12 @@
 
 #include "dolphin/types.h"
 
-struct J3DMaterial;
-struct J3DTexture;
-struct J3DAnmColor;
-struct J3DAnmTexPattern;
-struct J3DAnmTextureSRTKey;
-struct J3DAnmTevRegKey;
+class J3DMaterial;
+class J3DTexture;
+class J3DAnmColor;
+class J3DAnmTexPattern;
+class J3DAnmTextureSRTKey;
+class J3DAnmTevRegKey;
 class JUTNameTab;
 
 class J3DMaterialTable {
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index 9c43cfcfdc9..0b184b0f035 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -7,8 +7,8 @@
 
 typedef struct _GXColor GXColor;
 class J3DModel;
-struct J3DAnmVtxColor;
-struct J3DVertexBuffer;
+class J3DAnmVtxColor;
+class J3DVertexBuffer;
 
 struct J3DVtxColorCalc {
     /* 8032E180 */ void calc(J3DModel*);
diff --git a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h
index 959f56df2f4..93786634100 100644
--- a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h
+++ b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h
@@ -5,7 +5,7 @@
 
 enum J3DAnmLoaderDataBaseFlag { J3DLOADER_UNK_FLAG0 };
 
-struct J3DAnmBase;
+class J3DAnmBase;
 
 struct J3DAnmLoaderDataBase {
     /* 80337B40 */ static void* load(void const*, J3DAnmLoaderDataBaseFlag);
diff --git a/include/JSystem/J3DGraphLoader/J3DJointFactory.h b/include/JSystem/J3DGraphLoader/J3DJointFactory.h
index 93e04d92696..2c7653b26d3 100644
--- a/include/JSystem/J3DGraphLoader/J3DJointFactory.h
+++ b/include/JSystem/J3DGraphLoader/J3DJointFactory.h
@@ -4,7 +4,7 @@
 #include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "dolphin/types.h"
 
-struct J3DJoint;
+class J3DJoint;
 struct ResNTAB;
 
 struct J3DJointInitData {
diff --git a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h b/include/JSystem/J3DGraphLoader/J3DShapeFactory.h
index 4347dd5c1d0..63df9092384 100644
--- a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h
+++ b/include/JSystem/J3DGraphLoader/J3DShapeFactory.h
@@ -4,9 +4,9 @@
 #include "dolphin/gx/GXAttr.h"
 #include "dolphin/mtx/vec.h"
 
-struct J3DShape;
-struct J3DShapeMtx;
-struct J3DShapeDraw;
+class J3DShape;
+class J3DShapeMtx;
+class J3DShapeDraw;
 struct ResNTAB;
 
 struct J3DShapeInitData {
diff --git a/include/JSystem/JAudio2/JAIAudience.h b/include/JSystem/JAudio2/JAIAudience.h
index b5bef7212b7..294784d5e35 100644
--- a/include/JSystem/JAudio2/JAIAudience.h
+++ b/include/JSystem/JAudio2/JAIAudience.h
@@ -3,7 +3,7 @@
 
 #include "JSystem/JGeometry.h"
 
-struct JAIAudible;
+class JAIAudible;
 class JAISoundID;
 struct JASSoundParams;
 
diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/include/JSystem/JAudio2/JAISeqMgr.h
index 2311c2bc72b..fd254ea5d08 100644
--- a/include/JSystem/JAudio2/JAISeqMgr.h
+++ b/include/JSystem/JAudio2/JAISeqMgr.h
@@ -6,7 +6,7 @@
 #include "JSystem/JSupport/JSUList.h"
 
 struct JAIAudience;
-struct JAISeq;
+class JAISeq;
 
 class JAISeqMgr : public JAISeqDataUser, public JASGlobalInstance<JAISeqMgr> {
 public:
diff --git a/include/JSystem/JAudio2/JAISoundInfo.h b/include/JSystem/JAudio2/JAISoundInfo.h
index 600af09387b..081a9e6afe2 100644
--- a/include/JSystem/JAudio2/JAISoundInfo.h
+++ b/include/JSystem/JAudio2/JAISoundInfo.h
@@ -4,10 +4,6 @@
 #include "JSystem/JAudio2/JAISound.h"
 #include "JSystem/JAudio2/JASGadget.h"
 
-struct JAISe;
-struct JAISeq;
-struct JAIStream;
-
 struct JAISoundInfo : public JASGlobalInstance<JAISoundInfo> {
     /* 802A2D34 */ JAISoundInfo(bool);
     virtual u32 getSoundType(JAISoundID) const = 0;
diff --git a/include/JSystem/JAudio2/JAIStreamMgr.h b/include/JSystem/JAudio2/JAIStreamMgr.h
index 8e458dc762d..a3abdedfa94 100644
--- a/include/JSystem/JAudio2/JAIStreamMgr.h
+++ b/include/JSystem/JAudio2/JAIStreamMgr.h
@@ -7,7 +7,8 @@
 
 class JAIStreamMgr;
 
-struct JAIStream {
+class JAIStream {
+public:
     /* 802A3104 */ JAIStream(JAIStreamMgr*, JAISoundStrategyMgr<JAIStream>*);
     /* 802A319C */ void JAIStreamMgr_startID_(JAISoundID, s32, JGeometry::TVec3<f32> const*,
                                               JAIAudience*, int);
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h
index 068dfb91096..bc4394bfc1c 100644
--- a/include/JSystem/JParticle/JPAEmitter.h
+++ b/include/JSystem/JParticle/JPAEmitter.h
@@ -10,10 +10,10 @@
 #include "JSystem/JParticle/JPADynamicsBlock.h"
 #include "JSystem/JSupport/JSUList.h"
 
-struct JPAResourceManager;
-struct JPABaseEmitter;
-struct JPAEmitterManager;
-struct JPAParticleCallBack;
+class JPAResourceManager;
+class JPABaseEmitter;
+class JPAEmitterManager;
+class JPAParticleCallBack;
 
 struct JPAEmitterWorkData {
     /* 0x00 */ JPABaseEmitter* mpEmtr;
diff --git a/include/JSystem/JParticle/JPAEmitterManager.h b/include/JSystem/JParticle/JPAEmitterManager.h
index 71c606d8032..c4b5a065f4f 100644
--- a/include/JSystem/JParticle/JPAEmitterManager.h
+++ b/include/JSystem/JParticle/JPAEmitterManager.h
@@ -7,12 +7,12 @@
 #include "JSystem/JSupport/JSUList.h"
 #include "JSystem/JGeometry.h"
 
-struct JPAEmitterCallBack;
-struct JPAParticleCallBack;
-struct JPABaseEmitter;
-struct JPAResourceManager;
-struct JPABaseParticle;
-struct JKRHeap;
+class JPAEmitterCallBack;
+class JPAParticleCallBack;
+class JPABaseEmitter;
+class JPAResourceManager;
+class JPABaseParticle;
+class JKRHeap;
 struct JPAEmitterWorkData;
 
 class JPAEmitterManager {
diff --git a/include/JSystem/JParticle/JPAResourceManager.h b/include/JSystem/JParticle/JPAResourceManager.h
index 7a7f8204210..b204c732ba1 100644
--- a/include/JSystem/JParticle/JPAResourceManager.h
+++ b/include/JSystem/JParticle/JPAResourceManager.h
@@ -5,8 +5,8 @@
 #include "dolphin/types.h"
 
 class JKRHeap;
-class ResTIMG;
 class JPAResource;
+struct ResTIMG;
 
 class JPAResourceManager {
 public:
diff --git a/include/Z2AudioLib/Z2SoundInfo.h b/include/Z2AudioLib/Z2SoundInfo.h
index e2ce2449b04..06529f559b2 100644
--- a/include/Z2AudioLib/Z2SoundInfo.h
+++ b/include/Z2AudioLib/Z2SoundInfo.h
@@ -3,14 +3,6 @@
 
 #include "JSystem/JAudio2/JAISoundInfo.h"
 
-struct JAISeq;
-
-struct JAISound;
-
-struct JAIStream;
-
-struct JAISe;
-
 struct JAUSoundInfo : public JASGlobalInstance<JAUSoundInfo> {
     virtual void getAudibleSw(JAISoundID) const = 0;
     virtual void getBgmSeqResourceID(JAISoundID) const = 0;
diff --git a/include/d/bg/d_bg_w.h b/include/d/bg/d_bg_w.h
index 6fc2848f7b5..e12b5b2c0aa 100644
--- a/include/d/bg/d_bg_w.h
+++ b/include/d/bg/d_bg_w.h
@@ -280,7 +280,7 @@ public:
     /* 8007C910 */ virtual void WallCorrectSort(dBgS_Acch*);
     /* 8007D470 */ virtual bool RoofChk(dBgS_RoofChk*);
     /* 8007D830 */ virtual bool SplGrpChk(dBgS_SplGrpChk*);
-    /* 8007DF00 */ virtual bool SphChk(dBgS_SphChk*, virtual void*);
+    /* 8007DF00 */ virtual bool SphChk(dBgS_SphChk*, void*);
     /* 8007B3AC */ virtual s32 GetExitId(cBgS_PolyInfo const&);
     /* 8007B3D8 */ virtual s32 GetPolyColor(cBgS_PolyInfo const&);
     /* 8007B404 */ virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&);
@@ -311,11 +311,11 @@ public:
     /* 8007B904 */ virtual s32 GetRoomPathPntNo(cBgS_PolyInfo const&);
     /* 8007DF28 */ virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&);
     /* 8007DF58 */ virtual u8 GetGrpSoundId(cBgS_PolyInfo const&);
-    /* 8007DF88 */ virtual void CrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*,
+    /* 8007DF88 */ virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                        csXyz*);
-    /* 8007DFC4 */ virtual void TransPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*,
+    /* 8007DFC4 */ virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                          csXyz*);
-    /* 8007E000 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*,
+    /* 8007E000 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*,
                                              csXyz*, csXyz*);
     /* 8007E444 */ virtual void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*);
     /* 8007E474 */ virtual void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
diff --git a/include/d/bg/d_bg_w_kcol.h b/include/d/bg/d_bg_w_kcol.h
index bfec21f7c90..f161995bb0f 100644
--- a/include/d/bg/d_bg_w_kcol.h
+++ b/include/d/bg/d_bg_w_kcol.h
@@ -70,7 +70,7 @@ public:
     /* 80080330 */ virtual void WallCorrectSort(dBgS_Acch*);
     /* 80081E18 */ virtual bool RoofChk(dBgS_RoofChk*);
     /* 80082184 */ virtual bool SplGrpChk(dBgS_SplGrpChk*);
-    /* 800824EC */ virtual bool SphChk(dBgS_SphChk*, virtual void*);
+    /* 800824EC */ virtual bool SphChk(dBgS_SphChk*, void*);
     /* 800829F0 */ virtual s32 GetGrpRoomIndex(cBgS_PolyInfo const&) const;
     /* 80082A20 */ virtual s32 GetExitId(cBgS_PolyInfo const&);
     /* 80082A50 */ virtual s32 GetPolyColor(cBgS_PolyInfo const&);
@@ -102,11 +102,11 @@ public:
     /* 80082EFC */ virtual s32 GetRoomPathPntNo(cBgS_PolyInfo const&);
     /* 80082F2C */ virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&);
     /* 80082F5C */ virtual u8 GetGrpSoundId(cBgS_PolyInfo const&);
-    /* 80082F8C */ virtual void CrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*,
+    /* 80082F8C */ virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                        csXyz*);
-    /* 80082F90 */ virtual void TransPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*, csXyz*,
+    /* 80082F90 */ virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                          csXyz*);
-    /* 80082F94 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, virtual void*, bool, cXyz*,
+    /* 80082F94 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*,
                                              csXyz*, csXyz*);
 
     KC_PrismData* getPrismData(int poly_index) const { return &m_pkc_head->m_prism_data[poly_index]; }
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index 811885d715a..12d4847d0fb 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -328,12 +328,11 @@ public:
     void setItemPachinkoNumCount(s16 seeds) { mItemPachinkoNumCount += seeds; }
     void setItemKeyNumCount(s16 keys) { mItemKeyNumCount += keys; }
     void setItemMaxLifeCount(s16 max) { mItemMaxLifeCount += max; }
-    void setOxygen(int oxygen) { mOxygen = oxygen; }
+    void setOxygen(s32 oxygen) { mOxygen = oxygen; }
     void setNowOxygen(s32 oxygen) { mNowOxygen = oxygen; }
     void setOxygenCount(s32 oxygen) { mOxygenCount += oxygen; }
     int getOxygen() { return mOxygen; }
     void setMaxOxygen(int max) { mMaxOxygen = max; }
-    void setOxygen(s32 i_oxygen) { mOxygen = i_oxygen; }
     int getMaxOxygen() { return mMaxOxygen; }
     int getNowOxygen() { return mNowOxygen; }
     void setItemNowLife(u16 life) { mItemNowLife = life; }
diff --git a/include/d/d_lib.h b/include/d/d_lib.h
index 0d183141c64..8f024b72ea0 100644
--- a/include/d/d_lib.h
+++ b/include/d/d_lib.h
@@ -7,7 +7,7 @@
 
 class fopAc_ac_c;
 
-struct JKRAramArchive;
+class JKRAramArchive;
 u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName);
 BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2,
                                 cXyz const* param_3);
diff --git a/include/d/d_name.h b/include/d/d_name.h
index 02c9589acbb..d025155f5e1 100644
--- a/include/d/d_name.h
+++ b/include/d/d_name.h
@@ -10,7 +10,7 @@ class J2DAnmColorKey;
 class J2DAnmTextureSRTKey;
 class J2DTextBox;
 class JUTFont;
-struct STControl;
+class STControl;
 
 class dNm_HIO_c {
 public:
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index 6ff2919d57c..e9dc6134933 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -979,7 +979,7 @@ int dStage_changeScene4Event(int i_exitId, s8 room_no, int i_wipe, bool param_3,
 void dStage_Create();
 static s32 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0);
 void dStage_restartRoom(u32 roomParam, u32 mode, int param_2);
-struct cBgS_GndChk;
+class cBgS_GndChk;
 int dStage_RoomCheck(cBgS_GndChk* gndChk);
 void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* stageDt, int param_2);
 void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* stageDt, int param_2);
diff --git a/include/d/menu/d_menu_collect.h b/include/d/menu/d_menu_collect.h
index 99bb4217462..2c9d0c3b478 100644
--- a/include/d/menu/d_menu_collect.h
+++ b/include/d/menu/d_menu_collect.h
@@ -6,7 +6,7 @@
 
 class CPaneMgr;
 struct CSTControl;
-struct STControl;
+class STControl;
 class dMsgString_c;
 class dMenu_save_c;
 class dMenu_Option_c;
diff --git a/include/d/menu/d_menu_dmap.h b/include/d/menu/d_menu_dmap.h
index 9a1006ab02b..3d40516ae27 100644
--- a/include/d/menu/d_menu_dmap.h
+++ b/include/d/menu/d_menu_dmap.h
@@ -11,7 +11,7 @@ class J2DPicture;
 class J2DScreen;
 class JKRArchive;
 class JKRExpHeap;
-struct STControl;
+class STControl;
 class dMenu_DmapMapCtrl_c;
 class dMenu_DmapBg_c;
 class mDoDvdThd_mountArchive_c;
diff --git a/include/d/menu/d_menu_fishing.h b/include/d/menu/d_menu_fishing.h
index 85a08e98a01..39358f4aa6a 100644
--- a/include/d/menu/d_menu_fishing.h
+++ b/include/d/menu/d_menu_fishing.h
@@ -6,7 +6,7 @@
 class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
-struct STControl;
+class STControl;
 class dMsgString_c;
 class mDoDvdThd_mountArchive_c;
 
diff --git a/include/d/menu/d_menu_fmap.h b/include/d/menu/d_menu_fmap.h
index b5624c780e5..2d72cfd22b1 100644
--- a/include/d/menu/d_menu_fmap.h
+++ b/include/d/menu/d_menu_fmap.h
@@ -9,7 +9,7 @@ class J2DAnmTextureSRTKey;
 class JKRArchive;
 class JKRExpHeap;
 class JKRHeap;
-struct STControl;
+class STControl;
 class dMenu_Fmap_stage_data_c;
 class dMenu_Fmap_world_data_c;
 class dMenu_Fmap_region_data_c;
diff --git a/include/d/menu/d_menu_insect.h b/include/d/menu/d_menu_insect.h
index d02d94b4129..6b1bb3c9f55 100644
--- a/include/d/menu/d_menu_insect.h
+++ b/include/d/menu/d_menu_insect.h
@@ -6,7 +6,7 @@
 class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
-struct STControl;
+class STControl;
 class dMsgScrn3Select_c;
 class dMsgString_c;
 class dSelect_cursor_c;
diff --git a/include/d/menu/d_menu_letter.h b/include/d/menu/d_menu_letter.h
index 1099af168f4..5755da76e93 100644
--- a/include/d/menu/d_menu_letter.h
+++ b/include/d/menu/d_menu_letter.h
@@ -6,7 +6,7 @@
 class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
-struct STControl;
+class STControl;
 class mDoDvdThd_mountArchive_c;
 class dMsgString_c;
 class dMsgScrnArrow_c;
diff --git a/include/d/menu/d_menu_option.h b/include/d/menu/d_menu_option.h
index b8ce15d2795..356a3a1c069 100644
--- a/include/d/menu/d_menu_option.h
+++ b/include/d/menu/d_menu_option.h
@@ -7,7 +7,7 @@ class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
 class JUTFont;
-struct STControl;
+class STControl;
 class dFile_warning_c;
 class dMenu_Calibration_c;
 class mDoDvdThd_mountArchive_c;
diff --git a/include/d/menu/d_menu_ring.h b/include/d/menu/d_menu_ring.h
index 7285a15bc1d..1aee04f30e5 100644
--- a/include/d/menu/d_menu_ring.h
+++ b/include/d/menu/d_menu_ring.h
@@ -6,7 +6,7 @@
 class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
-struct STControl;
+class STControl;
 class dKantera_icon_c;
 class dMsgString_c;
 class dMenu_ItemExplain_c;
diff --git a/include/d/menu/d_menu_save.h b/include/d/menu/d_menu_save.h
index ffc2ed58a50..cb61e54c5be 100644
--- a/include/d/menu/d_menu_save.h
+++ b/include/d/menu/d_menu_save.h
@@ -10,7 +10,7 @@ struct CSTControl;
 class J2DAnmColorKey;
 class J2DAnmTransformKey;
 class JUTFont;
-struct STControl;
+class STControl;
 class dMsgString_c;
 class dFile_warning_c;
 class dFile_info_c;
diff --git a/include/d/menu/d_menu_skill.h b/include/d/menu/d_menu_skill.h
index 1ffc5577871..12af91fdd5e 100644
--- a/include/d/menu/d_menu_skill.h
+++ b/include/d/menu/d_menu_skill.h
@@ -6,7 +6,7 @@
 class CPaneMgr;
 struct CSTControl;
 class J2DTextBox;
-struct STControl;
+class STControl;
 class mDoDvdThd_mountArchive_c;
 class dMsgString_c;
 class dSelect_cursor_c;
diff --git a/include/d/menu/d_menu_window.h b/include/d/menu/d_menu_window.h
index 6aa6119c561..2cccc6d8681 100644
--- a/include/d/menu/d_menu_window.h
+++ b/include/d/menu/d_menu_window.h
@@ -6,7 +6,7 @@
 #include "m_Do/m_Do_graphic.h"
 
 struct CSTControl;
-struct STControl;
+class STControl;
 class dMenu_Collect_c;
 class dMenu_Dmap_c;
 class dMenu_Fishing_c;
diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h
index 8b414466d39..57803288f4f 100644
--- a/include/d/meter/d_meter2_info.h
+++ b/include/d/meter/d_meter2_info.h
@@ -5,7 +5,7 @@
 
 class CPaneMgr;
 class J2DTextBox;
-class JMSMesgEntry_c;
+struct JMSMesgEntry_c;
 class JUTFont;
 
 struct dMenu_LetterData {
diff --git a/include/d/msg/d_msg_class.h b/include/d/msg/d_msg_class.h
index 782efca1307..81b2236e5dd 100644
--- a/include/d/msg/d_msg_class.h
+++ b/include/d/msg/d_msg_class.h
@@ -32,8 +32,8 @@ struct JMSMesgHeader_c {
     /* 0x0E */ u16 field_0xe;
 };  // Size: 0x10
 
-struct STControl;
-struct dMsgObject_c;
+class STControl;
+class dMsgObject_c;
 struct jmessage_tReference : public JMessage::TReference {
     /* 80228B04 */ jmessage_tReference();
     /* 80228D28 */ void calcDistance();
diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h
index 0b05dcb6599..00e95d7c216 100644
--- a/include/d/particle/d_particle.h
+++ b/include/d/particle/d_particle.h
@@ -42,8 +42,8 @@ private:
 class mDoDvdThd_toMainRam_c;
 class cBgS_PolyInfo;
 class JPAEmitterManager;
-struct JPADrawInfo;
-struct J3DAnmBase;
+class JPADrawInfo;
+class J3DAnmBase;
 
 class dPa_simpleEcallBack : public JPAEmitterCallBack {
 public:
diff --git a/include/d/particle/d_particle_copoly.h b/include/d/particle/d_particle_copoly.h
index 8886f52e276..aee43e0c063 100644
--- a/include/d/particle/d_particle_copoly.h
+++ b/include/d/particle/d_particle_copoly.h
@@ -5,7 +5,7 @@
 #include "SSystem/SComponent/c_xyz.h"
 
 class dBgS_Acch;
-struct dKy_tevstr_c;
+class dKy_tevstr_c;
 
 class dPaPo_c {
 public:
diff --git a/include/d/shop/d_shop_system.h b/include/d/shop/d_shop_system.h
index a3b5a82df92..d6ec19e23d3 100644
--- a/include/d/shop/d_shop_system.h
+++ b/include/d/shop/d_shop_system.h
@@ -5,7 +5,7 @@
 #include "d/shop/d_shop_item_ctrl.h"
 
 class dSelect_cursor_c;
-struct STControl;
+class STControl;
 
 typedef int (*ShopCam_actionFunc)(void);
 
diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
index e76c46d2257..a72010c110f 100644
--- a/include/f_op/f_op_actor.h
+++ b/include/f_op/f_op_actor.h
@@ -28,7 +28,7 @@ enum {
     ACTOR_TYPE_ENEMY = 2,
 };
 
-struct JKRSolidHeap;
+class JKRSolidHeap;
 
 class dEvt_info_c {
 public:
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
index f4518266cb8..91b2a94e085 100644
--- a/include/f_op/f_op_actor_mng.h
+++ b/include/f_op/f_op_actor_mng.h
@@ -101,8 +101,8 @@ public:
     static f32 mWaterY[1 + 1 /* padding */];
 };
 
-struct dKy_tevstr_c;
-struct cBgS_PolyInfo;
+class dKy_tevstr_c;
+class cBgS_PolyInfo;
 typedef int (*heapCallbackFunc)(fopAc_ac_c*);
 typedef int (*createFunc)(void*);
 
diff --git a/include/m_Do/m_Do_machine_exception.h b/include/m_Do/m_Do_machine_exception.h
index 38eac966b68..0930a8b3fec 100644
--- a/include/m_Do/m_Do_machine_exception.h
+++ b/include/m_Do/m_Do_machine_exception.h
@@ -3,7 +3,7 @@
 
 #include "dolphin/gx/GX.h"
 
-struct JUTConsole;
+class JUTConsole;
 
 void print_f(char const*, ...);
 void print(char const*);
diff --git a/include/msg/scrn/d_msg_scrn_explain.h b/include/msg/scrn/d_msg_scrn_explain.h
index 8743716643f..ad9fc8efe7f 100644
--- a/include/msg/scrn/d_msg_scrn_explain.h
+++ b/include/msg/scrn/d_msg_scrn_explain.h
@@ -4,7 +4,7 @@
 #include "msg/scrn/d_msg_scrn_base.h"
 
 class J2DOrthoGraph;
-struct STControl;
+class STControl;
 class dMsgScrnArrow_c;
 class dMsgScrn3Select_c;
 class dMsgString_c;
diff --git a/include/msg/scrn/d_msg_scrn_tree.h b/include/msg/scrn/d_msg_scrn_tree.h
index 748a168fded..dd925c5ddea 100644
--- a/include/msg/scrn/d_msg_scrn_tree.h
+++ b/include/msg/scrn/d_msg_scrn_tree.h
@@ -3,8 +3,8 @@
 
 #include "msg/scrn/d_msg_scrn_base.h"
 
-struct JUTFont;
-struct JKRExpHeap;
+class JUTFont;
+class JKRExpHeap;
 
 struct dMsgScrnTree_c : public dMsgScrnBase_c {
     /* 80248954 */ dMsgScrnTree_c(JUTFont*, JKRExpHeap*);
diff --git a/include/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h b/include/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h
index 6290f2f895d..d848cb8aa78 100644
--- a/include/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h
+++ b/include/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h
@@ -4,9 +4,9 @@
 #include "dolphin/types.h"
 
 struct cXyz;
-struct fopAc_ac_c;
-struct J3DJoint;
-struct J3DModel;
+class fopAc_ac_c;
+class J3DJoint;
+class J3DModel;
 
 struct daNPC_TK_c {
     /* 80B01498 */ void setBck(int, u8, f32, f32);
diff --git a/include/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h b/include/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h
index 4b60c8813a6..c45919e33ec 100644
--- a/include/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h
+++ b/include/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h
@@ -3,7 +3,7 @@
 
 #include "f_op/f_op_actor_mng.h"
 
-struct cBgS_PolyInfo;
+class cBgS_PolyInfo;
 
 class daTagMagne_c : public fopAc_ac_c {
 public:
diff --git a/src/msg/scrn/d_msg_scrn_arrow.cpp b/src/msg/scrn/d_msg_scrn_arrow.cpp
index 7ea1b16134d..1a26727185b 100644
--- a/src/msg/scrn/d_msg_scrn_arrow.cpp
+++ b/src/msg/scrn/d_msg_scrn_arrow.cpp
@@ -25,15 +25,15 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() {
     mBpkFrame = 0.0f;
 
     mPaneMgr0 = new CPaneMgr(mScreen, 'set_ya_n', 0, NULL);
-    mPaneMgr1 = new CPaneMgr(mScreen, '\0ya_next', 0, NULL);
+    mPaneMgr1 = new CPaneMgr(mScreen, 'ya_next', 0, NULL);
     mPaneMgr1->hide();
     mPaneMgr1->mPane->setAnimation(mAnmBck);
-    mScreen->search('\0yajnext')->setAnimation(mAnmBpk);
+    mScreen->search('yajnext')->setAnimation(mAnmBpk);
     mScreen->search('yajinexl')->setAnimation(mAnmBpk);
 
     mPaneMgr2 = new CPaneMgr(mScreen, 'ya_end', 0, NULL);
     mPaneMgr2->hide();
-    mScreen->search('\0yaj_end')->setAnimation(mAnmBpk);
+    mScreen->search('yaj_end')->setAnimation(mAnmBpk);
     mScreen->search('yajiendl')->setAnimation(mAnmBpk);
 }