Remove unnecessary externs (#2705)

51 files changed, 9 insertions, 671 deletions

diff --git a/config/GZ2E01/splits.txt b/config/GZ2E01/splits.txt
index 92aa0d966d..a65b9ec21b 100644
--- a/config/GZ2E01/splits.txt
+++ b/config/GZ2E01/splits.txt
@@ -158,6 +158,7 @@ f_op/f_op_actor_tag.cpp:
 f_op/f_op_actor_mng.cpp:
 	.text       start:0x800198A4 end:0x8001E0D4
 	.text       start:0x8001E0D4 end:0x8001E11C
+	.text       start:0x8001E11C end:0x8001E140
 	.ctors      start:0x803737E8 end:0x803737EC
 	.rodata     start:0x80378880 end:0x80378A50
 	.data       start:0x803A35F0 end:0x803A3860
@@ -166,7 +167,7 @@ f_op/f_op_actor_mng.cpp:
 	.sdata2     start:0x80451C00 end:0x80451C68
 
 f_op/f_op_camera.cpp:
-	.text       start:0x8001E11C end:0x8001E308
+	.text       start:0x8001E140 end:0x8001E308
 	.data       start:0x803A3860 end:0x803A3878
 
 f_op/f_op_camera_mng.cpp:
diff --git a/include/JSystem/JSupport/JSURandomInputStream.h b/include/JSystem/JSupport/JSURandomInputStream.h
index efa4dc123b..3ba5b3cdb2 100644
--- a/include/JSystem/JSupport/JSURandomInputStream.h
+++ b/include/JSystem/JSupport/JSURandomInputStream.h
@@ -12,7 +12,9 @@ public:
     JSURandomInputStream() {}
     virtual ~JSURandomInputStream() {}
 
-    /* vt[3] */ virtual s32 getAvailable() const; /* override */
+    /* vt[3] */ virtual s32 getAvailable() const /* override */ {
+        return getLength() - getPosition();
+    }
     /* vt[4] */ virtual s32 skip(s32);            /* override */
     /* vt[5] */ virtual u32 readData(void*, s32) = 0;
     /* vt[6] */ virtual s32 getLength() const = 0;
diff --git a/include/SSystem/SComponent/c_m3d_g_sph.h b/include/SSystem/SComponent/c_m3d_g_sph.h
index 98cac29027..b8f868b8a5 100644
--- a/include/SSystem/SComponent/c_m3d_g_sph.h
+++ b/include/SSystem/SComponent/c_m3d_g_sph.h
@@ -46,9 +46,4 @@ public:
 
 STATIC_ASSERT(0x14 == sizeof(cM3dGSph));
 
-// additional symbols needed for cM3dGSph
-extern "C" {
-void Set__8cM3dGSphFRC4cXyzf(void);
-}
-
 #endif
diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/src/JSystem/J3DU/J3DUClipper.cpp
index f2def4875e..7a0891ae36 100644
--- a/src/JSystem/J3DU/J3DUClipper.cpp
+++ b/src/JSystem/J3DU/J3DUClipper.cpp
@@ -8,18 +8,6 @@
 #include "JSystem/J3DU/J3DUClipper.h"
 #include "math.h"
 
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 80273778-8027378C 26E0B8 0014+00 0/0 1/1 0/0 .text            init__11J3DUClipperFv */
 void J3DUClipper::init() {
     mNear = 1.0f;
diff --git a/src/JSystem/JAudio2/JAISoundHandles.cpp b/src/JSystem/JAudio2/JAISoundHandles.cpp
index a887c5935d..a8ebe2dd03 100644
--- a/src/JSystem/JAudio2/JAISoundHandles.cpp
+++ b/src/JSystem/JAudio2/JAISoundHandles.cpp
@@ -7,14 +7,6 @@
 
 #include "JSystem/JAudio2/JAISoundHandles.h"
 
-//
-// Forward References:
-//
-
-//
-// Declarations:
-//
-
 /* 802A2C98-802A2CF4 29D5D8 005C+00 0/0 1/1 0/0 .text
  * getHandleSoundID__15JAISoundHandlesF10JAISoundID             */
 JAISoundHandle* JAISoundHandles::getHandleSoundID(JAISoundID param_0) {
diff --git a/src/JSystem/JAudio2/JAISoundInfo.cpp b/src/JSystem/JAudio2/JAISoundInfo.cpp
index 6b0980c44c..05667fdead 100644
--- a/src/JSystem/JAudio2/JAISoundInfo.cpp
+++ b/src/JSystem/JAudio2/JAISoundInfo.cpp
@@ -7,20 +7,6 @@
 
 #include "JSystem/JAudio2/JAISoundInfo.h"
 
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-
 /* 802A2D34-802A2D50 29D674 001C+00 0/0 1/1 0/0 .text            __ct__12JAISoundInfoFb */
 JAISoundInfo::JAISoundInfo(bool param_0) : JASGlobalInstance<JAISoundInfo>(param_0) {
 }
diff --git a/src/JSystem/JAudio2/JASAudioReseter.cpp b/src/JSystem/JAudio2/JASAudioReseter.cpp
index 610c45a706..4c3082ab8e 100644
--- a/src/JSystem/JAudio2/JASAudioReseter.cpp
+++ b/src/JSystem/JAudio2/JASAudioReseter.cpp
@@ -11,10 +11,6 @@
 #include "JSystem/JAudio2/JASDriverIF.h"
 #include "dolphin/types.h"
 
-//
-// Types:
-//
-
 struct JASDSPChannel {
     /* 8029D340 */ void drop();
     /* 8029D948 */ static JASDSPChannel* getHandle(u32);
@@ -23,35 +19,6 @@ struct JASDSPChannel {
     u32 mStatus;
 };
 
-//
-// Forward References:
-//
-
-extern "C" void __ct__15JASAudioReseterFv();
-extern "C" void __dt__15JASAudioReseterFv();
-extern "C" void start__15JASAudioReseterFUlb();
-extern "C" void resume__15JASAudioReseterFv();
-extern "C" void checkDone__15JASAudioReseterCFv();
-extern "C" void calc__15JASAudioReseterFv();
-extern "C" void callback__15JASAudioReseterFPv();
-
-//
-// External References:
-//
-
-extern "C" void stop__14JASAudioThreadFv();
-extern "C" void drop__13JASDSPChannelFv();
-extern "C" void getHandle__13JASDSPChannelFUl();
-extern "C" void setDSPLevel__9JASDriverFf();
-extern "C" void getDSPLevel__9JASDriverFv();
-extern "C" void registerDspSyncCallback__9JASDriverFPFPv_lPv();
-extern "C" void __dl__FPv();
-extern "C" extern JASAudioThread* data_80450B8C;
-
-//
-// Declarations:
-//
-
 /* 8029D0B4-8029D0FC 2979F4 0048+00 0/0 1/1 0/0 .text            __ct__15JASAudioReseterFv */
 JASAudioReseter::JASAudioReseter() {
     field_0x0 = 0;
diff --git a/src/JSystem/JAudio2/JASCallback.cpp b/src/JSystem/JAudio2/JASCallback.cpp
index 80e9b9815c..18d29ce4f5 100644
--- a/src/JSystem/JAudio2/JASCallback.cpp
+++ b/src/JSystem/JAudio2/JASCallback.cpp
@@ -8,22 +8,6 @@
 #include "JSystem/JAudio2/JASCallback.h"
 #include "JSystem/JAudio2/JASCriticalSection.h"
 
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 8028FFA8-80290030 28A8E8 0088+00 0/0 2/2 0/0 .text            regist__14JASCallbackMgrFPFPv_lPv
  */
 bool JASCallbackMgr::regist(JASCallback* function, void* argument)
diff --git a/src/JSystem/JAudio2/JASDriverIF.cpp b/src/JSystem/JAudio2/JASDriverIF.cpp
index 564d81899b..744ab2caf3 100644
--- a/src/JSystem/JAudio2/JASDriverIF.cpp
+++ b/src/JSystem/JAudio2/JASDriverIF.cpp
@@ -10,10 +10,6 @@
 #include "JSystem/JAudio2/JASDSPInterface.h"
 #include <dolphin/os.h>
 
-//
-// Declarations:
-//
-
 /* 8029E130-8029E150 298A70 0020+00 0/0 3/3 0/0 .text            setDSPLevel__9JASDriverFf */
 void JASDriver::setDSPLevel(f32 param_0) {
     JASDsp::setDSPMixerLevel(param_0);
diff --git a/src/JSystem/JAudio2/JASDrumSet.cpp b/src/JSystem/JAudio2/JASDrumSet.cpp
index f76aec063b..2f8b5bff2b 100644
--- a/src/JSystem/JAudio2/JASDrumSet.cpp
+++ b/src/JSystem/JAudio2/JASDrumSet.cpp
@@ -9,22 +9,6 @@
 #include "JSystem/JAudio2/JASCalc.h"
 #include "JSystem/JKernel/JKRHeap.h"
 
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* ############################################################################################## */
 
 /* 802982EC-80298314 292C2C 0028+00 0/0 2/2 0/0 .text            __ct__10JASDrumSetFv */
diff --git a/src/JSystem/JAudio2/JASDvdThread.cpp b/src/JSystem/JAudio2/JASDvdThread.cpp
index 40840fc8f0..b5c31dbf4a 100644
--- a/src/JSystem/JAudio2/JASDvdThread.cpp
+++ b/src/JSystem/JAudio2/JASDvdThread.cpp
@@ -10,18 +10,6 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "dolphin/types.h"
 
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* ############################################################################################## */
 /* 80451208-80451210 000708 0004+04 2/1 0/0 0/0 .sbss            sThread__6JASDvd */
 JASTaskThread* JASDvd::sThread;
diff --git a/src/JSystem/JAudio2/JASLfo.cpp b/src/JSystem/JAudio2/JASLfo.cpp
index f1f9ba088f..d30edd5e55 100644
--- a/src/JSystem/JAudio2/JASLfo.cpp
+++ b/src/JSystem/JAudio2/JASLfo.cpp
@@ -8,22 +8,6 @@
 #include "JSystem/JAudio2/JASLfo.h"
 #include "SSystem/SComponent/c_math.h"
 
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* ############################################################################################## */
 
 /* 8029BD14-8029BD44 296654 0030+00 1/1 1/1 0/0 .text            __ct__6JASLfoFv */
diff --git a/src/JSystem/JAudio2/JASOscillator.cpp b/src/JSystem/JAudio2/JASOscillator.cpp
index 0a27f92f31..210510fcf7 100644
--- a/src/JSystem/JAudio2/JASOscillator.cpp
+++ b/src/JSystem/JAudio2/JASOscillator.cpp
@@ -7,24 +7,6 @@
 
 #include "JSystem/JAudio2/JASOscillator.h"
 
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-
 /* 8029BE94-8029BEC4 2967D4 0030+00 0/0 1/1 0/0 .text            __ct__13JASOscillatorFv */
 JASOscillator::JASOscillator() {
     mData = NULL;
diff --git a/src/JSystem/JAudio2/JASProbe.cpp b/src/JSystem/JAudio2/JASProbe.cpp
index a55710ed93..9b16b7b4ec 100644
--- a/src/JSystem/JAudio2/JASProbe.cpp
+++ b/src/JSystem/JAudio2/JASProbe.cpp
@@ -8,21 +8,6 @@
 #include "JSystem/JAudio2/JASProbe.h"
 #include "dolphin/os.h"
 
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
 /* 80290D74-80290DC4 28B6B4 0050+00 1/1 0/0 0/0 .text            start__8JASProbeFPCc */
 void JASProbe::start(char const* name) {
 	volatile BOOL interrupts = OSDisableInterrupts();
diff --git a/src/JSystem/JAudio2/JASRegisterParam.cpp b/src/JSystem/JAudio2/JASRegisterParam.cpp
index 12c1d43c9f..8a374df909 100644
--- a/src/JSystem/JAudio2/JASRegisterParam.cpp
+++ b/src/JSystem/JAudio2/JASRegisterParam.cpp
@@ -7,22 +7,6 @@
 
 #include "JSystem/JAudio2/JASRegisterParam.h"
 
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 80293644-80293664 28DF84 0020+00 0/0 1/1 0/0 .text            __ct__16JASRegisterParamFv */
 JASRegisterParam::JASRegisterParam() {
     for (int i = 0; i < 14; i++) {
diff --git a/src/JSystem/JAudio2/JASVoiceBank.cpp b/src/JSystem/JAudio2/JASVoiceBank.cpp
index 1bfae2332e..818532d908 100644
--- a/src/JSystem/JAudio2/JASVoiceBank.cpp
+++ b/src/JSystem/JAudio2/JASVoiceBank.cpp
@@ -8,10 +8,6 @@
 #include "JSystem/JAudio2/JASVoiceBank.h"
 #include "JSystem/JAudio2/JASBasicInst.h"
 
-//
-// Declarations:
-//
-
 /* ############################################################################################## */
 /* 8039B1B8-8039B1D0 027818 0018+00 1/1 0/0 0/0 .rodata          sOscData__12JASVoiceBank */
 const JASOscillator::Data JASVoiceBank::sOscData = {
diff --git a/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp b/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp
index 0f9f124ffe..8fe110382f 100644
--- a/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp
+++ b/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp
@@ -8,14 +8,6 @@
 #include "JSystem/JAudio2/JAUAudioArcInterpreter.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-//
-// Forward References:
-//
-
-//
-// Declarations:
-//
-
 /* 802A4244-802A4260 29EB84 001C+00 0/0 1/1 0/0 .text            __ct__22JAUAudioArcInterpreterFv */
 JAUAudioArcInterpreter::JAUAudioArcInterpreter() {
     mBase = NULL;
diff --git a/src/JSystem/JAudio2/JAUAudioArcLoader.cpp b/src/JSystem/JAudio2/JAUAudioArcLoader.cpp
index 1f5c629b92..116b4a6ce9 100644
--- a/src/JSystem/JAudio2/JAUAudioArcLoader.cpp
+++ b/src/JSystem/JAudio2/JAUAudioArcLoader.cpp
@@ -9,10 +9,6 @@
 #include "JSystem/JAudio2/JAISeMgr.h"
 #include "JSystem/JAudio2/JAUSectionHeap.h"
 
-//
-// Declarations:
-//
-
 /* 802A4740-802A478C 29F080 004C+00 0/0 1/1 0/0 .text __ct__17JAUAudioArcLoaderFP10JAUSection */
 JAUAudioArcLoader::JAUAudioArcLoader(JAUSection* section) {
     //JUT_ASSERT(13, section->isOpen());
diff --git a/src/JSystem/JAudio2/JAUSeqCollection.cpp b/src/JSystem/JAudio2/JAUSeqCollection.cpp
index 6d292f21c6..5316545061 100644
--- a/src/JSystem/JAudio2/JAUSeqCollection.cpp
+++ b/src/JSystem/JAudio2/JAUSeqCollection.cpp
@@ -8,22 +8,6 @@
 #include "JSystem/JAudio2/JAUSeqCollection.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 802A66A0-802A66AC 2A0FE0 000C+00 1/1 0/0 0/0 .text            __ct__16JAUSeqCollectionFv */
 JAUSeqCollection::JAUSeqCollection() {
     field_0x8 = NULL;
diff --git a/src/JSystem/JGadget/linklist.cpp b/src/JSystem/JGadget/linklist.cpp
index 901bcd979b..9f9efab470 100644
--- a/src/JSystem/JGadget/linklist.cpp
+++ b/src/JSystem/JGadget/linklist.cpp
@@ -18,37 +18,6 @@ private:
     const T* p_;
 };
 
-//
-// Forward References:
-//
-
-extern "C" void __dt__Q27JGadget13TNodeLinkListFv();
-extern "C" void erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iterator();
-extern "C" void
-erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorQ37JGadget13TNodeLinkList8iterator();
-extern "C" void
-splice__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorRQ27JGadget13TNodeLinkListQ37JGadget13TNodeLinkList8iterator();
-extern "C" void
-Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget13TLinkListNode();
-extern "C" void Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode();
-extern "C" void Remove__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode();
-
-//
-// External References:
-//
-
-extern "C" void __dl__FPv();
-extern "C" void _savegpr_27();
-extern "C" void _savegpr_28();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_27();
-extern "C" void _restgpr_28();
-extern "C" void _restgpr_29();
-
-//
-// Declarations:
-//
-
 /* 802DCA1C-802DCA58 2D735C 003C+00 1/1 6/6 0/0 .text            __dt__Q27JGadget13TNodeLinkListFv
  */
 JGadget::TNodeLinkList::~TNodeLinkList() {}
diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp
index 86cffdf18f..82c35479aa 100644
--- a/src/JSystem/JKernel/JKRAramStream.cpp
+++ b/src/JSystem/JKernel/JKRAramStream.cpp
@@ -225,9 +225,6 @@ JKRAramStreamCommand::JKRAramStreamCommand() {
     mAllocatedTransferBuffer = false;
 }
 
-/* 802D4094-802D40F0 2CE9D4 005C+00 0/0 3/0 0/0 .text getAvailable__20JSURandomInputStreamCFv */
-// s32 JSURandomInputStream::getAvailable() const {
-// should be an inline function
-extern "C" s32 getAvailable__20JSURandomInputStreamCFv(JSURandomInputStream* self) {
-    return self->getLength() - self->getPosition();
+static void dummy(JSURandomInputStream* stream) {
+    stream->getAvailable();
 }
diff --git a/src/JSystem/JMath/JMATrigonometric.cpp b/src/JSystem/JMath/JMATrigonometric.cpp
index df39e04295..6da6a60c19 100644
--- a/src/JSystem/JMath/JMATrigonometric.cpp
+++ b/src/JSystem/JMath/JMATrigonometric.cpp
@@ -73,10 +73,6 @@ struct TAsinAcosTable {
     }
 };
 
-//
-// Declarations:
-//
-
 namespace JMath {
 
 /* ############################################################################################## */
diff --git a/src/JSystem/JParticle/JPAEmitter.cpp b/src/JSystem/JParticle/JPAEmitter.cpp
index 3bc871f01b..ef34168adb 100644
--- a/src/JSystem/JParticle/JPAEmitter.cpp
+++ b/src/JSystem/JParticle/JPAEmitter.cpp
@@ -12,22 +12,6 @@
 #include "JSystem/JParticle/JPABaseShape.h"
 #include "dolphin/types.h"
 
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 8027E6A4-8027E6EC 278FE4 0048+00 0/0 14/14 16/16 .text            __dt__18JPAEmitterCallBackFv */
 JPAEmitterCallBack::~JPAEmitterCallBack() {
 }
diff --git a/src/JSystem/JParticle/JPAMath.cpp b/src/JSystem/JParticle/JPAMath.cpp
index 74bee7f689..4238c5db90 100644
--- a/src/JSystem/JParticle/JPAMath.cpp
+++ b/src/JSystem/JParticle/JPAMath.cpp
@@ -9,33 +9,6 @@
 #include "JSystem/JMath/JMATrigonometric.h"
 #include "JSystem/J2DGraph/J2DAnimation.h"
 
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-extern "C" void func_80280588();
-extern "C" void JPAGetYZRotateMtx__FssPA4_f();
-extern "C" void JPAGetXYZRotateMtx__FsssPA4_f();
-extern "C" void func_802807E0();
-extern "C" void func_80280808();
-extern "C" void JPACalcKeyAnmValue__FfUsPCf();
-
-//
-// External References:
-//
-
-extern "C" void _savegpr_28();
-extern "C" void _restgpr_28();
-extern "C" u8 sincosTable___5JMath[65536];
-
-//
-// Declarations:
-//
-
 /* ############################################################################################## */
 // Probably some local function needed to change float literal order
 static f32 floatDummyFunc() {
diff --git a/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp b/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp
index 470cf78766..5ba63e1e39 100644
--- a/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp
+++ b/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp
@@ -7,22 +7,6 @@
 
 #include "JSystem/JStudio/JStudio/fvb-data-parse.h"
 
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 802850AC-80285114 27F9EC 0068+00 0/0 1/1 0/0 .text
  * getData__Q47JStudio3fvb4data17TParse_TParagraphCFPQ57JStudio3fvb4data17TParse_TParagraph5TData */
 void JStudio::fvb::data::TParse_TParagraph::getData(TParse_TParagraph::TData* data) const
diff --git a/src/JSystem/JSupport/JSUInputStream.cpp b/src/JSystem/JSupport/JSUInputStream.cpp
index 9c3206fdc1..3fa8ca0a30 100644
--- a/src/JSystem/JSupport/JSUInputStream.cpp
+++ b/src/JSystem/JSupport/JSUInputStream.cpp
@@ -9,37 +9,6 @@
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include <dolphin.h>
 
-//
-// Forward References:
-//
-
-extern "C" void skip__20JSURandomInputStreamFl();
-
-//
-// External References:
-//
-
-extern "C" void __dt__20JSURandomInputStreamFv();
-extern "C" void getAvailable__20JSURandomInputStreamCFv();
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 803CC4B0-803CC4D4 0295D0 0024+00 0/0 7/7 0/0 .data            __vt__20JSURandomInputStream */
-extern void* __vt__20JSURandomInputStream[9] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)__dt__20JSURandomInputStreamFv,
-    (void*)getAvailable__20JSURandomInputStreamCFv,
-    (void*)skip__20JSURandomInputStreamFl,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-};
-
 /* 802DC23C-802DC298 2D6B7C 005C+00 1/0 6/6 0/0 .text            __dt__14JSUInputStreamFv */
 JSUInputStream::~JSUInputStream() {
     if (!isGood()) {
diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/src/JSystem/JUtility/JUTDirectFile.cpp
index ae296ed92e..487b858b22 100644
--- a/src/JSystem/JUtility/JUTDirectFile.cpp
+++ b/src/JSystem/JUtility/JUTDirectFile.cpp
@@ -10,18 +10,6 @@
 #include "global.h"
 #include <stdint.h>
 
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 802E8730-802E87F8 2E3070 00C8+00 1/1 0/0 0/0 .text            fetch32byte__13JUTDirectFileFv */
 int JUTDirectFile::fetch32byte() {
 	mToRead = mLength - ALIGN_PREV(mPos, DVD_MIN_TRANSFER_SIZE);
diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp
index e399107ecb..e7bb18daef 100644
--- a/src/JSystem/JUtility/JUTDirectPrint.cpp
+++ b/src/JSystem/JUtility/JUTDirectPrint.cpp
@@ -10,18 +10,6 @@
 #include <dolphin/os.h>
 #include "global.h"
 
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 80451528-80451530 000A28 0004+04 1/1 4/4 0/0 .sbss            sDirectPrint__14JUTDirectPrint */
 JUTDirectPrint* JUTDirectPrint::sDirectPrint;
 
diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp
index 0850f229ed..3859c0b1cc 100644
--- a/src/JSystem/JUtility/JUTXfb.cpp
+++ b/src/JSystem/JUtility/JUTXfb.cpp
@@ -9,40 +9,6 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "dolphin/gx.h"
 
-//
-// Forward References:
-//
-
-extern "C" void clearIndex__6JUTXfbFv();
-extern "C" void common_init__6JUTXfbFi();
-extern "C" void __ct__6JUTXfbFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumber();
-extern "C" void __dt__6JUTXfbFv();
-extern "C" void delXfb__6JUTXfbFi();
-extern "C" void createManager__6JUTXfbFP7JKRHeapQ26JUTXfb10EXfbNumber();
-extern "C" void destroyManager__6JUTXfbFv();
-extern "C" void initiate__6JUTXfbFUsUsP7JKRHeapQ26JUTXfb10EXfbNumber();
-extern "C" u8 sManager__6JUTXfb[4 + 4 /* padding */];
-
-//
-// External References:
-//
-
-extern "C" void* __nw__FUl();
-extern "C" void* __nwa__FUlP7JKRHeapi();
-extern "C" void __dl__FPv();
-extern "C" void _savegpr_27();
-extern "C" void _savegpr_28();
-extern "C" void _savegpr_29();
-extern "C" void _restgpr_27();
-extern "C" void _restgpr_28();
-extern "C" void _restgpr_29();
-extern "C" u8 sSystemHeap__7JKRHeap[4];
-extern "C" u8 sManager__8JUTVideo[4];
-
-//
-// Declarations:
-//
-
 void JUTXfb::clearIndex() {
     mDrawingXfbIndex = -1;
     mDrawnXfbIndex = -1;
diff --git a/src/Z2AudioLib/Z2Calc.cpp b/src/Z2AudioLib/Z2Calc.cpp
index ba2d32a19c..eb12401057 100644
--- a/src/Z2AudioLib/Z2Calc.cpp
+++ b/src/Z2AudioLib/Z2Calc.cpp
@@ -8,10 +8,6 @@
 #include "math.h"
 #include "dol2asm.h"
 
-//
-// Declarations:
-//
-
 /* 802A968C-802A96F4 2A3FCC 0068+00 1/1 16/16 0/0 .text            linearTransform__6Z2CalcFfffffb
  */
 f32 Z2Calc::linearTransform(f32 param1, f32 param2, f32 param3, f32 param4, f32 param5,
diff --git a/src/d/actor/d_a_tag_attack_item.cpp b/src/d/actor/d_a_tag_attack_item.cpp
index 1e8e8a71e3..ca2f515c16 100644
--- a/src/d/actor/d_a_tag_attack_item.cpp
+++ b/src/d/actor/d_a_tag_attack_item.cpp
@@ -12,9 +12,6 @@
 #include "d/d_event_lib.h"
 #include "dol2asm.h"
 
-//
-// Types:
-//
 
 // need to figure out how to use dEvLib_callback_c properly
 class daTagAtkItem_c : public fopAc_ac_c , public dEvLib_callback_c {
diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp
index d7c4e74b31..5955a338aa 100644
--- a/src/d/actor/d_a_tag_river_back.cpp
+++ b/src/d/actor/d_a_tag_river_back.cpp
@@ -8,18 +8,6 @@
 #include "d/actor/d_a_tag_river_back.h"
 #include "d/d_procname.h"
 
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 80D5F9A0-80D5F9A4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "RvBack";
 
diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp
index 6568d41ad2..8e4d66bbe4 100644
--- a/src/d/actor/d_a_talk.cpp
+++ b/src/d/actor/d_a_talk.cpp
@@ -9,18 +9,6 @@
 #include "d/d_msg_object.h"
 #include "f_op/f_op_msg_mng.h"
 
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 80D66378-80D663E4 000078 006C+00 1/1 0/0 0/0 .text            __dt__8daTalk_cFv */
 daTalk_c::~daTalk_c() {
     dMsgObject_getMsgObjectClass()->setProcessID(-1);
diff --git a/src/d/d_file_sel_warning.cpp b/src/d/d_file_sel_warning.cpp
index b75b9bd374..078646002a 100644
--- a/src/d/d_file_sel_warning.cpp
+++ b/src/d/d_file_sel_warning.cpp
@@ -18,58 +18,6 @@
 #include "d/d_com_inf_game.h"
 #include "dol2asm.h"
 
-//
-// Forward References:
-//
-
-extern "C" void __ct__15dFile_warning_cFP10JKRArchiveUc();
-extern "C" void __dt__15dFile_warning_cFv();
-extern "C" void screenSet__15dFile_warning_cFv();
-extern "C" void _move__15dFile_warning_cFv();
-extern "C" void modeWait__15dFile_warning_cFv();
-extern "C" void modeMove__15dFile_warning_cFv();
-extern "C" void baseMoveAnm__15dFile_warning_cFv();
-extern "C" void openInit__15dFile_warning_cFv();
-extern "C" void closeInit__15dFile_warning_cFv();
-extern "C" void init__15dFile_warning_cFv();
-extern "C" void _draw__15dFile_warning_cFv();
-extern "C" void drawSelf__15dFile_warning_cFv();
-extern "C" void setText__15dFile_warning_cFUl();
-extern "C" void setFontColor__15dFile_warning_cFQ28JUtility6TColorQ28JUtility6TColor();
-extern "C" void setBlackWhite__10J2DTextBoxFQ28JUtility6TColorQ28JUtility6TColor();
-extern "C" void draw__16dDlst_FileWarn_cFv();
-extern "C" void __sinit_d_file_sel_warning_cpp();
-extern "C" void __dt__16dDlst_FileWarn_cFv();
-extern "C" void setAnimation__9J2DScreenFP15J2DAnmTransform();
-extern "C" extern char const* const d_file_d_file_sel_warning__stringBase0;
-
-//
-// External References:
-//
-
-extern "C" void mDoExt_getMesgFont__Fv();
-extern "C" void mDoExt_removeMesgFont__Fv();
-extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c();
-extern "C" void __ct__12dMsgString_cFv();
-extern "C" void __dt__12dMsgString_cFv();
-extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap();
-extern "C" void* __nw__FUl();
-extern "C" void __dl__FPv();
-extern "C" void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader();
-extern "C" void setAnimation__7J2DPaneFP15J2DAnmTransform();
-extern "C" void __ct__9J2DScreenFv();
-extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive();
-extern "C" void draw__9J2DScreenFffPC14J2DGrafContext();
-extern "C" void animation__9J2DScreenFv();
-extern "C" void setString__10J2DTextBoxFsPCce();
-extern "C" void load__20J2DAnmLoaderDataBaseFPCv();
-extern "C" void __ptmf_scall();
-extern "C" extern void* __vt__12dDlst_base_c[3];
-
-//
-// Declarations:
-//
-
 /* 803BB434-803BB44C 018554 0018+00 1/2 0/0 0/0 .data            fileWarningProc */
 typedef void (dFile_warning_c::*procFunc)();
 static procFunc fileWarningProc[] = {&dFile_warning_c::modeWait, &dFile_warning_c::modeMove};
@@ -241,12 +189,6 @@ void dFile_warning_c::setFontColor(JUtility::TColor param_0, JUtility::TColor pa
                              JUtility::TColor(255, 255, 255, 255));
 }
 
-/* 8019230C-80192354 18CC4C 0048+00 0/0 1/0 0/0 .text
- * setBlackWhite__10J2DTextBoxFQ28JUtility6TColorQ28JUtility6TColor */
-/* bool J2DTextBox::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
-    // NONMATCHING
-} */
-
 /* 80192354-8019238C 18CC94 0038+00 1/0 0/0 0/0 .text            draw__16dDlst_FileWarn_cFv */
 void dDlst_FileWarn_c::draw() {
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
diff --git a/src/d/d_kankyo_data.cpp b/src/d/d_kankyo_data.cpp
index 2c26769514..0c18732fd9 100644
--- a/src/d/d_kankyo_data.cpp
+++ b/src/d/d_kankyo_data.cpp
@@ -8,24 +8,12 @@
 #include "d/d_kankyo_data.h"
 #include "d/d_stage.h"
 
-//
-// Types:
-//
-
 // Invented name. TODO: this should be renamed and probably moved to the header
 // file once l_vr_box_data is looked into more.
 struct dKyd_l_vr_box_data_struct {
     u8 data[21];
 };
 
-//
-// Forward References:
-//
-
-//
-// Declarations:
-//
-
 /* 803A8E98-803A9198 005FB8 0300+00 1/1 0/0 0/0 .data            l_kydata_BloomInf_tbl */
 static dKydata_BloomInfo_c l_kydata_BloomInf_tbl[BLOOMINFO_MAX] = {
     {BLOOM_SOFT, 0xFF, 0x40, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00},
diff --git a/src/d/d_menu_fmap_map.cpp b/src/d/d_menu_fmap_map.cpp
index 30b2b31f3d..e3951f105e 100644
--- a/src/d/d_menu_fmap_map.cpp
+++ b/src/d/d_menu_fmap_map.cpp
@@ -369,9 +369,6 @@ void dMenu_FmapMap_c::setPointColor(f32 i_param) {
     }
 }
 
-extern void* __vt__15dMenu_FmapMap_c[26];
-extern void* __vt__15renderingFmap_c[26];
-
 /* 801CEC24-801CED38 1C9564 0114+00 0/0 1/1 0/0 .text            __ct__15dMenu_FmapMap_cFv */
 dMenu_FmapMap_c::dMenu_FmapMap_c() {
     mResTIMG = NULL;
diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp
index a46bba3162..de952695cd 100644
--- a/src/d/d_meter_button.cpp
+++ b/src/d/d_meter_button.cpp
@@ -23,8 +23,6 @@
 #define STR_BUF_LEN 512
 #endif
 
-extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c;
-
 /* 80201328-80201370 1FBC68 0048+00 0/0 1/1 1/1 .text            __ct__14dMeterButton_cFv */
 dMeterButton_c::dMeterButton_c() {
     _create();
diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp
index 146eca8478..74d1f31d4a 100644
--- a/src/d/d_model.cpp
+++ b/src/d/d_model.cpp
@@ -10,18 +10,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "d/d_com_inf_game.h"
 
-//
-// Forward References:
-//
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 8009C4FC-8009C650 096E3C 0154+00 1/0 0/0 0/0 .text            draw__6dMdl_cFv */
 void dMdl_c::draw() {
     j3dSys.setVtxPos(mpModelData->getVtxPosArray());
diff --git a/src/d/d_msg_out_font.cpp b/src/d/d_msg_out_font.cpp
index c01b59839e..eef5d7b7a6 100644
--- a/src/d/d_msg_out_font.cpp
+++ b/src/d/d_msg_out_font.cpp
@@ -7,8 +7,6 @@
 #include "d/d_msg_object.h"
 #include "f_op/f_op_msg_mng.h"
 
-extern dMsgObject_HIO_c g_MsgObject_HIO_c;
-
 /* 80225BB8-80225BF4 2204F8 003C+00 1/1 0/0 0/0 .text            __ct__13COutFontSet_cFv */
 COutFontSet_c::COutFontSet_c() {
     initialize();
diff --git a/src/d/d_msg_scrn_boss.cpp b/src/d/d_msg_scrn_boss.cpp
index d53012ed60..2f7c1e767c 100644
--- a/src/d/d_msg_scrn_boss.cpp
+++ b/src/d/d_msg_scrn_boss.cpp
@@ -6,8 +6,6 @@
 #include "d/d_msg_object.h"
 #include "d/d_pane_class.h"
 
-extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c;
-
 /* 8023C5C8-8023C928 236F08 0360+00 0/0 1/1 0/0 .text            __ct__14dMsgScrnBoss_cFv */
 dMsgScrnBoss_c::dMsgScrnBoss_c() {
     static u64 t_tag[7] = {
diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp
index 4acacb5e88..ee5a7badc3 100644
--- a/src/d/d_msg_scrn_explain.cpp
+++ b/src/d/d_msg_scrn_explain.cpp
@@ -19,8 +19,6 @@
 #define STR_BUF_LEN 512
 #endif
 
-extern dMsgObject_HIO_c g_MsgObject_HIO_c;
-
 static dMsgScrnExplain_c::ProcFunc init_process[] = {
     &dMsgScrnExplain_c::wait_init,        &dMsgScrnExplain_c::open_request_init,
     &dMsgScrnExplain_c::open_init,        &dMsgScrnExplain_c::move_init,
@@ -171,8 +169,8 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool param_
         ResTIMG* texResource =
             (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti");
         mpBackTex = new J2DPicture(texResource);
-        mpBackTex->setBlackWhite(JUtility::TColor::TColor(0, 0, 0, 0),
-                                 JUtility::TColor::TColor(0, 0, 0, 0xff));
+        mpBackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0),
+                                 JUtility::TColor(0, 0, 0, 0xff));
         mpBackTex->setAlpha(0);
     } else {
         mpBackTex = NULL;
diff --git a/src/d/d_msg_scrn_jimaku.cpp b/src/d/d_msg_scrn_jimaku.cpp
index 19008daac4..0344e05143 100644
--- a/src/d/d_msg_scrn_jimaku.cpp
+++ b/src/d/d_msg_scrn_jimaku.cpp
@@ -14,8 +14,6 @@
 #include "d/d_msg_scrn_light.h"
 #include "d/d_pane_class.h"
 
-extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c;
-
 /* 80244558-80244A74 23EE98 051C+00 0/0 1/1 0/0 .text __ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap */
 dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) {
     if (i_heap != NULL) {
diff --git a/src/d/d_msg_scrn_kanban.cpp b/src/d/d_msg_scrn_kanban.cpp
index a30d2f0b07..20b5675b97 100644
--- a/src/d/d_msg_scrn_kanban.cpp
+++ b/src/d/d_msg_scrn_kanban.cpp
@@ -13,8 +13,6 @@
 #include "d/d_msg_out_font.h"
 #include "d/d_pane_class.h"
 
-extern dMsgObject_HIO_c g_MsgObject_HIO_c;
-
 /* 80244E38-8024534C 23F778 0514+00 0/0 1/1 0/0 .text __ct__16dMsgScrnKanban_cFP10JKRExpHeap */
 dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) {
     if (param_0 != NULL) {
diff --git a/src/d/d_msg_scrn_place.cpp b/src/d/d_msg_scrn_place.cpp
index 72d44bb407..166ee93f88 100644
--- a/src/d/d_msg_scrn_place.cpp
+++ b/src/d/d_msg_scrn_place.cpp
@@ -12,8 +12,6 @@
 #include "d/d_msg_object.h"
 #include "d/d_pane_class.h"
 
-extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c;
-
 /* 802463CC-802467C4 240D0C 03F8+00 0/0 1/1 0/0 .text            __ct__15dMsgScrnPlace_cFv */
 dMsgScrnPlace_c::dMsgScrnPlace_c() {
     static u64 t_tag[7] = {
diff --git a/src/d/d_msg_scrn_staff.cpp b/src/d/d_msg_scrn_staff.cpp
index 384cbb17c1..e5c1c8aab3 100644
--- a/src/d/d_msg_scrn_staff.cpp
+++ b/src/d/d_msg_scrn_staff.cpp
@@ -11,8 +11,6 @@
 #include "d/d_msg_object.h"
 #include "d/d_pane_class.h"
 
-extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c;
-
 /* 803C1340-803C1370 01E460 0030+00 1/1 0/0 0/0 .data            t_tag$3752 */
 static u64 t_tag[6] = {
     'right_s', 'right', 'center_s', 'center', 'left_s', 'left',
diff --git a/src/d/d_msg_scrn_tree.cpp b/src/d/d_msg_scrn_tree.cpp
index c23e503a81..e342488816 100644
--- a/src/d/d_msg_scrn_tree.cpp
+++ b/src/d/d_msg_scrn_tree.cpp
@@ -9,8 +9,6 @@
 #include "d/d_msg_out_font.h"
 #include "d/d_pane_class.h"
 
-extern dMsgObject_HIO_c g_MsgObject_HIO_c;
-
 /* 80248954-80248F14 243294 05C0+00 0/0 1/1 0/0 .text
  * __ct__14dMsgScrnTree_cFP7JUTFontP10JKRExpHeap                */
 dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) {
diff --git a/src/d/d_msg_string.cpp b/src/d/d_msg_string.cpp
index c07d97ad88..5c3724290a 100644
--- a/src/d/d_msg_string.cpp
+++ b/src/d/d_msg_string.cpp
@@ -10,50 +10,6 @@
 #include "d/d_msg_out_font.h"
 #include "dol2asm.h"
 
-//
-// Forward References:
-//
-
-extern "C" void __ct__12dMsgString_cFv();
-extern "C" void __ct__12dMsgString_cFUc();
-extern "C" void __dt__12dMsgString_cFv();
-extern "C" void resetStringLocal__12dMsgString_cFP10J2DTextBox();
-extern "C" void drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf();
-extern "C" void drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc();
-
-//
-// External References:
-//
-
-extern "C" void getString__12dMsgString_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc();
-extern "C" void
-getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc();
-extern "C" void __ct__10COutFont_cFUc();
-extern "C" void __ct__16dMsgStringBase_cFv();
-extern "C" void __dt__16dMsgStringBase_cFv();
-extern "C" void getResource__16dMsgStringBase_cFv();
-extern "C" void getMessage__16dMsgStringBase_cFUlPc();
-extern "C" void* __nw__FUl();
-extern "C" void __dl__FPv();
-extern "C" void getGlbVtx__7J2DPaneCFUc();
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 803C1498-803C14B8 01E5B8 0020+00 3/3 0/0 0/0 .data            __vt__12dMsgString_c */
-SECTION_DATA extern void* __vt__12dMsgString_c[8] = {
-    (void*)NULL /* RTTI */,
-    (void*)NULL,
-    (void*)getString__12dMsgString_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc,
-    (void*)getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc,
-    (void*)getMessage__16dMsgStringBase_cFUlPc,
-    (void*)resetStringLocal__12dMsgString_cFP10J2DTextBox,
-    (void*)drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf,
-    (void*)drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc,
-};
-
 /* 80249C20-80249CA0 244560 0080+00 0/0 15/15 0/0 .text            __ct__12dMsgString_cFv */
 dMsgString_c::dMsgString_c() {
     field_0x28 = 0;
diff --git a/src/d/d_save_HIO.cpp b/src/d/d_save_HIO.cpp
index 98a8bb4923..59b9029ec3 100644
--- a/src/d/d_save_HIO.cpp
+++ b/src/d/d_save_HIO.cpp
@@ -8,14 +8,6 @@
 #include "d/d_save_HIO.h"
 #include "d/d_com_inf_game.h"
 
-//
-// Forward References:
-//
-
-//
-// Declarations:
-//
-
 /* 8025BB78-8025BBAC 2564B8 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childSwPerfectionHIO_cFv */
 dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() {
     for (int i = 0; i < 0x80; i++) {
diff --git a/src/d/d_simple_model.cpp b/src/d/d_simple_model.cpp
index a39b750797..c7a25d53e5 100644
--- a/src/d/d_simple_model.cpp
+++ b/src/d/d_simple_model.cpp
@@ -8,14 +8,6 @@
 #include "d/d_simple_model.h"
 #include "d/d_com_inf_game.h"
 
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 80048C54-80048CB4 043594 0060+00 1/1 0/0 0/0 .text            dSmplMdl_modelUpdateDL__FP8J3DModel
  */
 static void dSmplMdl_modelUpdateDL(J3DModel* i_model) {
diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp
index fe2ebbca81..66f7d7c9cb 100644
--- a/src/f_op/f_op_camera.cpp
+++ b/src/f_op/f_op_camera.cpp
@@ -9,39 +9,6 @@
 #include "d/d_s_play.h"
 #include "f_op/f_op_draw_tag.h"
 
-// TODO: this is a hack to get f_op_actor_mng.cpp weak function order correct
-// at the moment, if these are made into inlined virtuals, they incorrectly generate before thunks
-
-/* 8001E11C-8001E120 018A5C 0004+00 0/0 1/0 0/0 .text            onFrollCrashFlg__9daPy_py_cFUci */
-// void daPy_py_c::onFrollCrashFlg(u8 param_0, int param_1) {
-extern "C" void onFrollCrashFlg__9daPy_py_cFUci() {
-    /* empty function */
-}
-
-/* 8001E120-8001E128 018A60 0008+00 0/0 1/0 0/0 .text            checkWolfDash__9daPy_py_cCFv */
-// int daPy_py_c::checkWolfDash() const {
-extern "C" int checkWolfDash__9daPy_py_cCFv() {
-    return false;
-}
-
-/* 8001E128-8001E130 018A68 0008+00 0/0 1/0 0/0 .text            checkFrontRoll__9daPy_py_cCFv */
-// int daPy_py_c::checkFrontRoll() const {
-extern "C" int checkFrontRoll__9daPy_py_cCFv() {
-    return false;
-}
-
-/* 8001E130-8001E138 018A70 0008+00 0/0 1/0 0/0 .text            checkHorseRide__9daPy_py_cCFv */
-// u32 daPy_py_c::checkHorseRide() const {
-extern "C" u32 checkHorseRide__9daPy_py_cCFv() {
-    return false;
-}
-
-/* 8001E138-8001E140 018A78 0008+00 0/0 1/0 0/0 .text            getGrabActorID__9daPy_py_cCFv */
-// s32 daPy_py_c::getGrabActorID() const {
-extern "C" s32 getGrabActorID__9daPy_py_cCFv() {
-    return -1;
-}
-
 /* 8001E140-8001E180 018A80 0040+00 1/0 0/0 0/0 .text            fopCam_Draw__FP12camera_class */
 static s32 fopCam_Draw(camera_class* i_this) {
     s32 ret = 1;
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index 94dd707f62..c837645a43 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -13,41 +13,6 @@
 #include "m_Do/m_Do_DVDError.h"
 #include "m_Do/m_Do_MemCard.h"
 
-//
-// Forward References:
-//
-
-extern "C" static void my_OSCancelAlarmAll__Fv();
-extern "C" static void destroyVideo__Fv();
-extern "C" void mDoRst_reset__FiUli();
-extern "C" void mDoRst_resetCallBack__FiPv();
-extern "C" u32 getResetData__6mDoRstFv();
-extern "C" extern char const* const m_Do_m_Do_Reset__stringBase0;
-extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */];
-
-//
-// External References:
-//
-
-extern "C" void mDoDvdErr_ThdCleanup__Fv();
-extern "C" void cAPICPad_recalibrate__Fv();
-extern "C" void pause__13JASTaskThreadFb();
-extern "C" void getThreadPointer__6JASDvdFv();
-extern "C" void hasReset__10Z2AudioMgrCFv();
-extern "C" void destroyManager__8JUTVideoFv();
-extern "C" void clearIndex__6JUTXfbFv();
-extern "C" void LCDisable();
-extern "C" void VIWaitForRetrace();
-extern "C" void VIFlush();
-extern "C" void GXFlush();
-extern "C" void GXAbortFrame();
-extern "C" void GXDrawDone();
-extern "C" void _savegpr_27();
-extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
-extern "C" u8 sCallback__Q210JUTGamePad13C3ButtonReset[4];
-extern "C" u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */];
-extern "C" u8 sManager__6JUTXfb[4 + 4 /* padding */];
-
 static void my_OSCancelAlarmAll() {}
 
 static void destroyVideo() {