diff --git a/include/d/actor/d_a_fm.h b/include/d/actor/d_a_fm.h
index b3f51eec8..675079b78 100644
--- a/include/d/actor/d_a_fm.h
+++ b/include/d/actor/d_a_fm.h
@@ -3,6 +3,8 @@
 
 #include "f_op/f_op_actor.h"
 #include "c/c_damagereaction.h"
+#include "d/d_path.h"
+#include "d/d_bg_s_lin_chk.h"
 
 class daFm_c : public fopEn_enemy_c {
 public:
@@ -22,7 +24,7 @@ public:
     bool jntHitCreateHeap();
     BOOL _pathMove(cXyz*, cXyz*, cXyz*);
     fopAc_ac_c* searchNearOtherActor(fopAc_ac_c*);
-    bool searchNearFm(fopAc_ac_c*);
+    void* searchNearFm(fopAc_ac_c*);
     void moveRndBack();
     void moveRndEscape();
     void spAttackVJump();
diff --git a/include/d/actor/d_a_npc_zl1.h b/include/d/actor/d_a_npc_zl1.h
index 798593208..f8a352279 100644
--- a/include/d/actor/d_a_npc_zl1.h
+++ b/include/d/actor/d_a_npc_zl1.h
@@ -2,6 +2,7 @@
 #define D_A_NPC_ZL1_H
 
 #include "d/d_npc.h"
+#include "d/d_particle.h"
 
 class J3DMaterial;
 class J3DNode;
diff --git a/include/d/actor/d_a_tag_kk1.h b/include/d/actor/d_a_tag_kk1.h
index bea93b761..4c04c41d8 100644
--- a/include/d/actor/d_a_tag_kk1.h
+++ b/include/d/actor/d_a_tag_kk1.h
@@ -7,9 +7,9 @@
 class daTag_Kk1_c : public fopNpc_npc_c {
 public:
     BOOL createInit();
-    bool _draw();
-    bool _execute();
-    bool _delete();
+    BOOL _draw();
+    BOOL _execute();
+    BOOL _delete();
     cPhs_State _create();
 
 public:
diff --git a/include/d/d_file_error.h b/include/d/d_file_error.h
index ce2670e89..5cae62c76 100644
--- a/include/d/d_file_error.h
+++ b/include/d/d_file_error.h
@@ -10,6 +10,7 @@
 #include "d/d_drawlist.h"
 #include "d/d_lib.h"
 #include "f_op/f_op_msg_mng.h"
+#include "m_Do/m_Do_hostIO.h"
 
 class dFe_HIO_c : public JORReflexible {
 public:
diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp
index 087a58cd4..4c21501d3 100644
--- a/src/JSystem/JStudio/JStudio/functionvalue.cpp
+++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp
@@ -646,7 +646,7 @@ f64 TFunctionValue_list::update_INTERPOLATE_BSPLINE_dataMore3_(const TFunctionVa
             dVar8 = rThis._44[data._10 + 2];
         }
     }
-    functionvalue::interpolateValue_BSpline_uniform(data._0 - data._8, dVar9, dVar11, dVar10, dVar8);
+    return functionvalue::interpolateValue_BSpline_uniform(data._0 - data._8, dVar9, dVar11, dVar10, dVar8);
 }
 
 /* 80272728-80272794       .text __ct__Q27JStudio29TFunctionValue_list_parameterFv */
@@ -830,7 +830,7 @@ f64 TFunctionValue_list_parameter::update_INTERPOLATE_BSPLINE_dataMore3_(const T
         }
         break;
     }
-    functionvalue::interpolateValue_BSpline_nonuniform(d, (f64*)&local_68, (f64*)&local_48);
+    return functionvalue::interpolateValue_BSpline_nonuniform(d, (f64*)&local_68, (f64*)&local_48);
 }
 
 /* 80272CB8-80272D38       .text __ct__Q27JStudio22TFunctionValue_hermiteFv */
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/ptmf.c b/src/PowerPC_EABI_Support/Runtime/Src/ptmf.c
index 772c2f939..9f0e8183c 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/ptmf.c
+++ b/src/PowerPC_EABI_Support/Runtime/Src/ptmf.c
@@ -1,3 +1,4 @@
+#ifdef __MWERKS__
 #include "ptmf.h"
 #include "global.h"
 
@@ -50,3 +51,4 @@ do_call:
     mtctr r12
     bctr
 };
