diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h b/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h
index b0ff45521..d57023994 100644
--- a/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h
+++ b/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h
@@ -1,6 +1,6 @@
 #ifndef J3DMODELLOADERCALCSIZE_H
 #define J3DMODELLOADERCALCSIZE_H
 
-#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
+#include "JSystem/J3DGraphLoader/J3DModelLoader.h" // IWYU pragma: export
 
 #endif /* J3DMODELLOADERCALCSIZE_H */
diff --git a/include/JSystem/JStudio/JStudio_JAudio/object-sound.h b/include/JSystem/JStudio/JStudio_JAudio/object-sound.h
index cdf5508b9..66ddf3216 100644
--- a/include/JSystem/JStudio/JStudio_JAudio/object-sound.h
+++ b/include/JSystem/JStudio/JStudio_JAudio/object-sound.h
@@ -1,6 +1,6 @@
 #ifndef OBJECT_SOUND_H
 #define OBJECT_SOUND_H
 
-#include "JSystem/JStudio/JStudio_JAudio/control.h"
+#include "JSystem/JStudio/JStudio_JAudio/control.h" // IWYU pragma: export
 
 #endif /* OBJECT_SOUND_H */
diff --git a/include/JSystem/JStudio/JStudio_JMessage/object-message.h b/include/JSystem/JStudio/JStudio_JMessage/object-message.h
index 03954eded..541d48f1e 100644
--- a/include/JSystem/JStudio/JStudio_JMessage/object-message.h
+++ b/include/JSystem/JStudio/JStudio_JMessage/object-message.h
@@ -1,6 +1,6 @@
 #ifndef OBJECT_MESSAGE_H
 #define OBJECT_MESSAGE_H
 
-#include "JSystem/JStudio/JStudio_JMessage/control.h"
+#include "JSystem/JStudio/JStudio_JMessage/control.h" // IWYU pragma: export
 
 #endif /* OBJECT_MESSAGE_H */
diff --git a/include/JSystem/JStudio/JStudio_JParticle/object-particle.h b/include/JSystem/JStudio/JStudio_JParticle/object-particle.h
index c887a183e..ea02c4b1b 100644
--- a/include/JSystem/JStudio/JStudio_JParticle/object-particle.h
+++ b/include/JSystem/JStudio/JStudio_JParticle/object-particle.h
@@ -1,6 +1,6 @@
 #ifndef OBJECT_PARTICLE_H
 #define OBJECT_PARTICLE_H
 
-#include "JSystem/JStudio/JStudio_JParticle/control.h"
+#include "JSystem/JStudio/JStudio_JParticle/control.h" // IWYU pragma: export
 
 #endif /* OBJECT_PARTICLE_H */
diff --git a/include/JSystem/JStudio/JStudio_JStage/object-actor.h b/include/JSystem/JStudio/JStudio_JStage/object-actor.h
index 09332fbfe..c137b5ca2 100644
--- a/include/JSystem/JStudio/JStudio_JStage/object-actor.h
+++ b/include/JSystem/JStudio/JStudio_JStage/object-actor.h
@@ -1,6 +1,6 @@
 #ifndef OBJECT_ACTOR_H
 #define OBJECT_ACTOR_H
 
-#include "JSystem/JStudio/JStudio_JStage/control.h"
+#include "JSystem/JStudio/JStudio_JStage/control.h" // IWYU pragma: export
 
 #endif /* OBJECT_ACTOR_H */
diff --git a/include/JSystem/JStudio/JStudio_JStage/object-camera.h b/include/JSystem/JStudio/JStudio_JStage/object-camera.h
index a9fa7e8d6..ca78fd3db 100644
--- a/include/JSystem/JStudio/JStudio_JStage/object-camera.h
+++ b/include/JSystem/JStudio/JStudio_JStage/object-camera.h
@@ -1,6 +1,6 @@
 #ifndef OBJECT_CAMERA_H
 #define OBJECT_CAMERA_H
 
-#include "JSystem/JStudio/JStudio_JStage/control.h"
+#include "JSystem/JStudio/JStudio_JStage/control.h" // IWYU pragma: export
 
 #endif /* OBJECT_CAMERA_H */
diff --git a/include/JSystem/JStudio/JStudio_JStage/object.h b/include/JSystem/JStudio/JStudio_JStage/object.h
index 4c04fdcc2..bf5c84645 100644
--- a/include/JSystem/JStudio/JStudio_JStage/object.h
+++ b/include/JSystem/JStudio/JStudio_JStage/object.h
@@ -1,6 +1,6 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
-#include "JSystem/JStudio/JStudio_JStage/control.h"
+#include "JSystem/JStudio/JStudio_JStage/control.h" // IWYU pragma: export
 
 #endif /* OBJECT_H */
diff --git a/include/dolphin/os/OSError.h b/include/dolphin/os/OSError.h
index 159c32f28..c7b8239b3 100644
--- a/include/dolphin/os/OSError.h
+++ b/include/dolphin/os/OSError.h
@@ -48,6 +48,7 @@ typedef enum {
     EXCEPTION_THERMAL_INTERRUPT,
     EXCEPTION_MEMORY_PROTECTION,
     EXCEPTION_FLOATING_POINT_EXCEPTION,
+    EXCEPTION_MAX,
 } OSException;
 
 typedef u8 __OSException;
diff --git a/include/dolphin/types.h b/include/dolphin/types.h
index 92cdf14c0..f548f7d3f 100644
--- a/include/dolphin/types.h
+++ b/include/dolphin/types.h
@@ -35,7 +35,7 @@ typedef unsigned int uint;
     (((u32)ptr[offset] << 24) | ((u32)ptr[offset + 1] << 16) | ((u32)ptr[offset + 2] << 8) |       \
      (u32)ptr[offset + 3]);
 
-#include "stddef.h"
+#include "stddef.h" // IWYU pragma: export
 
 #define INT32_MAX (0x7fffffff)
 #define UINT32_MAX (0xffffffff)
diff --git a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
index c8deddc0a..3ca20f1db 100644
--- a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
@@ -282,6 +282,8 @@ int J3DSkinDeform::initMtxIndexArray(J3DModelData* modelData) {
                     OSReport(" Invlid Data : CPU Pipeline process GX_INDEX16 Data Only\n");
                 }
                 break;
