diff --git a/include/JSystem/J3DGraphBase/J3DGD.h b/include/JSystem/J3DGraphBase/J3DGD.h
index d16094f5d..6f41992b3 100644
--- a/include/JSystem/J3DGraphBase/J3DGD.h
+++ b/include/JSystem/J3DGraphBase/J3DGD.h
@@ -77,6 +77,7 @@ void J3DGDSetTevKColor(GXTevKColorID, GXColor);
 void J3DGDSetTevColorS10(GXTevRegID, GXColorS10);
 void J3DGDSetFog(GXFogType, f32, f32, f32, f32, GXColor);
 void J3DGDSetFogRangeAdj(u8, u16, GXFogAdjTable*);
+void J3DGDSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList*, bool);
 
 static inline void J3DFifoLoadIndx(u8 cmd, u16 indx, u16 addr) {
     GXFIFO.u8 = cmd;
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index 8100f78e2..39e9ce208 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -163,4 +163,8 @@ public:
 extern u32 j3dDefaultViewNo;
 extern J3DSys j3dSys;
 
+void J3DFifoLoadNrmMtxImm(Mtx, u32);
+void J3DFifoLoadNrmMtxImm3x3(Mtx33, u32);
+void J3DFifoLoadPosMtxImm(Mtx, u32);
+
 #endif /* J3DSYS_H */
diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h
index d3d75b267..8ed449793 100644
--- a/include/JSystem/J3DGraphBase/J3DTevs.h
+++ b/include/JSystem/J3DGraphBase/J3DTevs.h
@@ -207,5 +207,13 @@ struct J3DNBTScale : public J3DNBTScaleInfo {
 struct J3DTexCoord;
 void loadTexCoordGens(u32, J3DTexCoord*);
 void loadNBTScale(J3DNBTScale& param_0);
+bool isTexNoReg(void*);
+u16 getTexNoReg(void*);
+void loadTexNo(u32, const u16&);
+void makeTexCoordTable();
+void makeAlphaCmpTable();
+void makeZModeTable();
+void makeTevSwapTable();
+void patchTexNo_PtrToIdx(u32 texID, const u16& idx);
 
 #endif /* J3DTEVS_H */
diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h
index c76dc51e8..d6f24affc 100644
--- a/include/JSystem/J3DGraphBase/J3DTransform.h
+++ b/include/JSystem/J3DGraphBase/J3DTransform.h
@@ -40,6 +40,7 @@ void J3DScaleNrmMtx33(Mtx33, const Vec&);
 void J3DMtxProjConcat(Mtx, Mtx, Mtx);
 void J3DPSMtx33Copy(Mtx3P src, Mtx3P dst);
 void J3DPSMtx33CopyFrom34(MtxP src, Mtx3P dst);
+void J3DPSMtxArrayConcat(Mtx, Mtx, Mtx, u32);
 
 inline void J3DPSMulMtxVec(register MtxP mtx, register Vec* vec, register Vec* dst) {
 #ifdef __MWERKS__
diff --git a/include/JSystem/JRenderer/JRenderer.h b/include/JSystem/JRenderer/JRenderer.h
new file mode 100644
index 000000000..deb96e7e3
--- /dev/null
+++ b/include/JSystem/JRenderer/JRenderer.h
@@ -0,0 +1,8 @@
+#ifndef JRENDERER_H
+#define JRENDERER_H
+
+#include "dolphin/gx/GX.h"
+
+void JRNLoadTexCached(GXTexMapID id, u32 addr_even, GXTexCacheSize size_even, u32 addr_odd, GXTexCacheSize size_odd);
+
+#endif /* JRENDERER_H */
diff --git a/include/SSystem/SComponent/c_API.h b/include/SSystem/SComponent/c_API.h
index e9e499124..99feed433 100644
--- a/include/SSystem/SComponent/c_API.h
+++ b/include/SSystem/SComponent/c_API.h
@@ -3,11 +3,10 @@
 
 #include "dolphin/types.h"
 
-typedef bool (*cAPIGph_Mthd)(void);
+typedef void (*cAPIGph_Mthd)(void);
 
-struct cAPIGph__Iface
-{
-    u8 * mpGInfo;
+struct cAPIGph__Iface {
+    void* mpGInfo;
     cAPIGph_Mthd mpCreate;
     cAPIGph_Mthd mpBeforeOfDraw;
     cAPIGph_Mthd mpAfterOfDraw;
diff --git a/include/d/d_auction_screen.h b/include/d/d_auction_screen.h
index bfa2c7e3c..b00707633 100644
--- a/include/d/d_auction_screen.h
+++ b/include/d/d_auction_screen.h
@@ -2,6 +2,7 @@
 #define D_AUCTION_SCREEN_H
 
 #include "dolphin/types.h"
+#include "f_pc/f_pc_base.h"
 
 struct fopMsgM_pane_class;
 class J2DPane;
@@ -45,4 +46,15 @@ public:
     dAs_HIO_c();
 };
 
+void dAuction_screen_delete();
+void dAuction_screen_slotShow();
+void dAuction_screen_slotHide();
+void dAuction_screen_gaugeHide();
+void dAuction_screen_gaugeShow();
+void dAuction_screen_gaugeUp();
+void dAuction_screen_gaugeDown();
+void dAuction_screen_talkStart();
+void dAuction_screen_talkEnd();
+fpc_ProcID dAuction_screen_create();
+
 #endif /* D_AUCTION_SCREEN_H */
diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h
index 562254a4b..913cbf2b6 100644
--- a/include/d/d_kankyo.h
+++ b/include/d/d_kankyo.h
@@ -466,5 +466,6 @@ BOOL dKy_daynighttact_stop_chk();
 void dKy_contrast_flg_set(u8);
 u8 dKy_contrast_flg_get();
 BOOL dKyr_player_overhead_bg_chk();
+void dKy_usonami_set(f32 param_0);
 
 #endif /* D_KANKYO_D_KANKYO_H */
diff --git a/include/d/d_msg.h b/include/d/d_msg.h
index daa25dacc..a640e11fe 100644
--- a/include/d/d_msg.h
+++ b/include/d/d_msg.h
@@ -91,6 +91,6 @@ public:
     void* field_0x8;
 };
 
-extern JKRHeap* dMsg_getAgbWorkArea();
+JKRHeap* dMsg_getAgbWorkArea();
 
 #endif /* D_MSG_H */
diff --git a/include/d/d_npc.h b/include/d/d_npc.h
index be3d14419..43a054bcf 100644
--- a/include/d/d_npc.h
+++ b/include/d/d_npc.h
@@ -299,4 +299,6 @@ bool dNpc_chkLetterPassed();
 bool dNpc_setAnm_2(mDoExt_McaMorf* pMorf, int loopMode, f32 morf, f32 speed, int animFileIdx, int soundFileIdx, const char* arcName);
 bool dNpc_chkAttn(fopAc_ac_c* i_this, cXyz destPos, f32 param_3, f32 param_4, f32 param_5, bool param_6);
 
+extern dCcD_SrcCyl dNpc_cyl_src;
+
 #endif /* D_NPC_H */
diff --git a/include/d/d_shop.h b/include/d/d_shop.h
index 6717bdf6f..522a40aaf 100644
--- a/include/d/d_shop.h
+++ b/include/d/d_shop.h
@@ -269,5 +269,14 @@ extern __shop_items_set_data* Item_set_data_bshop_5[];
 extern __shop_items_set_data* Item_set_data_bshop_6[];
 extern __shop_items_set_data** Item_set_data_tbl[];
 extern Vec* Item_set_pos_data_tbl[];
+extern Vec Item_set_pos_data_dshop[];
+extern Vec Item_set_pos_data_bmshop1[];
+extern Vec Item_set_pos_data_bmshop2[];
+extern Vec Item_set_pos_data_bshop_3[];
+extern Vec Item_set_pos_data_bshop_4[];
+extern Vec Item_set_pos_data_bshop_5[];
+extern Vec Item_set_pos_data_bshop_6[];
+extern Vec Item_set_pos_data_bshop_7[];
+extern Vec Item_set_pos_data_rshop_0[];
 
 #endif /* D_SHOP_H */
diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h
index e8b76454d..43aa0a9a7 100644
--- a/include/dolphin/gx/GX.h
+++ b/include/dolphin/gx/GX.h
@@ -4,17 +4,19 @@
 #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/GXEnum.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/GXInit.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/GXStruct.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"
 
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index 6449df505..aeb9e10d3 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -5,6 +5,11 @@
 #include "dolphin/mtx/mtx.h"
 
 bool mDoGph_Create();
+bool mDoGph_BeforeOfDraw();
+bool mDoGph_AfterOfDraw();
+bool mDoGph_Painter();
+void mDoGph_BlankingON();
+void mDoGph_BlankingOFF();
 
 struct ResTIMG;
 
diff --git a/src/JSystem/J3DGraphAnimator/J3DModel.cpp b/src/JSystem/J3DGraphAnimator/J3DModel.cpp
index 6d69352a8..1bd00a120 100644
--- a/src/JSystem/J3DGraphAnimator/J3DModel.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DModel.cpp
@@ -594,8 +594,6 @@ void calcViewBaseMtx(MtxP viewMtx, const Vec& scale, const Mtx& baseMtx, MtxP ds
     MTXConcat(viewMtx, mtx, dstMtx);
 }
 
-extern void J3DPSMtxArrayConcat(Mtx, Mtx, Mtx, u32);
-
 /* 802EEBDC-802EEE30       .text calcDrawMtx__8J3DModelFv */
 void J3DModel::calcDrawMtx() {
     u16 i;
diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
index dd7ce2b97..5aca93a27 100644
--- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
+++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
@@ -16,13 +16,6 @@
 #include "dolphin/types.h"
 #include "string.h"
 
-extern bool isTexNoReg(void*);
-extern u16 getTexNoReg(void*);
-extern void loadTexNo(u32, const u16 &);
-
-extern void J3DGDSetTevColorS10(GXTevRegID, GXColorS10);
-extern void J3DGDSetTevKColor(GXTevKColorID, GXColor);
-
 int SizeOfLoadMatColors = 13;
 int SizeOfLoadAmbColors = 13;
 int SizeOfLoadColorChans = 21;
@@ -1347,8 +1340,6 @@ void J3DTevBlock16::diffTexCoordScale() {
     }
 }
 
-extern void patchTexNo_PtrToIdx(u32 texID, const u16& idx);
-
 /* 802E603C-802E6120       .text ptrToIndex__13J3DTevBlock16Fv */
 void J3DTevBlock16::ptrToIndex() {
     GDSetCurrOffset(mTexNoOffset);
diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp
index e21ba6efd..3f369181b 100644
--- a/src/JSystem/J3DGraphBase/J3DShape.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShape.cpp
@@ -9,14 +9,11 @@
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
+#include "JSystem/J3DGraphBase/J3DGD.h"
 #include "dolphin/gd/GDBase.h"
 #include "dolphin/gd/GDGeometry.h"
 #include "dolphin/types.h"
 
-extern void J3DGDSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList *, bool);
-extern void J3DFifoLoadPosMtxImm(Mtx, u32);
-extern void J3DFifoLoadNrmMtxImm(Mtx, u32);
-
 /* 802DD18C-802DD1FC       .text initialize__8J3DShapeFv */
 void J3DShape::initialize() {
     mMaterial = NULL;
diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
index 8d034a89f..c2b56977f 100644
--- a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
@@ -14,10 +14,6 @@
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
 
-extern void J3DFifoLoadNrmMtxImm(Mtx, u32);
-extern void J3DFifoLoadNrmMtxImm3x3(Mtx33, u32);
-extern void J3DFifoLoadPosMtxImm(Mtx, u32);
-
 u32 J3DShapeMtx::sCurrentPipeline;
 
 /* 802DB9D8-802DBA1C       .text loadMtxIndx_PNGP__11J3DShapeMtxCFiUs */
diff --git a/src/JSystem/J3DGraphBase/J3DSys.cpp b/src/JSystem/J3DGraphBase/J3DSys.cpp
index ac0154033..e76222dbe 100644
--- a/src/JSystem/J3DGraphBase/J3DSys.cpp
+++ b/src/JSystem/J3DGraphBase/J3DSys.cpp
@@ -8,15 +8,10 @@
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DGD.h"
 #include "JSystem/J3DGraphBase/J3DTevs.h"
+#include "JSystem/JRenderer/JRenderer.h"
 #include "dolphin/os/OS.h"
 #include "global.h"
 
-extern void JRNLoadTexCached(GXTexMapID, u32, GXTexCacheSize, u32, GXTexCacheSize);
-extern void makeTexCoordTable();
-extern void makeAlphaCmpTable();
-extern void makeZModeTable();
-extern void makeTevSwapTable();
-
 /* 802D8AA8-802D8B8C       .text __ct__6J3DSysFv */
 J3DSys::J3DSys() {
     makeTexCoordTable();
diff --git a/src/JSystem/JRenderer/JRenderer.cpp b/src/JSystem/JRenderer/JRenderer.cpp
index ba9162f59..343632cbf 100644
--- a/src/JSystem/JRenderer/JRenderer.cpp
+++ b/src/JSystem/JRenderer/JRenderer.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
+#include "JSystem/JRenderer/JRenderer.h"
 #include "dolphin/gx/GX.h"
 #include "JSystem/J3DGraphBase/J3DGD.h"
 
diff --git a/src/SSystem/SComponent/c_API.cpp b/src/SSystem/SComponent/c_API.cpp
index 2f8f5e8ae..ea346096a 100644
--- a/src/SSystem/SComponent/c_API.cpp
+++ b/src/SSystem/SComponent/c_API.cpp
@@ -1,15 +1,13 @@
 #include "SSystem/SComponent/c_API.h"
 #include "dolphin/types.h"
-
-extern u8 g_mDoGph_graphicInfo;
-extern bool mDoGph_Create();
-extern bool mDoGph_BeforeOfDraw();
-extern bool mDoGph_AfterOfDraw();
-extern bool mDoGph_Painter();
-extern bool mDoGph_BlankingON();
-extern bool mDoGph_BlankingOFF();
+#include "m_Do/m_Do_graphic.h"
 
 cAPIGph__Iface g_cAPI_Interface = {
-    &g_mDoGph_graphicInfo, mDoGph_Create,     mDoGph_BeforeOfDraw, mDoGph_AfterOfDraw,
-    mDoGph_Painter,        mDoGph_BlankingON, mDoGph_BlankingOFF,
+    /* mpGInfo        */ &g_mDoGph_graphicInfo,
+    /* mpCreate       */ (cAPIGph_Mthd)mDoGph_Create,
+    /* mpBeforeOfDraw */ (cAPIGph_Mthd)mDoGph_BeforeOfDraw,
+    /* mpAfterOfDraw  */ (cAPIGph_Mthd)mDoGph_AfterOfDraw,
+    /* mpPainter      */ (cAPIGph_Mthd)mDoGph_Painter,
+    /* mpBlankingOn   */ (cAPIGph_Mthd)mDoGph_BlankingON,
+    /* mpBlankingOff  */ (cAPIGph_Mthd)mDoGph_BlankingOFF,
 };
diff --git a/src/SSystem/SComponent/c_angle.cpp b/src/SSystem/SComponent/c_angle.cpp
index 0e7ebcb84..c320be5eb 100644
--- a/src/SSystem/SComponent/c_angle.cpp
+++ b/src/SSystem/SComponent/c_angle.cpp
@@ -4,10 +4,9 @@
 //
 
 #include "SSystem/SComponent/c_angle.h"
+#include "SSystem/SComponent/c_math.h"
 #include "dolphin/types.h"
 
-extern f32 cM_atan2f(f32, f32);
-
 const cSAngle cSAngle::_0(static_cast<s16>(0));
 const cSAngle cSAngle::_1(static_cast<s16>(0xb6));
 const cSAngle cSAngle::_90(static_cast<s16>(0x4000));
diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp
index f32963c8d..c60173b24 100644
--- a/src/d/actor/d_a_agb.cpp
+++ b/src/d/actor/d_a_agb.cpp
@@ -5,6 +5,7 @@
 
 #include "d/dolzel.h" // IWYU pragma: keep
 #include "d/actor/d_a_agb.h"
+#include "d/d_msg.h"
 #include "d/res/res_agb.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
@@ -384,8 +385,6 @@ int daAgb_c::uploadPortCheckWait() {
     return 1;
 }
 
-extern JKRHeap* dMsg_getAgbWorkArea();
-
 /* 800CFB68-800CFC94       .text uploadSelect__7daAgb_cFv */
 int daAgb_c::uploadSelect() {
     if (l_msgCtrl.execute() == fopMsgStts_MSG_DISPLAYED_e) {
diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp
index bb7917e34..28d568361 100644
--- a/src/d/actor/d_a_auction.cpp
+++ b/src/d/actor/d_a_auction.cpp
@@ -13,6 +13,7 @@
 #include "d/d_priority.h"
 #include "d/res/res_pspl.h"
 #include "m_Do/m_Do_controller_pad.h"
+#include "d/d_auction_screen.h"
 
 struct NpcDatStruct {
     /* 0x00 */ f32 field_0x00;
@@ -187,17 +188,6 @@ static daAuction_c::ProcFunc_t moveProc[] = {
     &daAuction_c::executeStart,
 };
 
-extern void dAuction_screen_delete();
-extern void dAuction_screen_slotShow();
-extern void dAuction_screen_slotHide();
-extern void dAuction_screen_gaugeHide();
-extern void dAuction_screen_gaugeShow();
-extern void dAuction_screen_gaugeUp();
-extern void dAuction_screen_gaugeDown();
-extern void dAuction_screen_talkStart();
-extern void dAuction_screen_talkEnd();
-extern fpc_ProcID dAuction_screen_create();
-
 /* 000000EC-000002FC       .text __ct__11daAuction_cFv */
 daAuction_c::daAuction_c() {
     for (int i = 0; i < 8; i++) {
diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp
index d7579039b..680dc1063 100644
--- a/src/d/actor/d_a_npc_hi1.cpp
+++ b/src/d/actor/d_a_npc_hi1.cpp
@@ -9,8 +9,6 @@
 #include "d/d_priority.h"
 #include "d/res/res_hi.h"
 
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 class daNpc_Hi1_HIO_c : public mDoHIO_entry_c{
 public:
     struct hio_prm_c {
diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp
index 2d9d13f16..258814423 100644
--- a/src/d/actor/d_a_npc_km1.cpp
+++ b/src/d/actor/d_a_npc_km1.cpp
@@ -92,8 +92,6 @@ static BOOL nodeCallBack_Km(J3DNode* i_node, int i_calcTiming) {
     return TRUE;
  }
 
-
-extern dCcD_SrcCyl dNpc_cyl_src;
 /* 0000032C-0000043C       .text createInit__11daNpc_Km1_cFv */
 bool daNpc_Km1_c::createInit() {
     mEventCut.setActorInfo2("Km1", this);
diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp
index e8248827b..c32a010be 100644
--- a/src/d/actor/d_a_npc_ls1.cpp
+++ b/src/d/actor/d_a_npc_ls1.cpp
@@ -282,7 +282,6 @@ bool daNpc_Ls1_c::init_LS1_4() {
     return init_LS1_1();
 }
 
-extern dCcD_SrcCyl dNpc_cyl_src;
 /* 00000A60-00000C6C       .text createInit__11daNpc_Ls1_cFv */
 bool daNpc_Ls1_c::createInit() {
     for (int i = 0; i < ARRAY_SSIZE(mEventIDTbl); i++) {
diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp
index cb9880a26..69a7a1df7 100644
--- a/src/d/actor/d_a_npc_people.cpp
+++ b/src/d/actor/d_a_npc_people.cpp
@@ -20,8 +20,6 @@
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_lib.h"
 
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 static char* l_npc_staff_id[] = {
     "Uo1",
     "Uo2",
diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp
index b2bced6d0..c9e2452d4 100644
--- a/src/d/actor/d_a_npc_photo.cpp
+++ b/src/d/actor/d_a_npc_photo.cpp
@@ -19,11 +19,8 @@
 #include "d/d_picture_box.h"
 #include "d/actor/d_a_tag_photo.h"
 
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 const char daNpcPhoto_c::m_arcname[] = "Auc";
 
-
 static const char* l_arcname_tbl[] = {
     "Po"
 };
diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp
index 117d8894c..e27f63e63 100644
--- a/src/d/actor/d_a_npc_roten.cpp
+++ b/src/d/actor/d_a_npc_roten.cpp
@@ -16,8 +16,6 @@
 #include "d/d_a_obj.h"
 #include "d/d_snap.h"
 
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 static const char* l_arcname_tbl[] = {
     "Ro",
     "Ro",
diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp
index e25e8a174..8d7be6054 100644
--- a/src/d/actor/d_a_npc_rsh1.cpp
+++ b/src/d/actor/d_a_npc_rsh1.cpp
@@ -1015,7 +1015,6 @@ static BOOL daNpc_Rsh1_checkRotenItemGet(int i_itemNo) {
     return roten_item_get_check;
 }
 
-extern Vec Item_set_pos_data_rshop_0[];
 /* 000023A8-00002568       .text createShopList__12daNpc_Rsh1_cFv */
 void daNpc_Rsh1_c::createShopList() {
     csXyz temp(0, home.angle.y, 0);
diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp
index cff7802b4..a1e5cf26a 100644
--- a/src/d/actor/d_a_npc_tc.cpp
+++ b/src/d/actor/d_a_npc_tc.cpp
@@ -978,7 +978,6 @@ void daNpc_Tc_c::getArg() {
     mType = TYPE_NORMAL;
 }
 
-extern dCcD_SrcCyl dNpc_cyl_src;
 /* 00001C98-0000202C       .text createInit__10daNpc_Tc_cFv */
 void daNpc_Tc_c::createInit() {
 #if VERSION > VERSION_DEMO
diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp
index 8a88563ad..7a01db940 100644
--- a/src/d/actor/d_a_npc_zl1.cpp
+++ b/src/d/actor/d_a_npc_zl1.cpp
@@ -17,9 +17,6 @@
 #include "d/res/res_zl.h"
 #include "d/d_snap.h"
 
-
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 class daNpc_Zl1_HIO_c : public mDoHIO_entry_c{
 public:
 struct hio_prm_c {
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 27ab5b3c1..25b18f3c5 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -36,8 +36,6 @@ public:
     /* 0x16 */ s16 field_0x16;
 };
 
-extern dScnPly_reg_HIO_c g_regHIO;
-
 const char daObjTpost_c::m_arc_name[] = "Toripost";
 
 const daObjTpost_c__letter_data daObjTpost_c::m_letter[] = {
diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp
index 9d6319a6c..874c661cc 100644
--- a/src/d/actor/d_a_sea.cpp
+++ b/src/d/actor/d_a_sea.cpp
@@ -66,8 +66,6 @@ s8 pos_around[8][2] = {
     {-1,  1},  {-1,  0},
 };
 
-extern void dKy_usonami_set(f32 param_0);
-
 /* 8015B0A4-8015B0FC       .text Pos2Index__25daSea_WaterHeightInfo_MngFfPf */
 int daSea_WaterHeightInfo_Mng::Pos2Index(f32 v, f32* dst) {
     f32 f = 450000.0f;
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index 036af4223..6fbbb92a9 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -5,6 +5,7 @@
 
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 #include "d/actor/d_a_tbox.h"
+#include "d/d_npc.h"
 #include "d/res/res_dalways.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_s_acch.h"
@@ -31,8 +32,6 @@
 #define FUNC_TYPE_EXTRA_SAVE_INFO 7
 #define FUNC_TYPE_EXTRA_SAVE_INFO_SPAWN 8
 
-extern dCcD_SrcCyl dNpc_cyl_src;
-
 static daTbox_HIO_c l_HIO;
 
 static daTbox_c::modelInfo l_modelInfo[] = {