+#endif
diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp
index 6911648dc..ad0d21bd9 100644
--- a/src/d/actor/d_a_fm.cpp
+++ b/src/d/actor/d_a_fm.cpp
@@ -606,11 +606,11 @@ fopAc_ac_c* daFm_c::searchNearOtherActor(fopAc_ac_c* i_actor) {
 
 /* 00000F18-00000F44       .text searchNearFm_CB__FPvPv */
 static void* searchNearFm_CB(void* param_1, void* param_2) {
-    ((daFm_c*)param_2)->searchNearFm((fopAc_ac_c*)param_1);
+    return ((daFm_c*)param_2)->searchNearFm((fopAc_ac_c*)param_1);
 }
 
 /* 00000F44-00001150       .text searchNearFm__6daFm_cFP10fopAc_ac_c */
-bool daFm_c::searchNearFm(fopAc_ac_c* i_actor) {
+void* daFm_c::searchNearFm(fopAc_ac_c* i_actor) {
     f32 dist;
     if(fopAc_IsActor(i_actor) && fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_FM) { // redundant isactor check?
         f32 abs = (field_0x3E4 - current.pos).absXZ();
@@ -623,7 +623,7 @@ bool daFm_c::searchNearFm(fopAc_ac_c* i_actor) {
             }
         }
     }
-    return false;
+    return NULL;
 }
 
 /* 00001150-00001384       .text moveRndBack__6daFm_cFv */
@@ -2746,7 +2746,7 @@ void daFm_c::grabPlayer() {
     csXyz angle(0, 0, 0);
     switch (mAnmPrmIdx) {
         case 4:
-        case 6:
+        case 6: {
             daPy_lk_c* pLink = (daPy_lk_c*)daPy_getPlayerLinkActorClass();
             cXyz offset2 = pLink->getHeadTopPos() - pLink->current.pos;
             temp.set(5.0f, 0.0f, 10.0f);
@@ -2759,7 +2759,7 @@ void daFm_c::grabPlayer() {
             mDoMtx_stack_c::transM(temp2);
             MTXCopy(mDoMtx_stack_c::get(), field_0x6BC);
             pLink->setPlayerPosAndAngle(mDoMtx_stack_c::get());
-
+        }
         case 5:
         default:
             break;
diff --git a/src/d/actor/d_a_himo3.cpp b/src/d/actor/d_a_himo3.cpp
index 18743a3ee..b96dd8e73 100644
--- a/src/d/actor/d_a_himo3.cpp
+++ b/src/d/actor/d_a_himo3.cpp
@@ -295,7 +295,12 @@ static BOOL daHimo3_Draw(himo3_class* i_this) {
         fVar1 = DEMO_SELECT(REG0_F(0) + 3.75f, 3.75f);
     }
 
+#ifdef __MWERKS__
     i_this->mLineMat.update(i_this->m15C0, fVar1, (GXColor){200, 150, 50, 255}, 0, &i_this->tevStr);
+#else
+    GXColor color = (GXColor){200, 150, 50, 255};
+    i_this->mLineMat.update(i_this->m15C0, fVar1, color, 0, &i_this->tevStr);
+#endif
     dComIfGd_set3DlineMat(&i_this->mLineMat);
 
     if (i_this->m0298 != 0xf) {
diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp
index 7304807bf..ee7795139 100644
--- a/src/d/actor/d_a_npc_zl1.cpp
+++ b/src/d/actor/d_a_npc_zl1.cpp
@@ -946,7 +946,7 @@ void daNpc_Zl1_c::setAnm_ATR() {
 /* 00001E18-00001ED4       .text anmAtr__11daNpc_Zl1_cFUs */
 void daNpc_Zl1_c::anmAtr(u16 mesgNo) {
     switch(mesgNo) {
-        case 6:
+        case 6: {
             if(field_0x851 == 0) {
                 chngAnmAtr(dComIfGp_getMesgAnimeAttrInfo());
                 field_0x851++;
@@ -958,6 +958,7 @@ void daNpc_Zl1_c::anmAtr(u16 mesgNo) {
                 chngAnmTag();
             }
             break;
+        }
         case 0xe:
             field_0x851 = 0;
             break;
@@ -1100,7 +1101,6 @@ void daNpc_Zl1_c::checkOrder() {
         field_0x84A = 0;
         field_0x7D7 = true;
     }
-    /* Nonmatching */
 }
 
 /* 00002280-00002318       .text chk_talk__11daNpc_Zl1_cFv */
@@ -1241,7 +1241,7 @@ void daNpc_Zl1_c::lookBack() {
             targetY = field_0x7C0;
             field_0x7D0 = false;
             break;
-        case 4:
+        case 4: {
             fopAc_ac_c* actor = searchByID(mProcId2, &temp6);
             if(actor != NULL && temp6 == 0) {
                 field_0x758.set(actor->current.pos);
@@ -1251,7 +1251,7 @@ void daNpc_Zl1_c::lookBack() {
                 field_0x7D0 = true;
             }
             break;
-
+        }
         case 5:
             kyorokyoro();
             temp3.set(field_0x758);
diff --git a/src/d/actor/d_a_tag_kk1.cpp b/src/d/actor/d_a_tag_kk1.cpp
index cc7a6a91a..a58f0556d 100644
--- a/src/d/actor/d_a_tag_kk1.cpp
+++ b/src/d/actor/d_a_tag_kk1.cpp
@@ -48,12 +48,12 @@ BOOL daTag_Kk1_c::createInit() {
 }
 
 /* 00000128-00000130       .text _draw__11daTag_Kk1_cFv */
-bool daTag_Kk1_c::_draw() {
+BOOL daTag_Kk1_c::_draw() {
     return true;
 }
 
 /* 00000130-0000024C       .text _execute__11daTag_Kk1_cFv */
-bool daTag_Kk1_c::_execute() {
+BOOL daTag_Kk1_c::_execute() {
     f32 distance = current.pos.abs(dComIfGp_getPlayer(0)->current.pos);
     f32 vert_distance = dComIfGp_getPlayer(0)->current.pos.y - current.pos.y;
     mTagSet = false;
@@ -69,7 +69,7 @@ bool daTag_Kk1_c::_execute() {
 
 
 /* 0000024C-000002A0       .text _delete__11daTag_Kk1_cFv */
-bool daTag_Kk1_c::_delete() {
+BOOL daTag_Kk1_c::_delete() {
     if (l_HIO.mNo >= 0) {
         mDoHIO_deleteChild(l_HIO.mNo);
         l_HIO.mNo = -1;
@@ -107,22 +107,22 @@ cPhs_State daTag_Kk1_c::_create() {
 
 /* 00000694-000006B4       .text daTag_Kk1_Create__FP10fopAc_ac_c */
 static cPhs_State daTag_Kk1_Create(fopAc_ac_c* obj) {
-    (static_cast<daTag_Kk1_c*>(obj))->_create();
+    return (static_cast<daTag_Kk1_c*>(obj))->_create();
 }
 
 /* 000006B4-000006D4       .text daTag_Kk1_Delete__FP11daTag_Kk1_c */
 static BOOL daTag_Kk1_Delete(daTag_Kk1_c* obj) {
-    (static_cast<daTag_Kk1_c*>(obj))->_delete();
+    return (static_cast<daTag_Kk1_c*>(obj))->_delete();
 }
 
 /* 000006D4-000006F4       .text daTag_Kk1_Execute__FP11daTag_Kk1_c */
 static BOOL daTag_Kk1_Execute(daTag_Kk1_c* obj) {
-    (static_cast<daTag_Kk1_c*>(obj))->_execute();
+    return (static_cast<daTag_Kk1_c*>(obj))->_execute();
 }
 
 /* 000006F4-00000714       .text daTag_Kk1_Draw__FP11daTag_Kk1_c */
 static BOOL daTag_Kk1_Draw(daTag_Kk1_c* obj) {
-    (static_cast<daTag_Kk1_c*>(obj))->_draw();
+    return (static_cast<daTag_Kk1_c*>(obj))->_draw();
 }
 
 /* 00000714-0000071C       .text daTag_Kk1_IsDelete__FP11daTag_Kk1_c */
diff --git a/src/d/d_file_error.cpp b/src/d/d_file_error.cpp
index 5c6d6f279..e006aaca3 100644
--- a/src/d/d_file_error.cpp
+++ b/src/d/d_file_error.cpp
@@ -8,7 +8,7 @@
 #include "d/d_file_error.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_msg_mng.h"
-#include "m_Do/m_do_controller_pad.h"
+#include "m_Do/m_Do_controller_pad.h"
 
 dFe_HIO_c g_feHIO;
 
diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp
index 315a3ed12..355fc85a4 100644
--- a/src/d/d_file_select.cpp
+++ b/src/d/d_file_select.cpp
@@ -2468,12 +2468,12 @@ void dFile_select_c::yesNoPaneMoveSet() {
 
 /* 8018A46C-8018A4B0       .text MessagePaneMove__14dFile_select_cFffffsUci */
 int dFile_select_c::MessagePaneMove(f32 param_1, f32 param_2, f32 param_3, f32 param_4, s16 param_5, u8 param_6, int param_7) {
-    PaneTranceMessageBase(field_0x3930 - param_5, g_fsHIO.field_0x32, param_1, param_2, param_3, param_4, param_6, param_7);
+    return PaneTranceMessageBase(field_0x3930 - param_5, g_fsHIO.field_0x32, param_1, param_2, param_3, param_4, param_6, param_7);
 }
 
 /* 8018A4B0-8018A4F4       .text recInfoPaneMove__14dFile_select_cFffffsUci */
 int dFile_select_c::recInfoPaneMove(f32 param_1, f32 param_2, f32 param_3, f32 param_4, s16 param_5, u8 param_6, int param_7) {
-    PaneTranceRecBase(field_0x3930 - param_5, g_fsHIO.field_0x2F, param_1, param_2, param_3, param_4, param_6, param_7);
+    return PaneTranceRecBase(field_0x3930 - param_5, g_fsHIO.field_0x2F, param_1, param_2, param_3, param_4, param_6, param_7);
 }
 
 /* 8018A4F4-8018A644       .text menuPaneMove__14dFile_select_cFffsUci */