diff --git a/include/JAZelAudio/JAIZelBasic.h b/include/JAZelAudio/JAIZelBasic.h
index 320e4d743..4857222c7 100644
--- a/include/JAZelAudio/JAIZelBasic.h
+++ b/include/JAZelAudio/JAIZelBasic.h
@@ -1,8 +1,9 @@
 #ifndef JAZELAUDIO_JAIZELBASIC_H
 #define JAZELAUDIO_JAIZELBASIC_H
 
-#include "JAZelAudio/JAZelAudio_SE.h"
-#include "JAZelAudio/JAZelAudio_BGM.h"
+#include "JAZelAudio/JAZelAudio_SE.h" // IWYU pragma: export
+#include "JAZelAudio/JAZelAudio_BGM.h" // IWYU pragma: export
+
 #include "JSystem/JAudio/JAIBasic.h"
 #include "JSystem/JMath/random.h"
 #include "dolphin/mtx/mtx.h"
diff --git a/include/JSystem/JKernel/JKRThread.h b/include/JSystem/JKernel/JKRThread.h
index d293a4d96..545f550b6 100644
--- a/include/JSystem/JKernel/JKRThread.h
+++ b/include/JSystem/JKernel/JKRThread.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/JKernel/JKRHeap.h"
 #include "dolphin/os/OSMessage.h"