+            default:
+                break;
             }
 
             vtxSize += size[desc->type];
diff --git a/src/JSystem/J3DGraphAnimator/J3DModelData.cpp b/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
index 8a6fa2c0c..b8cd7631f 100644
--- a/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
@@ -154,6 +154,8 @@ bool J3DModelData::isDeformablePositionFormat() const {
             if (vtxAttr->mCompType == GX_F32 && vtxAttr->mCompCnt == GX_POS_XYZ)
                 return true;
             break;
+        default:
+            break;
         }
     }
 
diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp
index 134f71940..cf5597af9 100644
--- a/src/JSystem/J3DGraphBase/J3DShape.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShape.cpp
@@ -9,7 +9,6 @@
 #include "JSystem/J3DGraphBase/J3DVertex.h"
 #include "dolphin/gd/GDBase.h"
 #include "dolphin/gd/GDGeometry.h"
-#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 extern void J3DGDSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList *, bool);
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
index 89eac7433..3824b5a41 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
@@ -124,7 +124,7 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* i_data, u32 i_flag
             break;
         case 'MAT2':
             break;
-        case 'MAT3':
+        case 'MAT3': {
             u32 matFlags = 0x50100000;
             matFlags |= (u32)i_flags & 0x03000000;
             mpMaterialBlock = (const J3DMaterialBlock*)block;
@@ -137,6 +137,7 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* i_data, u32 i_flag
                 size += calcSizePatchedMaterial((const J3DMaterialBlock*)block, matFlags);
             }
             break;
+        }
         case 'EVP1':
             break;
         case 'DRW1':
