diff --git a/include/d/actor/d_a_bwdg.h b/include/d/actor/d_a_bwdg.h
index 79cf2f223..1c9b4fe22 100644
--- a/include/d/actor/d_a_bwdg.h
+++ b/include/d/actor/d_a_bwdg.h
@@ -8,4 +8,14 @@ public:
     /* Place member variables here */
 };
 
+class daBwdg_packet_c {
+public:
+    void getMtx() {}
+    void getNrm() {}
+    void getPos() {}
+    void setTevStr(dKy_tevstr_c*) {}
+
+    void draw();
+};
+
 #endif /* D_A_BWDG_H */
diff --git a/include/d/actor/d_a_coming3.h b/include/d/actor/d_a_coming3.h
index dbff9817c..ae1a288ae 100644
--- a/include/d/actor/d_a_coming3.h
+++ b/include/d/actor/d_a_coming3.h
@@ -4,6 +4,9 @@
 #include "f_op/f_op_actor.h"
 
 namespace daComing3 {
+    static void position_is_safety_call_back(void*, void*);
+    static void position_is_none_obj(cXyz*);
+    
     class Act_c : public fopAc_ac_c {
     public:
         void get_water_height(float*, int*, const cXyz*);
diff --git a/include/d/actor/d_a_fallrock_tag.h b/include/d/actor/d_a_fallrock_tag.h
index 5b9fbd8b7..fb7d765eb 100644
--- a/include/d/actor/d_a_fallrock_tag.h
+++ b/include/d/actor/d_a_fallrock_tag.h
@@ -8,7 +8,7 @@ public:
     inline s32 create();
     inline BOOL draw();
     inline BOOL execute();
-    void getData() {}
+    void getData(); // weak but not inlined?
 
     void createRock(cXyz*, cXyz*, csXyz*, int, unsigned long);
 
diff --git a/include/d/actor/d_a_himo3.h b/include/d/actor/d_a_himo3.h
index d934fc97a..1a3d91639 100644
--- a/include/d/actor/d_a_himo3.h
+++ b/include/d/actor/d_a_himo3.h
@@ -3,6 +3,10 @@
 
 #include "f_op/f_op_actor.h"
 
+struct himo3_s {
+    
+};
+
 class himo3_class : public fopAc_ac_c {
 public:
     void getPlayerMoveLength() {}
diff --git a/include/d/actor/d_a_lod_bg.h b/include/d/actor/d_a_lod_bg.h
index ce6882674..310223c37 100644
--- a/include/d/actor/d_a_lod_bg.h
+++ b/include/d/actor/d_a_lod_bg.h
@@ -9,7 +9,7 @@ class JKRArchive;
 
 class daLodbg_c : public fopAc_ac_c {
 public:
-    void createHeap() {}
+    inline void createHeap();
     inline BOOL draw();
     inline BOOL execute();
     void setExecute(int (daLodbg_c::*)()) {}
diff --git a/include/d/actor/d_a_majuu_flag.h b/include/d/actor/d_a_majuu_flag.h
index b8864dd55..ee0b7f3ab 100644
--- a/include/d/actor/d_a_majuu_flag.h
+++ b/include/d/actor/d_a_majuu_flag.h
@@ -4,6 +4,23 @@
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 
+class daMajuu_Flag_packet_c {
+public:
+    void changeCurrentPos() {}
+    void getImageTexObj() {}
+    void getMtx() {}
+    void getNrm() {}
+    void getOffsetVec() {}
+    void getPos() {}
+    void getToonTexObj() {}
+    void setTevStr(dKy_tevstr_c*) {}
+
+    void setNrmMtx();
+    void setBackNrm();
+    void setNrmVtx(cXyz*, int);
+    void draw();
+};
+
 class daMajuu_Flag_c : public fopAc_ac_c {
 public:
     void setBaseScale(float) {}
diff --git a/include/d/actor/d_a_mant.h b/include/d/actor/d_a_mant.h
index 0b3381731..e0e3c79b3 100644
--- a/include/d/actor/d_a_mant.h
+++ b/include/d/actor/d_a_mant.h
@@ -3,6 +3,24 @@
 
 #include "f_op/f_op_actor.h"
 
+struct mant_j_s {
+    
+};
+
+class daMant_packet_c {
+public:
+    void getMtx() {}
+    void getMtx2() {}
+    void getNrm() {}
+    void getPos() {}
+    void getTexNo() {}
+    void setTevStr(dKy_tevstr_c*) {}
+    void setTexNo(unsigned char) {}
+    void setarg0(unsigned char) {}
+
+    void draw();
+};
+
 class mant_class : public fopAc_ac_c {
 public:
     /* 0x0290 */ u8 m0290[0x1BEC - 0x0290];
diff --git a/include/d/actor/d_a_obj_ajav.h b/include/d/actor/d_a_obj_ajav.h
index a976e2429..addce4771 100644
--- a/include/d/actor/d_a_obj_ajav.h
+++ b/include/d/actor/d_a_obj_ajav.h
@@ -3,15 +3,67 @@
 
 #include "f_op/f_op_actor.h"
 
-class daObjAjav : public fopAc_ac_c {
-public:
-    void daObjAjav_make_splash(cXyz, float);
-    void check_angle(short*, short);
-    void daObjAjav_limit_angle(short*, short);
-    void daObjAjav_get_rot_speed(cXyz, cXyz, short);
-
-public:
-    /* Place member variables here */
+namespace daObjAjav {
+    static void daObjAjav_make_splash(cXyz, float);
+    static void check_angle(short*, short);
+    static void daObjAjav_limit_angle(short*, short);
+    static void daObjAjav_get_rot_speed(cXyz, cXyz, short);
+    
+    class Act_c;
+    
+    class Part_c {
+    public:
+        void checkExeProc(void (daObjAjav::Part_c::*)(daObjAjav::Act_c*)) {}
+        void draw(daObjAjav::Act_c*) {}
+        void execute(daObjAjav::Act_c*) {}
+        void setDrawProc(void (daObjAjav::Part_c::*)(daObjAjav::Act_c*)) {}
+        void setExeProc(void (daObjAjav::Part_c::*)(daObjAjav::Act_c*)) {}
+        void set_se_pos(cXyz) {}
+        
+        void make_hamon(cXyz, float);
+        void no_proc(daObjAjav::Act_c*);
+        void init_data(cXyz, cXyz, dKy_tevstr_c*, cXyz*);
+        void set_mdl_area(const char*, int, unsigned long);
+        void init_mtx(cXyz, csXyz, cXyz);
+        void set_flaw_mtx(cXyz, csXyz);
+        void set_fall_mtx(cXyz, csXyz);
+        void fall_init(cXyz, csXyz, short, unsigned short);
+        void fall_0(daObjAjav::Act_c*);
+        void fall_1(daObjAjav::Act_c*);
+        void flaw(daObjAjav::Act_c*);
+        void draw_normal(daObjAjav::Act_c*);
+        void draw_flashing(daObjAjav::Act_c*);
+        void draw_flashing_normal(daObjAjav::Act_c*);
+        void draw_shy(daObjAjav::Act_c*);
+        void make_fall_rock(int);
+    };
+    
+    class Act_c : public fopAc_ac_c {
+    public:
+        void check_ev() {}
+        void check_sw() {}
+        void on_sw() {}
+        
+        void solidHeapCB(fopAc_ac_c*);
+        void create_heap();
+        s32 _create();
+        BOOL _delete();
+        void init_mtx();
+        void set_tex();
+        void set_co_offset();
+        void check_all_wait();
+        void check_end();
+        void to_broken();
+        void damage_part();
+        void make_shot_rock();
+        void make_hamon2(cXyz, float);
+        void set_hamon(float);
+        BOOL _execute();
+        BOOL _draw();
+    
+    public:
+        /* Place member variables here */
+    };
 };
 
 #endif /* D_A_OBJ_AJAV_H */
diff --git a/include/d/actor/d_a_obj_buoyflag.h b/include/d/actor/d_a_obj_buoyflag.h
index 0b8581934..0b3639da8 100644
--- a/include/d/actor/d_a_obj_buoyflag.h
+++ b/include/d/actor/d_a_obj_buoyflag.h
@@ -7,6 +7,8 @@
 #include "f_op/f_op_actor_mng.h"
 
 namespace daObjBuoyflag {
+    class Act_c;
+    
     enum Type_e {
         
     };
@@ -14,6 +16,36 @@ namespace daObjBuoyflag {
         
     };
     
+    class Packet_c {
+    public:
+        void calc_pos_gravity(int, int) {}
+        void calc_pos_spd(int, int) {}
+        void calc_pos_spring(int, int) {}
+        void calc_pos_wave(int, int) {}
+        
+        void hasi_nrm_init();
+        void draw_hata(daObjBuoyflag::Act_c*);
+        void draw_hasi(daObjBuoyflag::Act_c*);
+        void draw();
+        void init(daObjBuoyflag::Act_c*);
+        void calc_wind_base(daObjBuoyflag::Act_c*);
+        void calc_pos_spring_near(const cXyz*, const cXyz*, float, float);
+        void calc_pos(daObjBuoyflag::Act_c*);
+        void calc_nrm();
+        void calc(daObjBuoyflag::Act_c*);
+        void update(daObjBuoyflag::Act_c*);
+    };
+    
+    class DrawVtx_c {
+    public:
+        
+    };
+    
+    class MoveVtx_c {
+    public:
+        
+    };
+    
     class Act_c : public fopAc_ac_c {
     public:
         static s32 make_norm(unsigned int parentPId, cXyz* pos, int roomNo, csXyz* angle) {
@@ -33,9 +65,9 @@ namespace daObjBuoyflag {
         void jump_to_sea(float, float, short) {}
         void make_barrel2_mine(unsigned int, cXyz*, int, csXyz*, Texture_e, bool) {}
         void make_barrel2_norm(unsigned int, cXyz*, int, csXyz*, Texture_e) {}
-        void attr_type() const {}
+        void attr_type() const; // weak but not inlined?
         void prm_get_noCull() const {}
-        void prm_get_texture() const {}
+        void prm_get_texture() const; // weak but not inlined?
         void prm_get_type() const {}
     
         void mtx_init();
diff --git a/include/d/actor/d_a_obj_coming.h b/include/d/actor/d_a_obj_coming.h
index 7481aea3f..90b893f05 100644
--- a/include/d/actor/d_a_obj_coming.h
+++ b/include/d/actor/d_a_obj_coming.h
@@ -34,7 +34,7 @@ namespace daObjComing {
         void prm_get_swSave() const {}
         void prm_get_tblNum() const {}
         void prm_get_type() const {}
-        void prm_get_waitTime() const {}
+        void prm_get_waitTime() const; // weak but not inlined?
     
         void chk_switch();
         s32 _create();
diff --git a/include/d/actor/d_a_obj_correct.h b/include/d/actor/d_a_obj_correct.h
index 97c30fcc8..fff43d562 100644
--- a/include/d/actor/d_a_obj_correct.h
+++ b/include/d/actor/d_a_obj_correct.h
@@ -5,10 +5,6 @@
 #include "d/actor/d_a_obj_try.h"
 
 namespace daObjCorrect {
-    enum Type_e {
-        
-    };
-
     class Act_c : public fopAc_ac_c {
     public:
         void prm_get_evId() const {}
@@ -18,8 +14,8 @@ namespace daObjCorrect {
         s32 _create();
         BOOL _delete();
         void chk_try_actor0(fopAc_ac_c*);
-        void chk_try_actor1(Act_c*, Type_e, float) const;
-        void chk_try_actor2(Act_c*, Type_e, bool, float, float) const;
+        void chk_try_actor1(daObjTry::Act_c*, daObjTry::Type_e, float) const;
+        void chk_try_actor2(daObjTry::Act_c*, daObjTry::Type_e, bool, float, float) const;
         void search_movebox(void*, void*);
         void search_tryColSun(void*, void*);
         void search_tryColMer(void*, void*);
diff --git a/include/d/actor/d_a_obj_doguu.h b/include/d/actor/d_a_obj_doguu.h
index 8e91fa3ff..4769e131d 100644
--- a/include/d/actor/d_a_obj_doguu.h
+++ b/include/d/actor/d_a_obj_doguu.h
@@ -9,7 +9,7 @@ public:
     inline BOOL _delete();
     inline BOOL _draw();
     inline BOOL _execute();
-    void setEffectMtx(const cXyz*, float) {}
+    void setEffectMtx(const cXyz*, float); // weak but not inlined?
 
     void setPointLight();
     void CreateHeap();
diff --git a/include/d/actor/d_a_obj_hsehi1.h b/include/d/actor/d_a_obj_hsehi1.h
index b54621de8..64328042d 100644
--- a/include/d/actor/d_a_obj_hsehi1.h
+++ b/include/d/actor/d_a_obj_hsehi1.h
@@ -7,6 +7,8 @@ class JPABaseEmitter;
 
 class daObj_hsh_c : public fopAc_ac_c {
 public:
+    ~daObj_hsh_c();
+    
     void isEventAccept() {}
     void isOffDraw() {}
     void isTactCancel() {}
diff --git a/include/d/actor/d_a_obj_try.h b/include/d/actor/d_a_obj_try.h
index 3a659019f..022d5ee16 100644
--- a/include/d/actor/d_a_obj_try.h
+++ b/include/d/actor/d_a_obj_try.h
@@ -4,6 +4,10 @@
 #include "f_op/f_op_actor.h"
 
 namespace daObjTry {
+    enum Type_e {
+        
+    };
+    
     class Act_c : public fopAc_ac_c {
     public:
         void attr() const {}
diff --git a/include/d/actor/d_a_obj_vmsms.h b/include/d/actor/d_a_obj_vmsms.h
index 4f3c50635..608d2d195 100644
--- a/include/d/actor/d_a_obj_vmsms.h
+++ b/include/d/actor/d_a_obj_vmsms.h
@@ -5,7 +5,7 @@
 
 class daObjVmsms_c : public fopAc_ac_c {
 public:
-    void check_demo() const {}
+    void check_demo() const; // weak but not inlined?
 
     void solidHeapCB(fopAc_ac_c*);
     void create_heap();
diff --git a/include/d/actor/d_a_obj_vtil.h b/include/d/actor/d_a_obj_vtil.h
index 56e0b9d54..29a013629 100644
--- a/include/d/actor/d_a_obj_vtil.h
+++ b/include/d/actor/d_a_obj_vtil.h
@@ -6,7 +6,7 @@
 class daObjVtil_c : public fopAc_ac_c {
 public:
     void camera_off() {}
-    void check_ev_bit() const {}
+    void check_ev_bit() const; // weak but not inlined?
     void prm_get_type() const {}
 
     void solidHeapCB(fopAc_ac_c*);
diff --git a/include/d/actor/d_a_pirate_flag.h b/include/d/actor/d_a_pirate_flag.h
index 22e69376e..f983698d7 100644
--- a/include/d/actor/d_a_pirate_flag.h
+++ b/include/d/actor/d_a_pirate_flag.h
@@ -3,6 +3,23 @@
 
 #include "f_op/f_op_actor.h"
 
+class daPirate_Flag_packet_c {
+public:
+    void changeCurrentPos() {}
+    void getEscapeNrmAngle() {}
+    void getMtx() {}
+    void getNrm() {}
+    void getOffsetVec() {}
+    void getPos() {}
+    void setNrmMtx() {}
+    void setTevStr(dKy_tevstr_c*) {}
+
+    void setCorrectNrmAngle(short, float);
+    void setBackNrm();
+    void setNrmVtx(cXyz*, int, int);
+    void draw();
+};
+
 class pirate_flag_class : public fopAc_ac_c {
 public:
     /* Place member variables here */
diff --git a/include/d/actor/d_a_saku.h b/include/d/actor/d_a_saku.h
index f479ea5f2..0f8b21582 100644
--- a/include/d/actor/d_a_saku.h
+++ b/include/d/actor/d_a_saku.h
@@ -5,14 +5,15 @@
 
 class daSaku_c : public fopAc_ac_c {
 public:
-    void _daSaku_create() {}
-    void _daSaku_delete() {}
-    void _daSaku_draw() {}
-    void _daSaku_execute() {}
-    void _daSaku_isdelete() {}
     void chkFlag(unsigned char) {}
     void setFlag(unsigned char) {}
 
+    inline s32 _daSaku_create();
+    inline BOOL _daSaku_delete();
+    inline BOOL _daSaku_draw();
+    inline BOOL _daSaku_execute();
+    inline BOOL _daSaku_isdelete();
+
     void CreateInit();
     void saku_draw_sub(int);
     void mode_break_none(int);
diff --git a/include/d/actor/d_a_stone2.h b/include/d/actor/d_a_stone2.h
index bf456ce26..9e6babcc4 100644
--- a/include/d/actor/d_a_stone2.h
+++ b/include/d/actor/d_a_stone2.h
@@ -6,6 +6,8 @@
 namespace daStone2 {
     class Act_c : public fopAc_ac_c {
     public:
+        Act_c();
+        
         void attr() {}
         void prmZ_get_evId() const {}
         void prm_get_cull() const {}
diff --git a/include/d/actor/d_a_tag_light.h b/include/d/actor/d_a_tag_light.h
index 0a08e2e8a..7f127cf77 100644
--- a/include/d/actor/d_a_tag_light.h
+++ b/include/d/actor/d_a_tag_light.h
@@ -7,6 +7,8 @@
 class J3DMaterial;
 
 namespace daTagLight {
+    static void get_cross_plane_line(cXyz*, float, float, float, float, float, float, float, float, float, float);
+    
     class Act_c : public fopAc_ac_c {
     public:
         enum Prm_e {
diff --git a/include/d/actor/d_a_tag_photo.h b/include/d/actor/d_a_tag_photo.h
index 92a199105..8bdec3420 100644
--- a/include/d/actor/d_a_tag_photo.h
+++ b/include/d/actor/d_a_tag_photo.h
@@ -5,6 +5,8 @@
 
 class daTagPhoto_c : public fopAc_ac_c {
 public:
+    daTagPhoto_c();
+
     void getTagNo() {}
 
     s32 _create();
diff --git a/include/d/actor/d_a_warpdm20.h b/include/d/actor/d_a_warpdm20.h
index d4ecd32dd..941cafbc5 100644
--- a/include/d/actor/d_a_warpdm20.h
+++ b/include/d/actor/d_a_warpdm20.h
@@ -5,7 +5,7 @@
 
 class daWarpdm20_c : public fopAc_ac_c {
 public:
-    void set_mtx() {}
+    void set_mtx(); // weak but not inlined?
 
     BOOL _delete();
     void CreateHeap();
diff --git a/include/d/actor/d_a_ygcwp.h b/include/d/actor/d_a_ygcwp.h
index a9d6aa2fa..e64bc91d1 100644
--- a/include/d/actor/d_a_ygcwp.h
+++ b/include/d/actor/d_a_ygcwp.h
@@ -5,8 +5,8 @@
 
 class daYgcwp_c : public fopAc_ac_c {
 public:
-    void check_ev() const {}
-    void off_ev() const {}
+    void check_ev() const; // weak but not inlined?
+    void off_ev() const; // weak but not inlined?
 
     void solidHeapCB(fopAc_ac_c*);
     void create_heap();
diff --git a/include/d/d_bg_w_sv.h b/include/d/d_bg_w_sv.h
new file mode 100644
index 000000000..4f5fe9f51
--- /dev/null
+++ b/include/d/d_bg_w_sv.h
@@ -0,0 +1,22 @@
+#ifndef D_BG_W_SV_H
+#define D_BG_W_SV_H
+
+#include "d/d_bg_w.h"
+
+class dBgWSv : public dBgW {
+public:
+    void ChkNoCrrPos() {}
+    void GetBackVtx() {}
+    virtual void MatrixCrrPos(cBgS_PolyInfo&, void*, bool, cXyz*, csXyz*, csXyz*) {}
+    void SetBackVtx(Vec*) {}
+    void SetFlag(unsigned long) {}
+    
+    void Set(cBgD_t*, unsigned long);
+    void CopyBackVtx();
+    void CrrPosWork(cXyz*, int, int, int);
+    virtual void CrrPos(cBgS_PolyInfo&, void*, bool, cXyz*, csXyz*, csXyz*);
+    void TransPosWork(cXyz*, int, int, int);
+    virtual void TransPos(cBgS_PolyInfo&, void*, bool, cXyz*, csXyz*, csXyz*);
+};
+
+#endif /* D_BG_W_SV_H */
diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp
index 5ed10c783..8fa8ac5f3 100644
--- a/src/d/actor/d_a_beam.cpp
+++ b/src/d/actor/d_a_beam.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "d/actor/d_a_beam.h"
-#include "dolphin/types.h"
+#include "d/d_cc_d.h"
 
 /* 000000EC-00000118       .text __ct__12daBeam_HIO_cFv */
 daBeam_HIO_c::daBeam_HIO_c() {
diff --git a/src/d/actor/d_a_kanban.cpp b/src/d/actor/d_a_kanban.cpp
index a1676fa11..cd4e6040c 100644
--- a/src/d/actor/d_a_kanban.cpp
+++ b/src/d/actor/d_a_kanban.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "d/actor/d_a_kanban.h"
-#include "dolphin/types.h"
+#include "JSystem/J3DGraphAnimator/J3DModel.h"
 
 /* 000000EC-0000012C       .text __ct__14daKanban_HIO_cFv */
 daKanban_HIO_c::daKanban_HIO_c() {
diff --git a/src/d/actor/d_a_kui.cpp b/src/d/actor/d_a_kui.cpp
index 3eab41353..04cc0ba65 100644
--- a/src/d/actor/d_a_kui.cpp
+++ b/src/d/actor/d_a_kui.cpp
@@ -6,6 +6,8 @@
 #include "d/actor/d_a_kui.h"
 #include "dolphin/types.h"
 
+class J3DModelData;
+
 /* 00000078-000000C4       .text s_a_i_sub__FPvPv */
 void s_a_i_sub(void*, void*) {
     /* Nonmatching */
diff --git a/src/d/actor/d_a_obj_ajav.cpp b/src/d/actor/d_a_obj_ajav.cpp
index 125a7465a..6e51bb70c 100644
--- a/src/d/actor/d_a_obj_ajav.cpp
+++ b/src/d/actor/d_a_obj_ajav.cpp
@@ -181,11 +181,6 @@ BOOL daObjAjav::Act_c::_execute() {
     /* Nonmatching */
 }
 
-/* 00002CF4-00002D50       .text set_se_pos__Q29daObjAjav6Part_cF4cXyz */
-void daObjAjav::Part_c::set_se_pos(cXyz) {
-    /* Nonmatching */
-}
-
 /* 00002D50-00002DCC       .text _draw__Q29daObjAjav5Act_cFv */
 BOOL daObjAjav::Act_c::_draw() {
     /* Nonmatching */
diff --git a/src/d/actor/d_a_obj_hami2.cpp b/src/d/actor/d_a_obj_hami2.cpp
index 7a13a81e4..388a95afe 100644
--- a/src/d/actor/d_a_obj_hami2.cpp
+++ b/src/d/actor/d_a_obj_hami2.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "d/actor/d_a_obj_hami2.h"
-#include "dolphin/types.h"
+#include "m_Do/m_Do_ext.h"
 
 /* 00000078-0000012C       .text nodeCallBack__FP7J3DNodei */
 static BOOL nodeCallBack(J3DNode*, int) {
diff --git a/src/d/actor/d_a_obj_hami3.cpp b/src/d/actor/d_a_obj_hami3.cpp
index 6ed90c039..4016b073a 100644
--- a/src/d/actor/d_a_obj_hami3.cpp
+++ b/src/d/actor/d_a_obj_hami3.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "d/actor/d_a_obj_hami3.h"
-#include "dolphin/types.h"
+#include "m_Do/m_Do_ext.h"
 
 /* 00000078-0000012C       .text nodeCallBack__FP7J3DNodei */
 static BOOL nodeCallBack(J3DNode*, int) {
diff --git a/src/d/actor/d_a_saku.cpp b/src/d/actor/d_a_saku.cpp
index 5adf446cc..5412eacd3 100644
--- a/src/d/actor/d_a_saku.cpp
+++ b/src/d/actor/d_a_saku.cpp
@@ -6,6 +6,9 @@
 #include "d/actor/d_a_saku.h"
 #include "dolphin/types.h"
 
+class J3DModelData;
+class J3DMaterial;
+
 /* 000000EC-00000200       .text CreateInit__8daSaku_cFv */
 void daSaku_c::CreateInit() {
     /* Nonmatching */
@@ -127,7 +130,7 @@ static s32 daSaku_Create(fopAc_ac_c*) {
 }
 
 /* 00001BB8-00001F28       .text _daSaku_create__8daSaku_cFv */
-void daSaku_c::_daSaku_create() {
+s32 daSaku_c::_daSaku_create() {
     /* Nonmatching */
 }
 
diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp
index 5bb652973..70463c349 100644
--- a/src/d/actor/d_a_salvage.cpp
+++ b/src/d/actor/d_a_salvage.cpp
@@ -165,19 +165,3 @@ static BOOL daSalvageDraw(void*) {
 static BOOL daSalvageIsDelete(void*) {
     /* Nonmatching */
 }
-
-/* 000025A4-000025EC       .text setPos__11daSalvage_cFi4cXyz */
-void daSalvage_c::setPos(int, cXyz) {
-    /* Nonmatching */
-}
-
-/* 000025EC-00002620       .text getPos__11daSalvage_cFi */
-void daSalvage_c::getPos(int) {
-    /* Nonmatching */
-}
-
-/* 00002620-00002654       .text getScale__11daSalvage_cFi */
-void daSalvage_c::getScale(int) {
-    /* Nonmatching */
-}
-
diff --git a/src/d/actor/d_a_sk2.cpp b/src/d/actor/d_a_sk2.cpp
index 00cbdc961..f3efd2832 100644
--- a/src/d/actor/d_a_sk2.cpp
+++ b/src/d/actor/d_a_sk2.cpp
@@ -5,6 +5,7 @@
 
 #include "d/actor/d_a_sk2.h"
 #include "m_Do/m_Do_ext.h"
+#include "d/d_bg_w_sv.h"
 
 /* 00000078-00000194       .text nodeCallBack__FP7J3DNodei */
 static BOOL nodeCallBack(J3DNode*, int) {
@@ -45,9 +46,3 @@ static BOOL useHeapInit(fopAc_ac_c*) {
 static s32 daSk2_Create(fopAc_ac_c*) {
     /* Nonmatching */
 }
-
-/* 00000C78-00000C7C       .text MatrixCrrPos__6dBgWSvFR13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */
-void dBgWSv::MatrixCrrPos(cBgS_PolyInfo&, void*, bool, cXyz*, csXyz*, csXyz*) {
-    /* Nonmatching */
-}
-
diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp
index 807967661..a5588a5b1 100644
--- a/src/d/actor/d_a_tag_attention.cpp
+++ b/src/d/actor/d_a_tag_attention.cpp
@@ -15,7 +15,3 @@ s32 daTagAttention::Act_c::_create() {
 BOOL daTagAttention::Act_c::_execute() {
     /* Nonmatching */
 }
-/* 000005C4-000007E0       .text chk_inside__Q214daTagAttention5Act_cCFP4cXyz */
-void daTagAttention::Act_c::chk_inside(cXyz*) const {
-    /* Nonmatching */
-}
diff --git a/src/d/d_bg_w_sv.cpp b/src/d/d_bg_w_sv.cpp
index 3a443ff73..b357d16b6 100644
--- a/src/d/d_bg_w_sv.cpp
+++ b/src/d/d_bg_w_sv.cpp
@@ -3,7 +3,7 @@
 // Translation Unit: d_bg_w_sv.cpp
 //
 
-#include "d_bg_w_sv.h"
+#include "d/d_bg_w_sv.h"
 #include "dolphin/types.h"
 
 /* 800AABFC-800AAC84       .text Set__6dBgWSvFP6cBgD_tUl */
@@ -35,9 +35,3 @@ void dBgWSv::TransPosWork(cXyz*, int, int, int) {
 void dBgWSv::TransPos(cBgS_PolyInfo&, void*, bool, cXyz*, csXyz*, csXyz*) {
     /* Nonmatching */
 }
-
-/* 800AB23C-800AB2AC       .text __dt__6dBgWSvFv */
-dBgWSv::~dBgWSv() {
-    /* Nonmatching */
-}
-