-#include "dolphin/os/OSTime.h"
 #include "dolphin/types.h"
 
 struct JKRThreadName_ {
diff --git a/include/JSystem/JUtility/JUTCacheFont.h b/include/JSystem/JUtility/JUTCacheFont.h
index 84a5d9fbd..c86e0d0f5 100644
--- a/include/JSystem/JUtility/JUTCacheFont.h
+++ b/include/JSystem/JUtility/JUTCacheFont.h
@@ -61,12 +61,12 @@ class JUTCacheFont : public JUTResFont {
     /* 0x70 */ u32 mTotalWidSize;
     /* 0x74 */ u32 mTotalGlySize;
     /* 0x78 */ u32 mTotalMapSize;
-    /* 0x7C */ void* field_0x7c;
-    /* 0x80 */ void* field_0x80;
-    /* 0x84 */ void* field_0x84;
+    /* 0x7C */ u8* field_0x7c;
+    /* 0x80 */ u8* field_0x80;
+    /* 0x84 */ u8* field_0x84;
     /* 0x88 */ u32 mMaxSheetSize;
     /* 0x8C */ EPagingType mPagingType;
-    /* 0x90 */ void* mCacheBuffer;
+    /* 0x90 */ u8* mCacheBuffer;
     /* 0x94 */ int field_0x94;
     /* 0x98 */ u32 mCachePage;
     /* 0x9C */ TGlyphCacheInfo* field_0x9c;
diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h
index fee9796de..5627ca514 100644
--- a/include/JSystem/JUtility/JUTXfb.h
+++ b/include/JSystem/JUtility/JUTXfb.h
@@ -58,7 +58,7 @@ class JUTXfb {
     static JUTXfb* sManager;
 
 private:
-    /* 0x00 */ void* mBuffer[3];
+    /* 0x00 */ u8* mBuffer[3];
     /* 0x0C */ bool mXfbAllocated[3];
     /* 0x10 */ s32 mBufferNum;
     /* 0x14 */ s16 mDrawingXfbIndex;
diff --git a/include/d/actor/d_a_arrow.h b/include/d/actor/d_a_arrow.h
index 247e8918c..ead366afc 100644
--- a/include/d/actor/d_a_arrow.h
+++ b/include/d/actor/d_a_arrow.h
@@ -1,12 +1,11 @@
 #ifndef D_A_ARROW_H
 #define D_A_ARROW_H
 
-#include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_actor.h"
 #include "d/d_cc_d.h"
 #include "d/d_bg_s_lin_chk.h"
 #include "d/d_bg_s_gnd_chk.h"
 #include "d/d_particle.h"
-#include "dolphin/types.h"
 
 class J3DAnmTextureSRTKey;
 class J3DMaterial;
diff --git a/include/d/actor/d_a_auction.h b/include/d/actor/d_a_auction.h
index 670447b85..778c3e606 100644
--- a/include/d/actor/d_a_auction.h
+++ b/include/d/actor/d_a_auction.h
@@ -3,8 +3,9 @@
 
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
-#include "d/d_com_inf_game.h"
 #include "d/d_npc.h"
+#include "d/d_particle.h"
+#include "d/d_timer.h"
 #include "m_Do/m_Do_hostIO.h"
 
 class daAuction_c : public fopNpc_npc_c {
diff --git a/include/d/actor/d_a_lbridge.h b/include/d/actor/d_a_lbridge.h
index 04dd3626e..8cffb3b72 100644
--- a/include/d/actor/d_a_lbridge.h
+++ b/include/d/actor/d_a_lbridge.h
@@ -1,8 +1,9 @@
 #ifndef D_A_LBRIDGE_H
 #define D_A_LBRIDGE_H
 
-#include "d/d_com_inf_game.h"
-#include "f_op/f_op_actor.h"
+#include "f_op/f_op_actor_mng.h"
+#include "d/d_particle.h"
+#include "d/d_bg_w.h"
 
 class daLbridge_c : public fopAc_ac_c {
 public:
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 6e354917a..82570898b 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -1,7 +1,6 @@
 #ifndef D_COM_D_COM_INF_GAME_H
 #define D_COM_D_COM_INF_GAME_H
 
-#include "JSystem/JUtility/TColor.h"
 #include "d/d_attention.h"
 #include "d/d_bg_s.h"
 #include "d/d_cc_s.h"
@@ -17,9 +16,10 @@
 #include "d/d_vibration.h"
 #include "d/d_demo.h"
 #include "d/d_timer.h"
-#include "d/res/res_always.h"
 #include "SSystem/SComponent/c_data_tbl.h"
 
+#include "d/res/res_always.h" // IWYU pragma: export
+
 class JKRArchive;
 class JKRAramBlock;
 class JKRExpHeap;
diff --git a/include/d/d_kankyo_rain.h b/include/d/d_kankyo_rain.h
index 14151d74c..d2f2e2b1f 100644
--- a/include/d/d_kankyo_rain.h
+++ b/include/d/d_kankyo_rain.h
@@ -46,4 +46,4 @@ void dKyr_get_vectle_calc(cXyz*, cXyz*, cXyz*);
 BOOL dKyr_poison_live_check();
 BOOL dKyr_moon_arrival_check();
 
-#endif /* D_KANKYO_D_KANKYO_RAIN_H */
\ No newline at end of file
+#endif /* D_KANKYO_D_KANKYO_RAIN_H */
diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h
index bbb29e653..3390d0517 100644
--- a/include/dolphin/gx/GX.h
+++ b/include/dolphin/gx/GX.h
@@ -1,19 +1,21 @@
 #ifndef GX_H_
 #define GX_H_
 
-#include "dolphin/gx/GXAttr.h"
-#include "dolphin/gx/GXBump.h"
-#include "dolphin/gx/GXDisplayList.h"
-#include "dolphin/gx/GXFifo.h"
-#include "dolphin/gx/GXFrameBuf.h"
-#include "dolphin/gx/GXGeometry.h"
-#include "dolphin/gx/GXLight.h"
-#include "dolphin/gx/GXMisc.h"
-#include "dolphin/gx/GXPerf.h"
-#include "dolphin/gx/GXPixel.h"
-#include "dolphin/gx/GXTev.h"
-#include "dolphin/gx/GXTexture.h"
-#include "dolphin/gx/GXTransform.h"
+#include "dolphin/gx/GXAttr.h" // IWYU pragma: export
+#include "dolphin/gx/GXBump.h" // IWYU pragma: export
+#include "dolphin/gx/GXDisplayList.h" // IWYU pragma: export
+#include "dolphin/gx/GXFifo.h" // IWYU pragma: export
+#include "dolphin/gx/GXFrameBuf.h" // IWYU pragma: export
+#include "dolphin/gx/GXGeometry.h" // IWYU pragma: export
+#include "dolphin/gx/GXLight.h" // IWYU pragma: export
+#include "dolphin/gx/GXMisc.h" // IWYU pragma: export
+#include "dolphin/gx/GXPerf.h" // IWYU pragma: export
+#include "dolphin/gx/GXPixel.h" // IWYU pragma: export
+#include "dolphin/gx/GXTev.h" // IWYU pragma: export
+#include "dolphin/gx/GXTexture.h" // IWYU pragma: export
+#include "dolphin/gx/GXTransform.h" // IWYU pragma: export
+#include "dolphin/gx/GXStruct.h" // IWYU pragma: export
+
 #include "dolphin/os/OSUtil.h"
 
 #ifdef __cplusplus
diff --git a/include/dolphin/gx/GXStruct.h b/include/dolphin/gx/GXStruct.h
index 146fa09a0..2ab1b23c8 100644
--- a/include/dolphin/gx/GXStruct.h
+++ b/include/dolphin/gx/GXStruct.h
@@ -2,7 +2,6 @@
 #define GXSTRUCT_H
 
 #include "global.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/vi/vi.h"
 
 typedef struct _GXColor {
diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h
index 88a393fd9..02913cdf5 100644
--- a/include/dolphin/os/OS.h
+++ b/include/dolphin/os/OS.h
@@ -4,27 +4,27 @@
 #include "stdarg.h"
 #include "dolphin/dvd/dvd.h"
 
-#include "dolphin/os/OSAlarm.h"
-#include "dolphin/os/OSAlloc.h"
-#include "dolphin/os/OSArena.h"
-#include "dolphin/os/OSAudioSystem.h"
-#include "dolphin/os/OSCache.h"
-#include "dolphin/os/OSContext.h"
-#include "dolphin/os/OSError.h"
-#include "dolphin/os/OSFont.h"
-#include "dolphin/os/OSInterrupt.h"
-#include "dolphin/os/OSLink.h"
-#include "dolphin/os/OSMemory.h"
-#include "dolphin/os/OSMessage.h"
-#include "dolphin/os/OSMutex.h"
-#include "dolphin/os/OSReboot.h"
-#include "dolphin/os/OSReset.h"
-#include "dolphin/os/OSResetSW.h"
-#include "dolphin/os/OSRtc.h"
-#include "dolphin/os/OSSync.h"
-#include "dolphin/os/OSThread.h"
-#include "dolphin/os/OSTime.h"
-#include "dolphin/os/OSUtil.h"
+#include "dolphin/os/OSAlarm.h" // IWYU pragma: export
+#include "dolphin/os/OSAlloc.h" // IWYU pragma: export
+#include "dolphin/os/OSArena.h" // IWYU pragma: export
+#include "dolphin/os/OSAudioSystem.h" // IWYU pragma: export
+#include "dolphin/os/OSCache.h" // IWYU pragma: export
+#include "dolphin/os/OSContext.h" // IWYU pragma: export
+#include "dolphin/os/OSError.h" // IWYU pragma: export
+#include "dolphin/os/OSFont.h" // IWYU pragma: export
+#include "dolphin/os/OSInterrupt.h" // IWYU pragma: export
+#include "dolphin/os/OSLink.h" // IWYU pragma: export
+#include "dolphin/os/OSMemory.h" // IWYU pragma: export
+#include "dolphin/os/OSMessage.h" // IWYU pragma: export
+#include "dolphin/os/OSMutex.h" // IWYU pragma: export
+#include "dolphin/os/OSReboot.h" // IWYU pragma: export
+#include "dolphin/os/OSReset.h" // IWYU pragma: export
+#include "dolphin/os/OSResetSW.h" // IWYU pragma: export
+#include "dolphin/os/OSRtc.h" // IWYU pragma: export
+#include "dolphin/os/OSSync.h" // IWYU pragma: export
+#include "dolphin/os/OSThread.h" // IWYU pragma: export
+#include "dolphin/os/OSTime.h" // IWYU pragma: export
+#include "dolphin/os/OSUtil.h" // IWYU pragma: export
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
index 2be8a4364..a32c65be3 100644
--- a/include/f_op/f_op_actor_mng.h
+++ b/include/f_op/f_op_actor_mng.h
@@ -1,7 +1,7 @@
 #ifndef F_OP_ACTOR_MNG_H_
 #define F_OP_ACTOR_MNG_H_
 
-#include "new.h" // IWYU pragma: keep // Used by the fopAcM_SetupActor macro.
+#include "new.h" // IWYU pragma: export // Used by the fopAcM_SetupActor macro.
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_iter.h"
 #include "f_pc/f_pc_manager.h"
diff --git a/include/m_Do/m_Do_machine_exception.h b/include/m_Do/m_Do_machine_exception.h
index f3a693579..aed2d64d0 100644
--- a/include/m_Do/m_Do_machine_exception.h
+++ b/include/m_Do/m_Do_machine_exception.h
@@ -13,4 +13,4 @@ void dispDateInfo();
 void dispConsoleToTerminal();
 void exception_addition(JUTConsole* pConsole);
 
-#endif /* M_DO_M_DO_MACHINE_EXCEPTION_H */
\ No newline at end of file
+#endif /* M_DO_M_DO_MACHINE_EXCEPTION_H */
diff --git a/src/JAZelAudio/JAIZelCharVoiceTable.cpp b/src/JAZelAudio/JAIZelCharVoiceTable.cpp
index 72360119a..d34419606 100644
--- a/src/JAZelAudio/JAIZelCharVoiceTable.cpp
+++ b/src/JAZelAudio/JAIZelCharVoiceTable.cpp
@@ -4,4 +4,3 @@
 //
 
 #include "JAZelAudio/JAIZelBasic.h"
-#include "dolphin/types.h"
diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp
index f973d164d..995d1af85 100644
--- a/src/JSystem/JKernel/JKRAram.cpp
+++ b/src/JSystem/JKernel/JKRAram.cpp
@@ -9,7 +9,6 @@
 #include "JSystem/JKernel/JKRDecomp.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "JSystem/JUtility/JUTException.h"
 #include "string.h"
 #include "dolphin/ar/ar.h"
 #include "dolphin/ar/arq.h"
diff --git a/src/JSystem/JMessage/data.cpp b/src/JSystem/JMessage/data.cpp
index cfef86d62..085db9bd1 100644
--- a/src/JSystem/JMessage/data.cpp
+++ b/src/JSystem/JMessage/data.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "JSystem/JMessage/data.h"
-#include "dolphin/types.h"
 
 namespace JMessage {
 namespace data {
diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp
index 96e61aba5..8e86616e8 100644
--- a/src/JSystem/JUtility/JUTCacheFont.cpp
+++ b/src/JSystem/JUtility/JUTCacheFont.cpp
@@ -223,7 +223,7 @@ bool JUTCacheFont::allocArea(void* cacheBuffer, u32 param_1, JKRHeap* heap) {
 
     if (cacheBuffer != NULL) {
         JUT_ASSERT(351, ( (u32)cacheBuffer & 0x1f ) == 0);
-        mCacheBuffer = cacheBuffer;
+        mCacheBuffer = static_cast<u8*>(cacheBuffer);
         field_0xb0 = 0;
     } else {
         mCacheBuffer = new (heap, 0x20) u8[v1];
@@ -253,7 +253,7 @@ bool JUTCacheFont::allocArray(JKRHeap* heap) {
         mpGlyphBlocks = (ResFONT::GLY1**)blocks;
         blocks = blocks + mGlyphBlockNum;
         for (int i = 0; i < mGlyphBlockNum; i++) {
-            mpGlyphBlocks[i] = (ResFONT::GLY1*)((u8*)mCacheBuffer + (field_0x94 * i));
+            mpGlyphBlocks[i] = (ResFONT::GLY1*)(mCacheBuffer + (field_0x94 * i));
         }
     }
     if (mMapBlockNum) {
@@ -267,7 +267,7 @@ void JUTCacheFont::setBlock() {
     int widthNum = 0;
     int gylphNum = 0;
     int mapNum = 0;
-    u8* pWidth = (u8*)field_0x7c;
+    u8* pWidth = field_0x7c;
     ResFONT::GLY1* piVar5 = (ResFONT::GLY1*)field_0x80;
     ResFONT::MAP1* pMap = (ResFONT::MAP1*)field_0x84;
     u32 aramAddress = field_0xac->getAddress();
@@ -276,23 +276,22 @@ void JUTCacheFont::setBlock() {
 
     for (int i = 0; i < mResFont->numBlocks; i++) {
         switch (*pData) {
-        case 'INF1':
+        case 'INF1': {
             memcpy(mInfoBlock, pData, 0x20);
             u32 u = mInfoBlock->fontType;
             JUT_ASSERT(447, u < suAboutEncoding_);
             mIsLeadByte = &JUTResFont::saoAboutEncoding_[u];
             break;
+        }
         case 'WID1':
             memcpy(pWidth, pData, pData[1]);
             mpWidthBlocks[widthNum] = (ResFONT::WID1*)pWidth;
             pWidth += pData[1];
             widthNum++;
             break;
-        case 'GLY1':
+        case 'GLY1': {
             memcpy(piVar5, pData, 0x20);
-            JKRAramBlock* iVar1 =
-                JKRMainRamToAram((u8*)pData + 0x20, aramAddress, pData[1] - 0x20,
-                                 EXPAND_SWITCH_UNKNOWN0, 0, NULL, 0xffffffff);
+            JKRAramBlock* iVar1 = JKRMainRamToAram((u8*)pData + 0x20, aramAddress, pData[1] - 0x20, EXPAND_SWITCH_UNKNOWN0, 0, NULL, -1);
             if (iVar1 == NULL) {
                 OSPanic(__FILE__, 476, "Cannot alloc ARAM area.");
             }
@@ -305,6 +304,7 @@ void JUTCacheFont::setBlock() {
             piVar5++;
             aramAddress = pData[1] + aramAddress - 0x20;
             break;
+        }
         case 'MAP1':
             memcpy(pMap, pData, pData[1]);
             mpMapBlocks[mapNum] = pMap;
diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp
index a087dd41c..b8edb0598 100644
--- a/src/JSystem/JUtility/JUTException.cpp
+++ b/src/JSystem/JUtility/JUTException.cpp
@@ -916,7 +916,7 @@ bool JUTException::queryMapAddress_single(char* mapPath, u32 address, s32 sectio
                 break;
             if ((length < 28))
                 continue;
-            if ((buffer[28] == '4')) {
+            if (buffer[28] == '4') {
                 u32 addr = ((buffer[18] - '0') << 28) | strtol(buffer + 19, NULL, 16);
                 int size = strtol(buffer + 11, NULL, 16);
                 if ((addr <= address && address < addr + size)) {
diff --git a/src/JSystem/JUtility/JUTFader.cpp b/src/JSystem/JUtility/JUTFader.cpp
index eb5186bed..a196a09cf 100644
--- a/src/JSystem/JUtility/JUTFader.cpp
+++ b/src/JSystem/JUtility/JUTFader.cpp
@@ -5,7 +5,6 @@
 
 #include "JSystem/JUtility/JUTFader.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
-#include "dolphin/types.h"
 
 /* 802C8544-802C85F0       .text __ct__8JUTFaderFiiiiQ28JUtility6TColor */
 JUTFader::JUTFader(int x, int y, int width, int height, JUtility::TColor pColor) : mColor(pColor), mBox(x, y, x + width, y + height) {
diff --git a/src/JSystem/JUtility/JUTGba.cpp b/src/JSystem/JUtility/JUTGba.cpp
index ef2021e41..0642b06d2 100644
--- a/src/JSystem/JUtility/JUTGba.cpp
+++ b/src/JSystem/JUtility/JUTGba.cpp
@@ -44,7 +44,7 @@ JUTGba* JUTGba::create() {
     for (int i = 0; i < 4; i++) {
         JUTGbaParam* param = &sManager->mParams[i];
         OSReport(":::GBA: Create Thread %d\n", i);
-        OSCreateThread(&sManager->mThreads[i], &gbaThreadMain, param, sManager->mStacks + i + 1, 0x1000, 8, 0);
+        OSCreateThread(&sManager->mThreads[i], (void*)&gbaThreadMain, param, sManager->mStacks + i + 1, 0x1000, 8, 0);
         OSResumeThread(&sManager->mThreads[i]);
     }
 
diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/src/JSystem/JUtility/JUTProcBar.cpp
index d5aa03142..8447585bc 100644
--- a/src/JSystem/JUtility/JUTProcBar.cpp
+++ b/src/JSystem/JUtility/JUTProcBar.cpp
@@ -72,7 +72,7 @@ void JUTProcBar::clear() {
 /* 802C8AD8-802C8C6C       .text bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor */
 void JUTProcBar::bar_subroutine(int param_0, int param_1, int param_2, int param_3, int param_4, int param_5, int param_6, JUtility::TColor param_7, JUtility::TColor param_8) {
     int var1 = param_6 * param_3 / param_4;
-    J2DFillBox(param_0, param_1, param_5 * param_3 / param_4, param_2, param_7);
+    J2DFillBox(param_0, param_1, (int)(param_5 * param_3 / param_4), param_2, param_7);
     if (var1 < 0) {
         return;
     }
@@ -249,9 +249,9 @@ void heapBar(JKRHeap* param_0, int param_1, int param_2, int param_3, int param_
     int stack52 = param_1 + addrToXPos(param_0->getStartAddr(), param_4);
     int var1 = param_1 + addrToXPos(param_0->getEndAddr(), param_4);
     int stack36 = byteToXLen(param_0->getTotalFreeSize(), param_4);
-    J2DFillBox(stack52, param_2 - param_5 * 2 + param_5 / 2, var1 - stack52, param_5 / 2,
+    J2DFillBox(stack52, (int)(param_2 - param_5 * 2 + param_5 / 2), var1 - stack52, (int)(param_5 / 2),
                JUtility::TColor(255, 0, 200, 255));
-    J2DFillBox(stack52, param_2 - param_5 * 2 + param_5 / 2, stack36, param_5 / 2,
+    J2DFillBox(stack52, (int)(param_2 - param_5 * 2 + param_5 / 2), stack36, (int)(param_5 / 2),
                JUtility::TColor(255, 180, 250, 255));
 }
 
@@ -281,7 +281,7 @@ void JUTProcBar::drawHeapBar() {
 
         // draws a light blue line that shows how much memory is free in the root heap(blends to light pink, not sure how this works)
         int size = byteToXLen(JKRHeap::getRootHeap()->getTotalFreeSize(), width);
-        J2DFillBox(start, posY - (height * 2), size, height / 2, JUtility::TColor(0, 250, 250, 255));
+        J2DFillBox(start, posY - (height * 2), size, (int)(height / 2), JUtility::TColor(0, 250, 250, 255));
         if (field_0x128 == 0)
         {
             // draws a line of either the watch heap(if available), otherwise draw the current heap
diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/src/JSystem/JUtility/JUTResFont.cpp
index 4856c7077..f63f0aae2 100644
--- a/src/JSystem/JUtility/JUTResFont.cpp
+++ b/src/JSystem/JUtility/JUTResFont.cpp
@@ -138,12 +138,13 @@ void JUTResFont::setBlock() {
     const JUTDataBlockHeader* header = (JUTDataBlockHeader*)mResFont->data;
     for (u32 i = 0; i < mResFont->numBlocks; i++, header = header->getNext()) {
         switch (header->mType) {
-        case 'INF1':
+        case 'INF1': {
             mInfoBlock = (ResFONT::INF1*)header;
             u32 u = mInfoBlock->fontType;
             JUT_ASSERT(0xF3, u < suAboutEncoding_)
             mIsLeadByte = (IsLeadByte_func*)&saoAboutEncoding_[u];
             break;
+        }
         case 'WID1':
             mpWidthBlocks[widthNum] = (ResFONT::WID1*)header;
             widthNum++;
diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp
index cc1add7d6..0f49febcc 100644
--- a/src/JSystem/JUtility/JUTXfb.cpp
+++ b/src/JSystem/JUtility/JUTXfb.cpp
@@ -86,12 +86,12 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber
     int size = ((u32)width + 0xf & 0xfff0) * (u32)height * 2;
 
     void* buf = ::operator new[](size, pHeap, 0x20);
-    mBuffer[0] = buf;
+    mBuffer[0] = static_cast<u8*>(buf);
     mXfbAllocated[0] = true;
 
     if (xfbNum >= 2) {
         buf = ::operator new[](size, pHeap, 0x20);
-        mBuffer[1] = buf;
+        mBuffer[1] = static_cast<u8*>(buf);
         mXfbAllocated[1] = true;
     } else {
         mBuffer[1] = NULL;
@@ -100,7 +100,7 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber
 
     if (xfbNum >= 3) {
         buf = ::operator new[](size, pHeap, 0x20);
-        mBuffer[2] = buf;
+        mBuffer[2] = static_cast<u8*>(buf);
         mXfbAllocated[2] = true;
     } else {
         mBuffer[2] = NULL;
diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp
index 8b16d2c94..721b7f63b 100644
--- a/src/c/c_damagereaction.cpp
+++ b/src/c/c_damagereaction.cpp
@@ -8,7 +8,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_sea.h"
 #include "d/d_s_play.h"
-#include "JAZelAudio/JAZelAudio_SE.h"
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_cc_uty.h"
diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp
index 4eb700f59..db0a9b28c 100644
--- a/src/c/c_dylink.cpp
+++ b/src/c/c_dylink.cpp
@@ -11,7 +11,6 @@
 #include "m_Do/m_Do_printf.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JKernel/JKRFileCache.h"
-#include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "DynamicLink.h"
 #include "dolphin/os/OS.h"
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index 252aacd32..b5a8056f9 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -15,7 +15,6 @@ u32 daPy_py_c::checkPlayerFly() const { return 0; }
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
-#include "d/d_npc.h"
 #include "d/d_item_data.h"
 #include "d/actor/d_a_player.h"
 #include "d/actor/d_a_player_main.h"
diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp
index d8725a270..6298d9788 100644
--- a/src/d/actor/d_a_auction.cpp
+++ b/src/d/actor/d_a_auction.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_player_main.h"
 #include "d/d_camera.h"
 #include "d/d_procname.h"
-#include "d/res/res_auction.h"
 #include "m_Do/m_Do_controller_pad.h"
 
 struct NpcDatStruct {
diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp
index 21156d0be..04a7a89df 100644
--- a/src/d/actor/d_a_itembase.cpp
+++ b/src/d/actor/d_a_itembase.cpp
@@ -6,7 +6,6 @@
 #include "d/actor/d_a_itembase.h"
 #include "d/d_item.h"
 #include "d/d_item_data.h"
-#include "d/d_resorce.h"
 #include "d/d_drawlist.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_graphic.h"
diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp
index f441b84d5..165018ac8 100644
--- a/src/d/actor/d_a_lbridge.cpp
+++ b/src/d/actor/d_a_lbridge.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_lbridge.h"
+#include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/res/res_gbrg00.h"
 
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index 51a7b01af..425579b0a 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -4,12 +4,12 @@
 //
 
 #include "d/actor/d_a_npc_ji1.h"
+#include "d/actor/d_a_player.h"
+#include "d/actor/d_a_tsubo.h"
 #include "d/res/res_ji.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/d_snap.h"
-#include "d/actor/d_a_player_main.h"
-#include "d/actor/d_a_tsubo.h"
 #include "f_op/f_op_msg.h"
 
 static void daNpc_Ji1_setHairAngle(daNpc_Ji1_c*);
diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp
index 96bf6ac8a..7973370d3 100644
--- a/src/d/actor/d_a_obj_mknjd.cpp
+++ b/src/d/actor/d_a_obj_mknjd.cpp
@@ -8,12 +8,9 @@
 #include "f_op/f_op_actor_mng.h"
 #include "f_pc/f_pc_manager.h"
 #include "f_op/f_op_msg.h"
-#include "f_op/f_op_draw_tag.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JAZelAudio/JAIZelBasic.h"
-#include "JAZelAudio/JAZelAudio_BGM.h"
-#include "JAZelAudio/JAZelAudio_SE.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
@@ -23,7 +20,6 @@
 #include "d/d_item_data.h"
 #include "d/d_particle.h"
 #include "d/actor/d_a_player.h"
-#include "d/d_a_obj.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
 
diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp
index e3e930bd4..deb2b9f25 100644
--- a/src/d/actor/d_a_tag_ret.cpp
+++ b/src/d/actor/d_a_tag_ret.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_tag_ret.h"
-#include "d/d_a_obj.h"
 #include "d/d_item.h"
 #include "d/d_item_data.h"
 #include "d/d_cc_d.h"
diff --git a/src/d/d_bg_s_lin_chk.cpp b/src/d/d_bg_s_lin_chk.cpp
index d897b7831..7d21ac108 100644
--- a/src/d/d_bg_s_lin_chk.cpp
+++ b/src/d/d_bg_s_lin_chk.cpp
@@ -5,7 +5,6 @@
 
 #include "d/d_bg_s_lin_chk.h"
 #include "f_op/f_op_actor_mng.h"
-#include "dolphin/types.h"
 
 /* 800A5678-800A56B8       .text Set__11dBgS_LinChkFP4cXyzP4cXyzP10fopAc_ac_c */
 void dBgS_LinChk::Set(cXyz* pi_start, cXyz* pi_end, fopAc_ac_c* pi_actor) {
diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp
index a31435347..805eeec94 100644
--- a/src/d/d_gameover.cpp
+++ b/src/d/d_gameover.cpp
@@ -263,7 +263,8 @@ BOOL dDlst_GameOverScrnDraw_c::animeOpen() {
             if (letter[i].mUserArea >= 1 && var_r30 != i) {
                 anime1(i);
                 if (letter[i].mUserArea == 5) {
-                    dComIfGp_particle_set2Dfore(0x2E, &cXyz(x[i], 50.0f, 0.0f));
+                    cXyz temp(x[i], 50.0f, 0.0f);
+                    dComIfGp_particle_set2Dfore(0x2E, &temp);
                 }
             }
 
diff --git a/src/d/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp
index 620443414..367a92134 100644
--- a/src/d/d_menu_cloth.cpp
+++ b/src/d/d_menu_cloth.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/d_menu_cloth.h"
-#include "dolphin/types.h"
 
 /* 8019940C-8019966C       .text __ct__13daCLOTH_HIO_cFv */
 daCLOTH_HIO_c::daCLOTH_HIO_c() {
diff --git a/src/d/d_menu_item.cpp b/src/d/d_menu_item.cpp
index 0de373b38..aee0b91aa 100644
--- a/src/d/d_menu_item.cpp
+++ b/src/d/d_menu_item.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/d_menu_item.h"
-#include "dolphin/types.h"
 
 /* 801C7B4C-801C7C7C       .text __ct__9dMi_HIO_cFv */
 dMi_HIO_c::dMi_HIO_c() {
diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp
index f9e2b5eee..2820c7eae 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/src/f_op/f_op_msg_mng.cpp
@@ -14,7 +14,6 @@
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "SSystem/SComponent/c_malloc.h"
 #include "printf.h"
-#include "math.h"
 
 static bool pushButton;
 static bool pushButton2;