diff --git a/src/JSystem/JAudio/JAISound.cpp b/src/JSystem/JAudio/JAISound.cpp
index 7f3380f86..24ac72072 100644
--- a/src/JSystem/JAudio/JAISound.cpp
+++ b/src/JSystem/JAudio/JAISound.cpp
@@ -228,7 +228,7 @@ f32 JAISound::setDistanceVolumeCommon(f32 param_1, u8 param_2) {
     var1 -= JAIGlobalParameter::maxVolumeDistance;
     f32 var2 = param_1 - JAIGlobalParameter::maxVolumeDistance;
     if (param_2 > 3) {
-        var2 /= 1 << (param_2 & 3) + 1;
+        var2 /= 1 << ((param_2 & 3) + 1);
     } else if (param_2 != 0) {
         var2 *= 1 << (param_2 & 3);
     }
diff --git a/src/JSystem/JAudio/JAIStreamMgr.cpp b/src/JSystem/JAudio/JAIStreamMgr.cpp
index 9912019be..f0a2215eb 100644
--- a/src/JSystem/JAudio/JAIStreamMgr.cpp
+++ b/src/JSystem/JAudio/JAIStreamMgr.cpp
@@ -598,7 +598,7 @@ void JAInter::StreamLib::setDecodedBufferBlocks(u32 param_1) {
 /* 8029D424-8029D464       .text LoopInit__Q27JAInter9StreamLibFv */
 void JAInter::StreamLib::LoopInit() {
     loop_start_flag = true;
-    u32 var1 = (header.field_0x14 - (header.field_0x14 & 0x7F) >> 4) * 18 + 32;
+    u32 var1 = ((header.field_0x14 - (header.field_0x14 & 0x7F)) >> 4) * 18 + 32;
     adpcm_loadpoint = var1;
     var1 -= 32;
     adpcm_remain = header.field_0x0 - var1;
diff --git a/src/JSystem/JAudio/JASAudioThread.cpp b/src/JSystem/JAudio/JASAudioThread.cpp
index 99a07b58b..b7afc4e65 100644
--- a/src/JSystem/JAudio/JASAudioThread.cpp
+++ b/src/JSystem/JAudio/JASAudioThread.cpp
@@ -134,7 +134,7 @@ void JASystem::TAudioThread::start(JKRSolidHeap* heap, u32 aramSize, u32 flag) {
     Dvd::resumeThread();
     Kernel::stackInit((u64*)saAudioStack, 0x200);
     if ((flag & 2)) {
-        OSCreateThread(&sAudioThread, audioproc, NULL, &saAudioStack[sizeof(saAudioStack)], sizeof(saAudioStack), sDSPPrio, 1);
+        OSCreateThread(&sAudioThread, (void*)audioproc, NULL, &saAudioStack[sizeof(saAudioStack)], sizeof(saAudioStack), sDSPPrio, 1);
         OSResumeThread(&sAudioThread);
     }
 }
diff --git a/src/JSystem/JAudio/JASHardStream.cpp b/src/JSystem/JAudio/JASHardStream.cpp
index 9125f065d..b44c3e439 100644
--- a/src/JSystem/JAudio/JASHardStream.cpp
+++ b/src/JSystem/JAudio/JASHardStream.cpp
@@ -108,7 +108,7 @@ void JASystem::HardStream::main() {
             }
             strCtrl.field_0xb = 4;
             return;
-        case 4:
+        case 4: {
             u8 currentVol = strCtrl.getCurVol();
             AISetStreamVolLeft(currentVol);
             AISetStreamVolRight(currentVol);
@@ -116,7 +116,8 @@ void JASystem::HardStream::main() {
             cur_addr_cmd++;
             cur_addr_cmd %= 16;
             return;
-        case 5:
+        }
+        case 5: {
             TPlayList* list = strCtrl.getList();
             if (!list) {
                 if (strCtrl.field_0x8 != 2) {
@@ -161,6 +162,7 @@ void JASystem::HardStream::main() {
             }
             strCtrl.field_0xb = 4;
             return;
+        }
         case 6:
             AISetStreamVolLeft(0);
             AISetStreamVolRight(0);
diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp
index 879a33397..6bb4a4f6c 100644
--- a/src/JSystem/JKernel/JKRAramStream.cpp
+++ b/src/JSystem/JKernel/JKRAramStream.cpp
@@ -48,6 +48,8 @@ void* JKRAramStream::run() {
         case JKRAramStreamCommand::WRITE:
             writeToAram(command);
             break;
+        default:
+            break;
         }
     }
 }
diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp
index 88b9f2d60..b8237278f 100644
--- a/src/JSystem/JKernel/JKRDvdArchive.cpp
+++ b/src/JSystem/JKernel/JKRDvdArchive.cpp
@@ -64,6 +64,10 @@ static void dummy() {
 
 /* 802BAD98-802BB024       .text open__13JKRDvdArchiveFl */
 bool JKRDvdArchive::open(s32 entryNum) {
+    int alignment;
+    u8 useCompression;
+    SDIFileEntry* fileEntry;
+    
     mArcInfoBlock = NULL;
     mDataOffset = NULL;
     mNodes = NULL;
@@ -85,7 +89,7 @@ bool JKRDvdArchive::open(s32 entryNum) {
     JKRDvdToMainRam(entryNum, (u8*)arcHeader, EXPAND_SWITCH_UNKNOWN1, sizeof(SArcHeader), NULL,
                     JKRDvdRipper::ALLOC_DIRECTION_FORWARD, 0, &mCompression);
 
-    int alignment = mMountDirection == MOUNT_DIRECTION_HEAD ? 0x20 : -0x20;
+    alignment = mMountDirection == MOUNT_DIRECTION_HEAD ? 0x20 : -0x20;
 
     mArcInfoBlock = (SArcDataInfo*)JKRAllocFromHeap(mHeap, arcHeader->file_data_offset, alignment);
     if (!mArcInfoBlock) {
@@ -102,8 +106,8 @@ bool JKRDvdArchive::open(s32 entryNum) {
     mStringTable = (char*)((int)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset);
     mExpandedSize = NULL;
 
-    u8 useCompression = 0;
-    SDIFileEntry* fileEntry = mFiles;
+    useCompression = 0;
+    fileEntry = mFiles;
     for (u32 i = 0; i < mArcInfoBlock->num_file_entries; fileEntry++, i++) {
         if (fileEntry->isUnknownFlag1()) {
             useCompression |= fileEntry->getCompressFlag();
diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp
index c2b604b66..73230a44a 100644
--- a/src/JSystem/JMessage/processor.cpp
+++ b/src/JSystem/JMessage/processor.cpp
@@ -463,10 +463,11 @@ void TSequenceProcessor::do_systemTagCode_(u16 code, const void* data, u32 size)
     case 2:
     case 3:
         break;
-    case 6:
+    case 6: {
         u32 target = JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(data);
         on_jump_register(process_jump_, target);
         break;
+    }
     case 4:
     case 5:
     default:
diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp
index 8008e9adf..17f892a4a 100644
--- a/src/JSystem/JMessage/resource.cpp
+++ b/src/JSystem/JMessage/resource.cpp
@@ -120,13 +120,14 @@ bool JMessage::TParse::parseBlock_next(const void** ppData, u32* pOutSize, u32 f
     case 'INF1':
         mResource->setData_block_info(pHeader);
         break;
-    case 'DAT1':
+    case 'DAT1': {
         mResource->setData_block_messageData((char*)&pHeader[1]);
         TResource* res = mResourceContainer->Get_groupID(mResource->mInfo.get_groupID());
         if (res != mResource && !!(flag & 0x80)) {
             mResourceContainer->Erase_destroy(res);
         }
         break;
+    }
     case 'STR1':
         mResource->setData_block_stringAttribute((char*)&pHeader[1]);
         break;
diff --git a/src/JSystem/JParticle/JPADraw.cpp b/src/JSystem/JParticle/JPADraw.cpp
index bcf893be2..a1e2090f8 100644
--- a/src/JSystem/JParticle/JPADraw.cpp
+++ b/src/JSystem/JParticle/JPADraw.cpp
@@ -693,7 +693,7 @@ void JPADraw::setParticleClipBoard() {
     cb.mTexCoordPt[3].y = tilingY;
 
     if (!dc.pbsp->textureIsEmpty() && !dc.pbsp->isEnableTextureAnm())
-        mTexIdx = dc.pTexIdx[dc.pbsp->getTextureIndex()], GX_TEXMAP0;
+        mTexIdx = dc.pTexIdx[dc.pbsp->getTextureIndex()];
 
     cb.mDirTypeFunc = NULL;
     cb.mRotTypeFunc = NULL;
diff --git a/src/JSystem/JStudio/JStudio_JAudio/control.cpp b/src/JSystem/JStudio/JStudio_JAudio/control.cpp
index 7a59cf9c5..15a1c35d1 100644
--- a/src/JSystem/JStudio/JStudio_JAudio/control.cpp
+++ b/src/JSystem/JStudio/JStudio_JAudio/control.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "JSystem/JStudio/JStudio_JAudio/control.h"
-#include "dolphin/types.h"
 
 namespace JStudio_JAudio {
 
diff --git a/src/JSystem/JStudio/JStudio_JAudio/object-sound.cpp b/src/JSystem/JStudio/JStudio_JAudio/object-sound.cpp
index c208dd532..e69f30718 100644
--- a/src/JSystem/JStudio/JStudio_JAudio/object-sound.cpp
+++ b/src/JSystem/JStudio/JStudio_JAudio/object-sound.cpp
@@ -69,7 +69,7 @@ void TAdaptor_sound::adaptor_do_update(const JStudio::TObject* object, u32) {
 /* 80278FB8-80279064       .text adaptor_do_SOUND__Q214JStudio_JAudio14TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */
 void TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperationData op, const void* data, u32) {
     switch (op) {
-    case JStudio::data::TEOD_Unknown_19:
+    case JStudio::data::TEOD_Unknown_19: {
         u32 flags = *(s32*)data;
         if (flags & 0xc0000000) {
             if (mpSound) {
@@ -83,13 +83,17 @@ void TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperationData op, const v
         } else {
             mFlags = *(s32*)data;
         }
+        break;
+    }
+    default:
+        break;
     }
 }
 
 /* 80279064-8027908C       .text adaptor_do_LOCATED__Q214JStudio_JAudio14TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */
 void TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData op, const void* data, u32 flag) {
     switch (op) {
-    case JStudio::data::TEOD_Unknown_02:
+    case JStudio::data::TEOD_Unknown_02: {
         Vec* pos  = *(Vec**)data;
         mPosition = NULL;
         if (!pos)
@@ -97,6 +101,9 @@ void TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData op, const
         mPosition = &_F8;
         break;
     }
+    default:
+        break;
+    }
 }
 
 /* 8027908C-8027915C       .text __cl__Q314JStudio_JAudio14TAdaptor_sound21TVVOOn_BEGIN_FADE_IN_CFfPQ27JStudio8TAdaptor */
diff --git a/src/JSystem/JStudio/JStudio_JMessage/control.cpp b/src/JSystem/JStudio/JStudio_JMessage/control.cpp
index 0de6e8840..8352a0b48 100644
--- a/src/JSystem/JStudio/JStudio_JMessage/control.cpp
+++ b/src/JSystem/JStudio/JStudio_JMessage/control.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "JSystem/JStudio/JStudio_JMessage/control.h"
-#include "dolphin/types.h"
 
 namespace JStudio_JMessage {
 
diff --git a/src/JSystem/JStudio/JStudio_JMessage/object-message.cpp b/src/JSystem/JStudio/JStudio_JMessage/object-message.cpp
index a51de71fe..4d0436a3f 100644
--- a/src/JSystem/JStudio/JStudio_JMessage/object-message.cpp
+++ b/src/JSystem/JStudio/JStudio_JMessage/object-message.cpp
@@ -22,5 +22,7 @@ void JStudio_JMessage::TAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOpe
     case JStudio::data::TEOD_Unknown_19:
         mControl->setMessageCode(*(u32*)param_2);
         break;
+    default:
+        break;
     }
 }
diff --git a/src/JSystem/JStudio/JStudio_JParticle/control.cpp b/src/JSystem/JStudio/JStudio_JParticle/control.cpp
index 6795c3f37..fd8c4beae 100644
--- a/src/JSystem/JStudio/JStudio_JParticle/control.cpp
+++ b/src/JSystem/JStudio/JStudio_JParticle/control.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "JSystem/JStudio/JStudio_JParticle/control.h"
-#include "dolphin/types.h"
 
 namespace JStudio_JParticle {
 
diff --git a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
index 5fac53a0d..bda259242 100644
--- a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
+++ b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
@@ -84,6 +84,8 @@ void TAdaptor_particle::adaptor_do_PARTICLE(JStudio::data::TEOperationData opera
     case JStudio::data::TEOD_Unknown_19:
         _188 = *(int*)r5;
         break;
+    default:
+        break;
     }
 }
 
@@ -99,6 +101,8 @@ void TAdaptor_particle::adaptor_do_PARENT(JStudio::data::TEOperationData operati
             }
         }
         break;
+    default:
+        break;
     }
 }
 
@@ -116,6 +120,8 @@ void TAdaptor_particle::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData op
     case JStudio::data::TEOD_Unknown_19:
         _1A0 = *(u32*)param_2;
         break;
+    default:
+        break;
     }
 }
 
@@ -125,6 +131,8 @@ void TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData
     case JStudio::data::TEOD_Unknown_02:
         _1A4 = *(u32*)param_2;
         break;
+    default:
+        break;
     }
 }
 
diff --git a/src/JSystem/JStudio/JStudio_JStage/control.cpp b/src/JSystem/JStudio/JStudio_JStage/control.cpp
index e7778930b..8c6d19a2b 100644
--- a/src/JSystem/JStudio/JStudio_JStage/control.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/control.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "JSystem/JStudio/JStudio_JStage/control.h"
-#include "dolphin/types.h"
 
 namespace JStudio_JStage {
 
diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
index e254ae1f2..abec8e913 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
@@ -142,6 +142,8 @@ void TAdaptor_actor::adaptor_do_PARENT(JStudio::data::TEOperationData operation,
     case JStudio::data::TEOD_Unknown_18:
         m12C = (JStage::TObject*)mSystem->JSGFindObject((const char*)p2, JStage::TOBJ_ACTOR_UNK);
         break;
+    default:
+        break;
     }
 }
 
@@ -156,13 +158,15 @@ void TAdaptor_actor::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData opera
     case JStudio::data::TEOD_Unknown_19:
         m130 = *(u32*)p2;
         break;
+    default:
+        break;
     }
 }
 
 /* 80276978-802769D4       .text adaptor_do_PARENT_ENABLE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */
 void TAdaptor_actor::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData operation, const void* p2, u32 p3) {
     switch (operation) {
-    case JStudio::data::TEOD_Unknown_02:
+    case JStudio::data::TEOD_Unknown_02: {
         bool v0 = (*(u32*)p2 != 0);
         JStage::TObject* object = NULL;
         u32 v1 = 0xFFFFFFFF;
@@ -172,6 +176,9 @@ void TAdaptor_actor::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData ope
         }
         mObject->JSGSetParent(object, v1);
     }
+    default:
+        break;
+    }
 }
 
 /* 802769D4-80276A28       .text adaptor_do_RELATION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */
@@ -180,6 +187,8 @@ void TAdaptor_actor::adaptor_do_RELATION(JStudio::data::TEOperationData operatio
     case JStudio::data::TEOD_Unknown_18:
         m134 = (JStage::TObject*)mSystem->JSGFindObject((const char*)p2, JStage::TOBJ_ACTOR_UNK);
         break;
+    default:
+        break;
     }
 }
 
@@ -194,6 +203,8 @@ void TAdaptor_actor::adaptor_do_RELATION_NODE(JStudio::data::TEOperationData ope
     case JStudio::data::TEOD_Unknown_19:
         m138 = *(u32*)p2;
         break;
+    default:
+        break;
     }
 }
 
@@ -203,6 +214,8 @@ void TAdaptor_actor::adaptor_do_RELATION_ENABLE(JStudio::data::TEOperationData o
     case JStudio::data::TEOD_Unknown_02:
         mObject->JSGSetRelation(*(u32*)p2, m134, m138);
         break;
+    default:
+        break;
     }
 }
 
@@ -212,6 +225,8 @@ void TAdaptor_actor::setJSG_ID_(IDFunction function, JStudio::data::TEOperationD
     case JStudio::data::TEOD_Unknown_19:
         (mObject->*function)(*(u32*)p3);
         break;
+    default:
+        break;
     }
 }
 
diff --git a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
index 9b6536b31..461a39e5f 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
@@ -107,6 +107,8 @@ void TAdaptor_camera::adaptor_do_PARENT(JStudio::data::TEOperationData operation
     case JStudio::data::TEOD_Unknown_18:
         mF0 = (JStage::TObject*)mSystem->JSGFindObject((const char*)p2, JStage::TOBJ_ACTOR_UNK);
         break;
+    default:
+        break;
     }
 }
 
@@ -121,13 +123,15 @@ void TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData oper
     case JStudio::data::TEOD_Unknown_19:
         mF4 = *(u32*)p2;
         break;
+    default:
+        break;
     }
 }
 
 /* 80277814-80277870       .text adaptor_do_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl */
 void TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData operation, const void* p2, u32 p3) {
     switch (operation) {
-    case JStudio::data::TEOD_Unknown_02:
+    case JStudio::data::TEOD_Unknown_02: {
         JStage::TObject* parent = NULL;
         u32 idx                 = -1;
         if (*(u32*)p2 != 0) {
@@ -137,6 +141,9 @@ void TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData op
         mObject->JSGSetParent(parent, idx);
         break;
     }
+    default:
+        break;
+    }
 }
 
 } // namespace JStudio_JStage
diff --git a/src/JSystem/JStudio/JStudio_JStage/object.cpp b/src/JSystem/JStudio/JStudio_JStage/object.cpp
index e2d29898d..0cd87dc6c 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object.cpp
@@ -21,5 +21,7 @@ void JStudio_JStage::TAdaptor_object_::adaptor_ENABLE_(JStage::TObject* object,
             object->JSGFDisableFlag(2);
         }
         break;
+    default:
+        break;
     }
 }
diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp
index bba802cd2..0db61a47f 100644
--- a/src/d/actor/d_a_andsw0.cpp
+++ b/src/d/actor/d_a_andsw0.cpp
@@ -64,7 +64,7 @@ static void daAndsw0_check(andsw0_class* i_this) {
             }
 
             break;
-        case ACT_OFF_ALL:
+        case ACT_OFF_ALL: {
             u32 switchToCheck2 = i_this->mFirstSwitchToCheck ? i_this->mFirstSwitchToCheck : i_this->mSwitchToSet + 1;
 
             for(int i = 0; i < numToCheck; i++) {
@@ -78,6 +78,7 @@ static void daAndsw0_check(andsw0_class* i_this) {
             }
 
             break;
+        }
         case ACT_TIMER:
             i_this->mTimer = (i_this->home.angle.z & 0xFF) * 15;
             if(fopAcM_isSwitch(i_this, i_this->mSwitchToSet)) {
diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp
index 143f4f926..0ae30b48f 100644
--- a/src/d/actor/d_a_disappear.cpp
+++ b/src/d/actor/d_a_disappear.cpp
@@ -9,7 +9,6 @@
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
-#include "m_Do/m_Do_ext.h"
 
 /* 800E79C0-800E79C8       .text daDisappear_Draw__FP15disappear_class */
 static BOOL daDisappear_Draw(disappear_class*) {
diff --git a/src/d/actor/d_a_kt.cpp b/src/d/actor/d_a_kt.cpp
index bf1d0d4bd..e06022a6b 100644
--- a/src/d/actor/d_a_kt.cpp
+++ b/src/d/actor/d_a_kt.cpp
@@ -208,7 +208,7 @@ calc_012:
             i_this->mTimer[2] = REG0_S(5) + 300;
         }
         break;
-    case 10:
+    case 10: {
         i_this->mLiftY += i_this->mLiftYTimer;
         i_this->mLiftYTimer -= REG0_F(8) * 0.1f + 5.0f;
         if (i_this->mLiftY <= 0.0f) {
@@ -230,6 +230,7 @@ calc_012:
         *r27 += i_this->mSpeedVel.z;
         goto calc_11;
         break;
+    }
     case 11:
         if (i_this->mTimer[0] == 0) {
             i_this->mTimer[0] = cM_rndF(2.0f) + 10.0f + REG0_F(12);
diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp
index d75ec97a9..30c02578f 100644
--- a/src/d/actor/d_a_kytag00.cpp
+++ b/src/d/actor/d_a_kytag00.cpp
@@ -9,11 +9,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/d_kankyo.h"
-#include "d/actor/d_a_player.h"
-#include "m_Do/m_Do_ext.h"
-#include "m_Do/m_Do_mtx.h"
 #include "SSystem/SComponent/c_lib.h"
-#include "JSystem/JUtility/JUTAssert.h"
 
 /* 00000078-0000024C       .text get_check_pos__FP13kytag00_class */
 cXyz get_check_pos(kytag00_class* i_this) {
diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp
index a07a2da9f..f03c080a3 100644
--- a/src/d/actor/d_a_mbdoor.cpp
+++ b/src/d/actor/d_a_mbdoor.cpp
@@ -13,6 +13,18 @@
 #include "m_Do/m_Do_mtx.h"
 #include "d/actor/d_a_player.h"
 
+enum {
+    ACT_WAIT,
+    ACT_SET_START,
+    ACT_SET_ANGLE,
+    ACT_END,
+    ACT_OPEN,
+    ACT_STOP_OPEN,
+    ACT_SET_GOAL,
+    ACT_SET_GOAL2,
+    ACT_ADJUSTMENT,
+};
+
 /* 00000078-00000084       .text getSwbit__10daMbdoor_cFv */
 u8 daMbdoor_c::getSwbit() {
     return fopAcM_GetParam(this) & 0xFF;
@@ -285,33 +297,33 @@ void daMbdoor_c::demoProc() {
     
     if (dComIfGp_evmng_getIsAddvance(mEvtStaffId)) {
         switch (actIdx) {
-        case 1: // SET_START
+        case ACT_SET_START:
             calcMtx();
             goal = field_0x2c4;
             dComIfGp_evmng_setGoal(&goal);
             break;
-        case 2: // SET_ANGLE
+        case ACT_SET_ANGLE:
             angle = current.angle.y + 0x7FFF;
             player->changeDemoMoveAngle(angle);
             break;
-        case 4: // OPEN
+        case ACT_OPEN:
             fopAcM_seStart(this, JA_SE_OBJ_MJ_GATE_OPEN, 0);
             field_0x2b4 = 0;
             break;
-        case 5: // STOP_OPEN
+        case ACT_STOP_OPEN:
             fopAcM_seStart(this, JA_SE_OBJ_MJ_GATE_BAR_OPEN, 0);
             field_0x2b4 = 0;
             field_0x2b6 = 1;
             break;
-        case 6: // SET_GOAL
+        case ACT_SET_GOAL:
             goal = mGoalPos;
             dComIfGp_evmng_setGoal(&goal);
             break;
-        case 7: // SET_GOAL2
+        case ACT_SET_GOAL2:
             goal = mGoal2Pos;
             dComIfGp_evmng_setGoal(&goal);
             break;
-        case 8: // ADJUSTMENT
+        case ACT_ADJUSTMENT:
             calcMtx();
             mAdjustmentTimer = 0;
             u32* timerP = dComIfGp_evmng_getMyIntegerP(mEvtStaffId, "Timer");
@@ -323,9 +335,9 @@ void daMbdoor_c::demoProc() {
     }
     
     switch (actIdx) {
-    case 3: // END
+    case ACT_END:
         break;
-    case 4: // OPEN
+    case ACT_OPEN: {
         if (field_0x2b4 < 250) {
             field_0x2b4 += 50;
         }
@@ -344,12 +356,13 @@ void daMbdoor_c::demoProc() {
         }
         player->setPlayerPosAndAngle(&field_0x2c4, angle);
         break;
-    case 5: // STOP_OPEN
+    }
+    case ACT_STOP_OPEN:
         if (field_0x2b6) {
             if (field_0x2b4 < 400) {
                 field_0x2b4 += 40;
             }
-            temp = field_0x2b0 - field_0x2b4;
+            s32 temp = field_0x2b0 - field_0x2b4;
             if (temp < -0x3F65) {
                 field_0x2b0 = -0x3F65;
                 dComIfGp_evmng_cutEnd(mEvtStaffId);
@@ -363,7 +376,7 @@ void daMbdoor_c::demoProc() {
             dComIfGp_evmng_cutEnd(mEvtStaffId);
         }
         break;
-    case 8: // ADJUSTMENT
+    case ACT_ADJUSTMENT:
         angle = player->shape_angle.y;
         cLib_addCalcAngleS2(&angle, current.angle.y + 0x7FFF, 10, 0x800);
         goal = player->current.pos;
diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp
index 2e7897fee..1a751bd3c 100644
--- a/src/d/actor/d_a_obj_barrier.cpp
+++ b/src/d/actor/d_a_obj_barrier.cpp
@@ -6,7 +6,7 @@
 #include "d/actor/d_a_obj_barrier.h"
 #include "d/res/res_ycage.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "d/actor/d_a_player_main.h"
+#include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_item_data.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp
index af9f099a2..55f9c8ef6 100644
--- a/src/d/actor/d_a_pw.cpp
+++ b/src/d/actor/d_a_pw.cpp
@@ -4,11 +4,13 @@
  */
 
 #include "d/actor/d_a_pw.h"
+#include "d/actor/d_a_player.h"
+#include "d/d_bg_s_lin_chk.h"
+#include "d/d_com_inf_game.h"
 #include "d/res/res_pw.h"
-#include "d/actor/d_a_player_main.h"
 #include "d/d_kankyo_rain.h"
 #include "d/d_procname.h"
-#include "f_op/f_op_camera_mng.h"
+#include "f_op/f_op_camera.h"
 #include "f_pc/f_pc_manager.h"
 
 enum daPW__BehaviorType {
diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp
index 9eb888543..83e4fc704 100644
--- a/src/d/actor/d_a_race_item.cpp
+++ b/src/d/actor/d_a_race_item.cpp
@@ -135,7 +135,7 @@ BOOL daRaceItem_c::execute() {
     daPy_lk_c* player;
     cXyz headPos;
     switch(field_0x640) {
-        case 0:
+        case 0: {
             checkGet();
 
             s16 spin = 0xFFFF / daItemBase_c::m_data.mRotateYSpeed;
@@ -144,6 +144,7 @@ BOOL daRaceItem_c::execute() {
             dComIfG_Ccsp()->Set(&mCyl);
 
             break;
+        }
         case 1:
             player = daPy_getPlayerLinkActorClass();
             headPos = player->getHeadTopPos();
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index 6c07de146..a27333114 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -11,7 +11,6 @@
 #include "d/d_s_play.h"
 #include "d/d_item.h"
 #include "d/d_item_data.h"
-#include "d/actor/d_a_item.h"
 #include "m_Do/m_Do_mtx.h"
 #include "m_Do/m_Do_lib.h"
 #include "d/res/res_cloth.h"
diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp
index 27c2acb3f..5ff5545a3 100644
--- a/src/d/actor/d_a_spc_item01.cpp
+++ b/src/d/actor/d_a_spc_item01.cpp
@@ -11,7 +11,6 @@
 #include "d/d_procname.h"
 #include "d/d_item.h"
 #include "f_op/f_op_actor_mng.h"
-#include "f_op/f_op_scene_mng.h"
 #include "m_Do/m_Do_mtx.h"
 
 namespace daSpcItem01_prm {
diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp
index 661d486dd..dbd49c1be 100644
--- a/src/d/actor/d_a_switem.cpp
+++ b/src/d/actor/d_a_switem.cpp
@@ -7,7 +7,6 @@
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"
 #include "d/d_cc_d.h"
-#include "f_op/f_op_draw_tag.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_item.h"
 #include "d/actor/d_a_item.h"
diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp
index 56e2573d2..eddfd1763 100644
--- a/src/d/actor/d_a_ygcwp.cpp
+++ b/src/d/actor/d_a_ygcwp.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "d/actor/d_a_ygcwp.h"
-#include "d/actor/d_a_player_main.h"
+#include "d/actor/d_a_player.h"
 #include "d/res/res_ygcwp.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp
index 0d4aacf3e..89f830c41 100644
--- a/src/d/d_a_obj.cpp
+++ b/src/d/d_a_obj.cpp
@@ -9,7 +9,6 @@
 #include "d/d_procname.h"
 #include "d/d_kankyo_wether.h"
 #include "d/d_path.h"
-#include "m_Do/m_Do_mtx.h"
 #include "JSystem/JParticle/JPAEmitter.h"
 
 namespace daObj {
diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp
index bf8231412..2d4d0f7b4 100644
--- a/src/d/d_event_data.cpp
+++ b/src/d/d_event_data.cpp
@@ -280,7 +280,7 @@ void dEvDtStaff_c::specialProcMessage() {
         case 0: // WAIT
             specialProc_WaitStart(staffIdx);
             break;
-        case 1: // CREATE_MSG
+        case 1: { // CREATE_MSG
             l_msgId = fpcM_ERROR_PROCESS_ID_e;
             l_msg = NULL;
             u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo");
@@ -288,25 +288,28 @@ void dEvDtStaff_c::specialProcMessage() {
             l_msgNo = *idata;
             mWipeDirection = 0;
             break;
+        }
         case 3: // FINISH
         case 5: // END
             JUT_ASSERT(0x1D8, l_msg);
             l_msg->mStatus = fopMsgStts_MSG_ENDS_e;
             break;
-        case 4: // CONTINUE
+        case 4: { // CONTINUE
             JUT_ASSERT(0x1DC, l_msg);
             l_msg->mStatus = fopMsgStts_MSG_CONTINUES_e;
-            idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo");
+            u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "msgNo");
             JUT_ASSERT(0x1DF, idata);
             l_msgNo = *idata;
             fopMsgM_messageSet(l_msgNo);
             break;
-        case 7: // TELOP_ON
-            idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "tlpNo");
+        }
+        case 7: { // TELOP_ON
+            u32* idata = dComIfGp_evmng_getMyIntegerP(staffIdx, "tlpNo");
             JUT_ASSERT(0x1E5, idata);
             dComIfGp_setStageNameOn(*idata);
             specialProc_WaitStart(staffIdx);
             break;
+        }
         case 8: // TELOP_OFF
             dComIfGp_setStageNameOff();
             break;
@@ -869,15 +872,16 @@ bool dEvDtBase_c::advanceCutLocal(dEvDtStaff_c* staff) {
 
     if (cutP->getNext() != -1) {
         switch (mCutP[cutP->getNext()].startCheck()) {
-        case -1:
+        case -1: {
             u32 flag_id = cutP->getFlagId();
             if (dEvDtFlagCheck(flag_id)) {
                 staff->advanceCut(cutP->getNext());
                 return true;
             }
             break;
+        }
         case 1:
-            flag_id = cutP->getFlagId();
+            u32 flag_id = cutP->getFlagId();
             dEvDtFlagSet(flag_id);
             staff->advanceCut(cutP->getNext());
             return true;
@@ -890,4 +894,3 @@ bool dEvDtBase_c::advanceCutLocal(dEvDtStaff_c* staff) {
         staff->mAdvance = 0;
     return false;
 }
-
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index a7edca6e2..32c8ee37c 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -14,10 +14,9 @@
 #include "d/d_stage.h"
 #include "dolphin/gf/GFPixel.h"
 #include "f_op/f_op_actor_mng.h"
-#include "f_op/f_op_camera_mng.h"
+#include "f_op/f_op_camera.h"
 #include "f_op/f_op_kankyo.h"
 #include "m_Do/m_Do_audio.h"
-#include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_lib.h"
 #include "m_Do/m_Do_mtx.h"
 #include "m_Do/m_Do_printf.h"
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 361a29618..46a8b4433 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -11,7 +11,6 @@
 void daPy_py_c::setPlayerPosAndAngle(cXyz*, s16) { }
 
 #include "d/d_resorce.h"
-#include "d/d_bg_s.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_printf.h"
 #include "m_Do/m_Do_ext.h"
@@ -25,7 +24,6 @@ void daPy_py_c::setPlayerPosAndAngle(cXyz*, s16) { }
 #include "JSystem/JKernel/JKRFileFinder.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JUtility/JUTConsole.h"
-#include "JSystem/JUtility/JUTTexture.h"
 #include "stdio.h"
 #include "string.h"
 #include "dolphin/os/OSCache.h"
diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp
index 7c4b2a8e9..7aaf2cd4b 100644
--- a/src/d/d_save.cpp
+++ b/src/d/d_save.cpp
@@ -7,8 +7,6 @@
 #include "d/d_save_init.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_item_data.h"
-#include "d/d_stage.h"
-#include "d/d_s_play.h"
 #include "d/actor/d_a_npc_sarace.h"
 #include "m_Do/m_Do_audio.h"
 #include "JSystem/JUtility/JUTAssert.h"
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index 5fca98d78..dba38b687 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -5,14 +5,12 @@
 
 #include "d/d_timer.h"
 #include "d/d_com_inf_game.h"
-#include "d/d_item.h"
 #include "d/d_meter.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_audio.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "JSystem/JKernel/JKRArchive.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 
 u32 ShipRaceSeTable[] = {
diff --git a/src/dolphin/os/OSError.c b/src/dolphin/os/OSError.c
index 4e184693f..dc72b4563 100644
--- a/src/dolphin/os/OSError.c
+++ b/src/dolphin/os/OSError.c
@@ -12,11 +12,11 @@ extern volatile u32 __OSLastInterruptSrr0;
 extern volatile s16 __OSLastInterrupt;
 extern volatile OSTime __OSLastInterruptTime;
 
-extern OSErrorHandlerEx __OSErrorTable[16];
-OSErrorHandlerEx __OSErrorTable[16];
+extern OSErrorHandlerEx __OSErrorTable[EXCEPTION_MAX];
+OSErrorHandlerEx __OSErrorTable[EXCEPTION_MAX];
 
 #define FPSCR_ENABLE (FPSCR_VE | FPSCR_OE | FPSCR_UE | FPSCR_ZE | FPSCR_XE)
-extern u32 __OSFpscrEnableBits = FPSCR_ENABLE;
+u32 __OSFpscrEnableBits = FPSCR_ENABLE;
 
 __declspec(weak) void OSReport(const char* msg, ...) {
     va_list marker;
diff --git a/src/dolphin/os/OSThread.c b/src/dolphin/os/OSThread.c
index a5c0e3238..39ca93f65 100644
--- a/src/dolphin/os/OSThread.c
+++ b/src/dolphin/os/OSThread.c
@@ -255,7 +255,7 @@ static void UnsetRun(OSThread* thread) {
     }
 
     if (queue->head == NULL) {
-        RunQueueBits &= ~(1 << 31 - thread->effective_priority);
+        RunQueueBits &= ~(1 << (31 - thread->effective_priority));
     }
 
     thread->queue = NULL;
diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp
index 19d84e344..17d8c805c 100644
--- a/src/f_op/f_op_scene_req.cpp
+++ b/src/f_op/f_op_scene_req.cpp
@@ -8,7 +8,6 @@
 #include "f_op/f_op_scene.h"
 #include "f_op/f_op_scene_pause.h"
 #include "f_pc/f_pc_executor.h"
-#include "f_pc/f_pc_manager.h"
 
 static cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* i_sceneReq) {
     if (fopOvlpM_ClearOfReq() == 1) {
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index 97b1af078..8befe157b 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -34,7 +34,7 @@ void mDoMemCd_Ctrl_c::ThdInit() {
     OSInitMutex(&mMutex);
     OSInitCond(&mCond);
     s32 priority = OSGetThreadPriority(OSGetCurrentThread());
-    OSCreateThread(&MemCardThread, mDoMemCd_main, NULL, &MemCardStack[ARRAY_SIZE(MemCardStack)], ARRAY_SIZE(MemCardStack), priority + 1, 1);
+    OSCreateThread(&MemCardThread, (void*)mDoMemCd_main, NULL, &MemCardStack[ARRAY_SIZE(MemCardStack)], ARRAY_SIZE(MemCardStack), priority + 1, 1);
     OSResumeThread(&MemCardThread);
 }
 
diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp
index 68a97470e..5498d8582 100644
--- a/src/m_Do/m_Do_MemCardRWmng.cpp
+++ b/src/m_Do/m_Do_MemCardRWmng.cpp
@@ -243,7 +243,7 @@ void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData* header) {
         snprintf(header->info, sizeof(header->info), "%d/%d Spielstand", cal.day_of_month, cal.month + 1);
         break;
     case 2:
-        // Extended ASCII 0xE9 is: é
+        // Extended ASCII 0xE9 is: é ("Données de jeu")
         snprintf(header->info, sizeof(header->info), "Donn%ces de jeu %d/%d", 0xE9, cal.day_of_month, cal.month + 1);
         break;
     case 3:
diff --git a/src/m_Do/m_Do_gba_com.cpp b/src/m_Do/m_Do_gba_com.cpp
index f295ff7f6..affd09176 100644
--- a/src/m_Do/m_Do_gba_com.cpp
+++ b/src/m_Do/m_Do_gba_com.cpp
@@ -544,7 +544,7 @@ void mDoGaC_agbCom_c::mDoGaC_GbaWrite() {
             field_0x114 = BigLittleChange(temp_r31->field_0x8);
             field_0x8 = 2;
             break;
-        case 2:
+        case 2: {
             u8 temp_r3_2 = field_0x110[temp_r31->field_0x8].field_0x4;
             if (temp_r3_2 == 2) {
                 field_0x110[temp_r31->field_0x8].field_0x4 = 3;
@@ -565,6 +565,7 @@ void mDoGaC_agbCom_c::mDoGaC_GbaWrite() {
                 field_0x8 = 0;
             }
             break;
+        }
         case 3:
             field_0x114 = BigLittleChange(temp_r31->field_0x4);
             temp_r31->field_0xc = 0;
@@ -626,13 +627,14 @@ void mDoGaC_agbCom_c::mDoGaC_ReadResult() {
     u8 sp8[16];
     if (!JUTGba::getManager()->resultRead(mDoGaC_getPortNo(), sp8) && field_0x4 == 0) {
         switch (field_0x7) {
-        case 0:
+        case 0: {
             u32 temp_r0 = BigLittleChange(field_0x118);
             if (temp_r0 == 0xFEFEFEFE) {
                 field_0x7 = 1;
             }
             break;
-        case 1:
+        }
+        case 1: {
             u32 temp_r0_2 = BigLittleChange(field_0x118);
             data_type = temp_r0_2;
             if ((temp_r0_2 & 0xFF) < 0x10) {
@@ -643,7 +645,8 @@ void mDoGaC_agbCom_c::mDoGaC_ReadResult() {
             }
             field_0x7 = 2;
             break;
-        case 2:
+        }
+        case 2: {
             u32 temp_r0_3 = BigLittleChange(field_0x118);
             field_0x110[data_type].field_0x4 = temp_r0_3;
             if (temp_r0_3 == 7) {
@@ -655,7 +658,8 @@ void mDoGaC_agbCom_c::mDoGaC_ReadResult() {
                 }
             }
             break;
-        case 3:
+        }
+        case 3: {
             u32 temp_r0_4 = (BigLittleChange(field_0x118) + 3) & ~3;
             end_p = (u32*)((u8*)field_0x110[data_type].field_0x0 + temp_r0_4);
             data_sum = 0;
@@ -665,6 +669,7 @@ void mDoGaC_agbCom_c::mDoGaC_ReadResult() {
                 field_0x7 = 5;
             }
             break;
+        }
         case 4:
             check_sum = BigLittleChange(field_0x118);
             if (data_sum == check_sum) {
@@ -676,10 +681,11 @@ void mDoGaC_agbCom_c::mDoGaC_ReadResult() {
             }
             field_0x7 = 0;
             break;
-        case 5:
+        case 5: {
             u32 temp = field_0x118;
             *recv_p = temp;
             data_sum += BigLittleChange(temp);
+        }
         case 6:
             recv_p++;
             if (recv_p >= end_p) {
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index 2bab193f7..2cfd83125 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -15,7 +15,6 @@
 #include "JSystem/JUtility/JUTDbPrint.h"
 #include "JSystem/JUtility/JUTException.h"
 #include "JSystem/JUtility/JUTGamePad.h"
-#include "JSystem/JUtility/JUTVideo.h"
 #include "SSystem/SComponent/c_malloc.h"
 #include "SSystem/SComponent/c_math.h"
 #include "dolphin/base/PPCArch.h"
@@ -23,7 +22,6 @@
 #include "dolphin/vi/vi.h"
 #include "m_Do/m_Do_DVDError.h"
 #include "m_do/m_Do_MemCard.h"
-#include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_machine_exception.h"