From e58099223c10d770b80dfd97ceef3701451adddc Mon Sep 17 00:00:00 2001
From: Angie <angheloalf95@gmail.com>
Date: Sun, 24 Jul 2022 20:12:34 -0400
Subject: [PATCH] Remove InitVars from actor headers

---
 docs/tutorial/beginning_decomp.md                               | 2 --
 src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h                 | 2 --
 src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h               | 2 --
 src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h                 | 2 --
 src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h             | 2 --
 src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h   | 2 --
 src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h         | 2 --
 src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h           | 2 --
 src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h     | 2 --
 src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h       | 2 --
 src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h         | 2 --
 src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h   | 2 --
 src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h   | 2 --
 src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h | 2 --
 src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h     | 2 --
 .../actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h        | 2 --
 src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h         | 2 --
 src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h         | 2 --
 src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h           | 2 --
 src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h           | 2 --
 src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h         | 2 --
 src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h         | 2 --
 src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h           | 2 --
 src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h           | 2 --
 src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h               | 2 --
 src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h   | 2 --
 src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h     | 2 --
 src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h           | 2 --
 .../actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h      | 2 --
 .../actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h        | 2 --
 src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h     | 2 --
 src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h | 2 --
 src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h               | 2 --
 src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h                 | 2 --
 src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h       | 2 --
 src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h | 2 --
 src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h     | 2 --
 src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h           | 2 --
 .../actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h      | 2 --
 src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h   | 2 --
 src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h   | 2 --
 src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h     | 2 --
 src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h             | 2 --
 src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h                 | 2 --
 src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h     | 2 --
 src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h     | 2 --
 src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h       | 2 --
 src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h         | 2 --
 src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h     | 2 --
 src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h         | 2 --
 src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h                 | 2 --
 src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h         | 2 --
 src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h               | 2 --
 src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h                   | 2 --
 src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h       | 2 --
 src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h         | 2 --
 src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h           | 2 --
 src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h     | 2 --
 src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h           | 2 --
 src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h       | 2 --
 src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h                 | 2 --
 src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h         | 2 --
 src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h             | 2 --
 src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h               | 2 --
 src/overlays/actors/ovl_Boss_01/z_boss_01.h                     | 2 --
 src/overlays/actors/ovl_Boss_02/z_boss_02.h                     | 2 --
 src/overlays/actors/ovl_Boss_04/z_boss_04.h                     | 2 --
 src/overlays/actors/ovl_Boss_05/z_boss_05.h                     | 2 --
 src/overlays/actors/ovl_Boss_06/z_boss_06.h                     | 2 --
 src/overlays/actors/ovl_Boss_07/z_boss_07.h                     | 2 --
 src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h           | 2 --
 src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h             | 2 --
 src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h           | 2 --
 src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h             | 2 --
 src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h           | 2 --
 src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h                   | 2 --
 src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h             | 2 --
 src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h           | 2 --
 src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h                         | 2 --
 src/overlays/actors/ovl_Dm_Al/z_dm_al.h                         | 2 --
 src/overlays/actors/ovl_Dm_An/z_dm_an.h                         | 2 --
 src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h                       | 2 --
 src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h                 | 2 --
 src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h                 | 2 --
 src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h                 | 2 --
 src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h                 | 2 --
 src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h                 | 2 --
 src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h                 | 2 --
 src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h                 | 2 --
 src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h                 | 2 --
 src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h                 | 2 --
 src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h                 | 2 --
 src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h                         | 2 --
 src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h                     | 2 --
 src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h                         | 2 --
 src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h               | 2 --
 src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h                 | 2 --
 src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h                         | 2 --
 src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h                 | 2 --
 src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h                       | 2 --
 src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h                       | 2 --
 src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h                       | 2 --
 src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h                         | 2 --
 src/overlays/actors/ovl_Door_Ana/z_door_ana.h                   | 2 --
 src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h           | 2 --
 src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h             | 2 --
 src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h               | 2 --
 src/overlays/actors/ovl_Eff_Change/z_eff_change.h               | 2 --
 src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h                   | 2 --
 src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h | 2 --
 src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h             | 2 --
 src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h                     | 2 --
 src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h           | 2 --
 src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h                     | 2 --
 src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h                   | 2 --
 src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h                   | 2 --
 src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h                   | 2 --
 src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h                   | 2 --
 src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h                   | 2 --
 src/overlays/actors/ovl_En_Ah/z_en_ah.h                         | 2 --
 src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h         | 2 --
 src/overlays/actors/ovl_En_Al/z_en_al.h                         | 2 --
 src/overlays/actors/ovl_En_Am/z_en_am.h                         | 2 --
 src/overlays/actors/ovl_En_An/z_en_an.h                         | 2 --
 src/overlays/actors/ovl_En_And/z_en_and.h                       | 2 --
 src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h                 | 2 --
 src/overlays/actors/ovl_En_Arrow/z_en_arrow.h                   | 2 --
 src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h         | 2 --
 src/overlays/actors/ovl_En_Az/z_en_az.h                         | 2 --
 src/overlays/actors/ovl_En_Baba/z_en_baba.h                     | 2 --
 src/overlays/actors/ovl_En_Baguo/z_en_baguo.h                   | 2 --
 src/overlays/actors/ovl_En_Baisen/z_en_baisen.h                 | 2 --
 src/overlays/actors/ovl_En_Bal/z_en_bal.h                       | 2 --
 src/overlays/actors/ovl_En_Bat/z_en_bat.h                       | 2 --
 src/overlays/actors/ovl_En_Bb/z_en_bb.h                         | 2 --
 src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h                 | 2 --
 src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h                 | 2 --
 src/overlays/actors/ovl_En_Bee/z_en_bee.h                       | 2 --
 src/overlays/actors/ovl_En_Bh/z_en_bh.h                         | 2 --
 src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h             | 2 --
 src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h             | 2 --
 src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c                   | 2 --
 src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h             | 2 --
 src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h                 | 2 --
 src/overlays/actors/ovl_En_Bjt/z_en_bjt.h                       | 2 --
 src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h                 | 2 --
 src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h                 | 2 --
 src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h                 | 2 --
 src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h                 | 2 --
 src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h                 | 2 --
 src/overlays/actors/ovl_En_Bom/z_en_bom.h                       | 2 --
 src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h     | 2 --
 src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h               | 2 --
 src/overlays/actors/ovl_En_Bombal/z_en_bombal.h                 | 2 --
 src/overlays/actors/ovl_En_Bombers/z_en_bombers.h               | 2 --
 src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h             | 2 --
 src/overlays/actors/ovl_En_Bombf/z_en_bombf.h                   | 2 --
 src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h               | 2 --
 src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h               | 2 --
 src/overlays/actors/ovl_En_Boom/z_en_boom.h                     | 2 --
 src/overlays/actors/ovl_En_Box/z_en_box.h                       | 2 --
 src/overlays/actors/ovl_En_Bsb/z_en_bsb.h                       | 2 --
 src/overlays/actors/ovl_En_Bu/z_en_bu.h                         | 2 --
 src/overlays/actors/ovl_En_Bubble/z_en_bubble.h                 | 2 --
 src/overlays/actors/ovl_En_Butte/z_en_butte.h                   | 2 --
 src/overlays/actors/ovl_En_Cha/z_en_cha.h                       | 2 --
 src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h           | 2 --
 src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h                 | 2 --
 src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h               | 2 --
 src/overlays/actors/ovl_En_Cow/z_en_cow.h                       | 2 --
 src/overlays/actors/ovl_En_Crow/z_en_crow.h                     | 2 --
 src/overlays/actors/ovl_En_Dai/z_en_dai.h                       | 2 --
 src/overlays/actors/ovl_En_Daiku/z_en_daiku.h                   | 2 --
 src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h                 | 2 --
 src/overlays/actors/ovl_En_Death/z_en_death.h                   | 2 --
 src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h             | 2 --
 src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h             | 2 --
 src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h       | 2 --
 src/overlays/actors/ovl_En_Dg/z_en_dg.h                         | 2 --
 src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h               | 2 --
 src/overlays/actors/ovl_En_Dnb/z_en_dnb.h                       | 2 --
 src/overlays/actors/ovl_En_Dnh/z_en_dnh.h                       | 2 --
 src/overlays/actors/ovl_En_Dnk/z_en_dnk.h                       | 2 --
 src/overlays/actors/ovl_En_Dno/z_en_dno.h                       | 2 --
 src/overlays/actors/ovl_En_Dnp/z_en_dnp.h                       | 2 --
 src/overlays/actors/ovl_En_Dnq/z_en_dnq.h                       | 2 --
 src/overlays/actors/ovl_En_Dns/z_en_dns.h                       | 2 --
 src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h               | 2 --
 src/overlays/actors/ovl_En_Door/z_en_door.h                     | 2 --
 src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h             | 2 --
 src/overlays/actors/ovl_En_Dragon/z_en_dragon.h                 | 2 --
 src/overlays/actors/ovl_En_Drs/z_en_drs.h                       | 2 --
 src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h                     | 2 --
 src/overlays/actors/ovl_En_Dt/z_en_dt.h                         | 2 --
 src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h             | 2 --
 src/overlays/actors/ovl_En_Egblock/z_en_egblock.h               | 2 --
 src/overlays/actors/ovl_En_Egol/z_en_egol.h                     | 2 --
 src/overlays/actors/ovl_En_Elf/z_en_elf.h                       | 2 --
 src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h                 | 2 --
 src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h                 | 2 --
 src/overlays/actors/ovl_En_Elforg/z_en_elforg.h                 | 2 --
 src/overlays/actors/ovl_En_Encount1/z_en_encount1.h             | 2 --
 src/overlays/actors/ovl_En_Encount2/z_en_encount2.h             | 2 --
 src/overlays/actors/ovl_En_Encount3/z_en_encount3.h             | 2 --
 src/overlays/actors/ovl_En_Encount4/z_en_encount4.h             | 2 --
 src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h       | 2 --
 src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h     | 2 --
 src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h     | 2 --
 src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h     | 2 --
 src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h     | 2 --
 src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h     | 2 --
 src/overlays/actors/ovl_En_Estone/z_en_estone.h                 | 2 --
 src/overlays/actors/ovl_En_Fall/z_en_fall.h                     | 2 --
 src/overlays/actors/ovl_En_Fall2/z_en_fall2.h                   | 2 --
 src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h           | 2 --
 src/overlays/actors/ovl_En_Firefly/z_en_firefly.h               | 2 --
 src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h             | 2 --
 src/overlays/actors/ovl_En_Fish/z_en_fish.h                     | 2 --
 src/overlays/actors/ovl_En_Fish2/z_en_fish2.h                   | 2 --
 src/overlays/actors/ovl_En_Fishing/z_en_fishing.h               | 2 --
 src/overlays/actors/ovl_En_Floormas/z_en_floormas.h             | 2 --
 src/overlays/actors/ovl_En_Fr/z_en_fr.h                         | 2 --
 src/overlays/actors/ovl_En_Fsn/z_en_fsn.h                       | 2 --
 src/overlays/actors/ovl_En_Fu/z_en_fu.h                         | 2 --
 src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h               | 2 --
 src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h               | 2 --
 src/overlays/actors/ovl_En_Fz/z_en_fz.h                         | 2 --
 src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h                 | 2 --
 src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h             | 2 --
 src/overlays/actors/ovl_En_Gb2/z_en_gb2.h                       | 2 --
 src/overlays/actors/ovl_En_Ge1/z_en_ge1.h                       | 2 --
 src/overlays/actors/ovl_En_Ge2/z_en_ge2.h                       | 2 --
 src/overlays/actors/ovl_En_Ge3/z_en_ge3.h                       | 2 --
 src/overlays/actors/ovl_En_Geg/z_en_geg.h                       | 2 --
 src/overlays/actors/ovl_En_Gg/z_en_gg.h                         | 2 --
 src/overlays/actors/ovl_En_Gg2/z_en_gg2.h                       | 2 --
 src/overlays/actors/ovl_En_Giant/z_en_giant.h                   | 2 --
 src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h           | 2 --
 src/overlays/actors/ovl_En_GirlA/z_en_girla.h                   | 2 --
 src/overlays/actors/ovl_En_Gk/z_en_gk.h                         | 2 --
 src/overlays/actors/ovl_En_Gm/z_en_gm.h                         | 2 --
 src/overlays/actors/ovl_En_Go/z_en_go.h                         | 2 --
 src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h               | 2 --
 src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h       | 2 --
 src/overlays/actors/ovl_En_Gs/z_en_gs.h                         | 2 --
 src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h         | 2 --
 src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h             | 2 --
 src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h             | 2 --
 src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h                 | 2 --
 src/overlays/actors/ovl_En_Hata/z_en_hata.h                     | 2 --
 src/overlays/actors/ovl_En_Hg/z_en_hg.h                         | 2 --
 src/overlays/actors/ovl_En_Hgo/z_en_hgo.h                       | 2 --
 src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h       | 2 --
 src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h             | 2 --
 src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h               | 2 --
 src/overlays/actors/ovl_En_Holl/z_en_holl.h                     | 2 --
 src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h             | 2 --
 src/overlays/actors/ovl_En_Horse/z_en_horse.h                   | 2 --
 .../actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h      | 2 --
 .../actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h      | 2 --
 src/overlays/actors/ovl_En_Hs/z_en_hs.h                         | 2 --
 src/overlays/actors/ovl_En_Hs2/z_en_hs2.h                       | 2 --
 src/overlays/actors/ovl_En_Ig/z_en_ig.h                         | 2 --
 src/overlays/actors/ovl_En_Ik/z_en_ik.h                         | 2 --
 src/overlays/actors/ovl_En_In/z_en_in.h                         | 2 --
 src/overlays/actors/ovl_En_Insect/z_en_insect.h                 | 2 --
 src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h           | 2 --
 src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h | 2 --
 .../actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h        | 2 --
 src/overlays/actors/ovl_En_Ishi/z_en_ishi.h                     | 2 --
 src/overlays/actors/ovl_En_Ja/z_en_ja.h                         | 2 --
 src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h               | 2 --
 src/overlays/actors/ovl_En_Jg/z_en_jg.h                         | 2 --
 src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h           | 2 --
 src/overlays/actors/ovl_En_Js/z_en_js.h                         | 2 --
 src/overlays/actors/ovl_En_Jso/z_en_jso.h                       | 2 --
 src/overlays/actors/ovl_En_Jso2/z_en_jso2.h                     | 2 --
 src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h               | 2 --
 src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h                 | 2 --
 src/overlays/actors/ovl_En_Kame/z_en_kame.h                     | 2 --
 src/overlays/actors/ovl_En_Kanban/z_en_kanban.h                 | 2 --
 src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h             | 2 --
 src/overlays/actors/ovl_En_Kbt/z_en_kbt.h                       | 2 --
 src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h             | 2 --
 src/overlays/actors/ovl_En_Kgy/z_en_kgy.h                       | 2 --
 src/overlays/actors/ovl_En_Kitan/z_en_kitan.h                   | 2 --
 src/overlays/actors/ovl_En_Knight/z_en_knight.h                 | 2 --
 src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h                 | 2 --
 src/overlays/actors/ovl_En_Kusa/z_en_kusa.h                     | 2 --
 src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h                   | 2 --
 src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h           | 2 --
 src/overlays/actors/ovl_En_Light/z_en_light.h                   | 2 --
 src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h           | 2 --
 src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h               | 2 --
 src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h           | 2 --
 src/overlays/actors/ovl_En_Ma4/z_en_ma4.h                       | 2 --
 src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h                 | 2 --
 src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h                 | 2 --
 src/overlays/actors/ovl_En_Mag/z_en_mag.h                       | 2 --
 src/overlays/actors/ovl_En_Maruta/z_en_maruta.h                 | 2 --
 src/overlays/actors/ovl_En_Minideath/z_en_minideath.h           | 2 --
 src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h             | 2 --
 src/overlays/actors/ovl_En_Minislime/z_en_minislime.h           | 2 --
 src/overlays/actors/ovl_En_Mk/z_en_mk.h                         | 2 --
 src/overlays/actors/ovl_En_Mkk/z_en_mkk.h                       | 2 --
 src/overlays/actors/ovl_En_Mm2/z_en_mm2.h                       | 2 --
 src/overlays/actors/ovl_En_Mm3/z_en_mm3.h                       | 2 --
 src/overlays/actors/ovl_En_Mnk/z_en_mnk.h                       | 2 --
 src/overlays/actors/ovl_En_Ms/z_en_ms.h                         | 2 --
 src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h                 | 2 --
 src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h                 | 2 --
 src/overlays/actors/ovl_En_Muto/z_en_muto.h                     | 2 --
 src/overlays/actors/ovl_En_Nb/z_en_nb.h                         | 2 --
 src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h           | 2 --
 src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h               | 2 --
 src/overlays/actors/ovl_En_Nnh/z_en_nnh.h                       | 2 --
 src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h             | 2 --
 src/overlays/actors/ovl_En_Nwc/z_en_nwc.h                       | 2 --
 src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h | 2 --
 src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h       | 2 --
 src/overlays/actors/ovl_En_Okuta/z_en_okuta.h                   | 2 --
 src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h               | 2 --
 src/overlays/actors/ovl_En_Osk/z_en_osk.h                       | 2 --
 src/overlays/actors/ovl_En_Osn/z_en_osn.h                       | 2 --
 src/overlays/actors/ovl_En_Ossan/z_en_ossan.h                   | 2 --
 src/overlays/actors/ovl_En_Ot/z_en_ot.h                         | 2 --
 src/overlays/actors/ovl_En_Owl/z_en_owl.h                       | 2 --
 src/overlays/actors/ovl_En_Pamera/z_en_pamera.h                 | 2 --
 src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h           | 2 --
 src/overlays/actors/ovl_En_Paper/z_en_paper.h                   | 2 --
 src/overlays/actors/ovl_En_Part/z_en_part.h                     | 2 --
 src/overlays/actors/ovl_En_Peehat/z_en_peehat.h                 | 2 --
 src/overlays/actors/ovl_En_Pm/z_en_pm.h                         | 2 --
 src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h       | 2 --
 src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h             | 2 --
 src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h         | 2 --
 src/overlays/actors/ovl_En_Poh/z_en_poh.h                       | 2 --
 src/overlays/actors/ovl_En_Pp/z_en_pp.h                         | 2 --
 src/overlays/actors/ovl_En_Pr/z_en_pr.h                         | 2 --
 src/overlays/actors/ovl_En_Pr2/z_en_pr2.h                       | 2 --
 src/overlays/actors/ovl_En_Prz/z_en_prz.h                       | 2 --
 src/overlays/actors/ovl_En_Pst/z_en_pst.h                       | 2 --
 src/overlays/actors/ovl_En_Racedog/z_en_racedog.h               | 2 --
 src/overlays/actors/ovl_En_Raf/z_en_raf.h                       | 2 --
 src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h             | 2 --
 src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h           | 2 --
 src/overlays/actors/ovl_En_Rat/z_en_rat.h                       | 2 --
 src/overlays/actors/ovl_En_Rd/z_en_rd.h                         | 2 --
 src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h           | 2 --
 src/overlays/actors/ovl_En_Rg/z_en_rg.h                         | 2 --
 src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h       | 2 --
 src/overlays/actors/ovl_En_Rr/z_en_rr.h                         | 2 --
 src/overlays/actors/ovl_En_Rsn/z_en_rsn.h                       | 2 --
 src/overlays/actors/ovl_En_Ru/z_en_ru.h                         | 2 --
 src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h           | 2 --
 src/overlays/actors/ovl_En_Rz/z_en_rz.h                         | 2 --
 src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h                 | 2 --
 src/overlays/actors/ovl_En_Sb/z_en_sb.h                         | 2 --
 src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h             | 2 --
 src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h           | 2 --
 src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h           | 2 --
 src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h           | 2 --
 src/overlays/actors/ovl_En_Sda/z_en_sda.h                       | 2 --
 src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h                 | 2 --
 src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h             | 2 --
 src/overlays/actors/ovl_En_Shn/z_en_shn.h                       | 2 --
 src/overlays/actors/ovl_En_Si/z_en_si.h                         | 2 --
 src/overlays/actors/ovl_En_Skb/z_en_skb.h                       | 2 --
 src/overlays/actors/ovl_En_Slime/z_en_slime.h                   | 2 --
 src/overlays/actors/ovl_En_Snowman/z_en_snowman.h               | 2 --
 src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h                 | 2 --
 src/overlays/actors/ovl_En_Sob1/z_en_sob1.h                     | 2 --
 src/overlays/actors/ovl_En_Ssh/z_en_ssh.h                       | 2 --
 src/overlays/actors/ovl_En_St/z_en_st.h                         | 2 --
 src/overlays/actors/ovl_En_Sth/z_en_sth.h                       | 2 --
 src/overlays/actors/ovl_En_Sth2/z_en_sth2.h                     | 2 --
 src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h     | 2 --
 src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h       | 2 --
 src/overlays/actors/ovl_En_Stream/z_en_stream.h                 | 2 --
 src/overlays/actors/ovl_En_Suttari/z_en_suttari.h               | 2 --
 src/overlays/actors/ovl_En_Sw/z_en_sw.h                         | 2 --
 src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h     | 2 --
 .../actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h      | 2 --
 src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h       | 2 --
 src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h   | 2 --
 src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h         | 2 --
 src/overlays/actors/ovl_En_Tab/z_en_tab.h                       | 2 --
 src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h               | 2 --
 src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h             | 2 --
 src/overlays/actors/ovl_En_Talk/z_en_talk.h                     | 2 --
 src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h         | 2 --
 src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h               | 2 --
 src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h               | 2 --
 src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h               | 2 --
 src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h               | 2 --
 src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h               | 2 --
 src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h               | 2 --
 src/overlays/actors/ovl_En_Test/z_en_test.h                     | 2 --
 src/overlays/actors/ovl_En_Test2/z_en_test2.h                   | 2 --
 src/overlays/actors/ovl_En_Test3/z_en_test3.h                   | 2 --
 src/overlays/actors/ovl_En_Test4/z_en_test4.h                   | 2 --
 src/overlays/actors/ovl_En_Test5/z_en_test5.h                   | 2 --
 src/overlays/actors/ovl_En_Test6/z_en_test6.h                   | 2 --
 src/overlays/actors/ovl_En_Test7/z_en_test7.h                   | 2 --
 src/overlays/actors/ovl_En_Tg/z_en_tg.h                         | 2 --
 src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h           | 2 --
 src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h             | 2 --
 src/overlays/actors/ovl_En_Tite/z_en_tite.h                     | 2 --
 src/overlays/actors/ovl_En_Tk/z_en_tk.h                         | 2 --
 src/overlays/actors/ovl_En_Torch/z_en_torch.h                   | 2 --
 src/overlays/actors/ovl_En_Torch2/z_en_torch2.h                 | 2 --
 src/overlays/actors/ovl_En_Toto/z_en_toto.h                     | 2 --
 src/overlays/actors/ovl_En_Trt/z_en_trt.h                       | 2 --
 src/overlays/actors/ovl_En_Trt2/z_en_trt2.h                     | 2 --
 src/overlays/actors/ovl_En_Tru/z_en_tru.h                       | 2 --
 src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h                 | 2 --
 src/overlays/actors/ovl_En_Tsn/z_en_tsn.h                       | 2 --
 src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h           | 2 --
 src/overlays/actors/ovl_En_Twig/z_en_twig.h                     | 2 --
 src/overlays/actors/ovl_En_Viewer/z_en_viewer.h                 | 2 --
 src/overlays/actors/ovl_En_Vm/z_en_vm.h                         | 2 --
 src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h               | 2 --
 src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h             | 2 --
 src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h             | 2 --
 src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h     | 2 --
 src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h                 | 2 --
 src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h       | 2 --
 src/overlays/actors/ovl_En_Wf/z_en_wf.h                         | 2 --
 src/overlays/actors/ovl_En_Wiz/z_en_wiz.h                       | 2 --
 src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h           | 2 --
 src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h             | 2 --
 src/overlays/actors/ovl_En_Wood02/z_en_wood02.h                 | 2 --
 src/overlays/actors/ovl_En_Zl1/z_en_zl1.h                       | 2 --
 src/overlays/actors/ovl_En_Zl4/z_en_zl4.h                       | 2 --
 src/overlays/actors/ovl_En_Zob/z_en_zob.h                       | 2 --
 src/overlays/actors/ovl_En_Zod/z_en_zod.h                       | 2 --
 src/overlays/actors/ovl_En_Zog/z_en_zog.h                       | 2 --
 src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h               | 2 --
 src/overlays/actors/ovl_En_Zos/z_en_zos.h                       | 2 --
 src/overlays/actors/ovl_En_Zot/z_en_zot.h                       | 2 --
 src/overlays/actors/ovl_En_Zov/z_en_zov.h                       | 2 --
 src/overlays/actors/ovl_En_Zow/z_en_zow.h                       | 2 --
 src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h           | 2 --
 src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h         | 2 --
 src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h               | 2 --
 src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h                     | 2 --
 src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h                   | 2 --
 src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h                   | 2 --
 src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h                   | 2 --
 src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h                 | 2 --
 src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h                   | 2 --
 src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h                   | 2 --
 src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h         | 2 --
 src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h         | 2 --
 src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h                   | 2 --
 src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h             | 2 --
 src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h                   | 2 --
 src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h                   | 2 --
 src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h             | 2 --
 src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h                   | 2 --
 src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h       | 2 --
 src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h                   | 2 --
 src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h               | 2 --
 src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h               | 2 --
 src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h                   | 2 --
 src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h             | 2 --
 src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h               | 2 --
 src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h               | 2 --
 src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h           | 2 --
 src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h       | 2 --
 src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h         | 2 --
 src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h                 | 2 --
 src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h                 | 2 --
 src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h                 | 2 --
 src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h     | 2 --
 src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h       | 2 --
 src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h             | 2 --
 src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h             | 2 --
 src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h                   | 2 --
 src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h               | 2 --
 src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h               | 2 --
 src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h             | 2 --
 src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h             | 2 --
 src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h     | 2 --
 src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h               | 2 --
 src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h           | 2 --
 src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h           | 2 --
 src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h           | 2 --
 src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h     | 2 --
 src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h   | 2 --
 src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h         | 2 --
 src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h               | 2 --
 src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h             | 2 --
 src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h               | 2 --
 src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h               | 2 --
 src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h                   | 2 --
 src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h       | 2 --
 src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h     | 2 --
 src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h   | 2 --
 src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h     | 2 --
 src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h   | 2 --
 src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h           | 2 --
 src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h                   | 2 --
 src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h       | 2 --
 src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h             | 2 --
 src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h                   | 2 --
 src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h                 | 2 --
 src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h                 | 2 --
 src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h               | 2 --
 src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h     | 2 --
 src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h           | 2 --
 src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h               | 2 --
 src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h           | 2 --
 src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h           | 2 --
 src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h         | 2 --
 src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h             | 2 --
 src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h             | 2 --
 src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h       | 2 --
 src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h                 | 2 --
 src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h           | 2 --
 src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h         | 2 --
 src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h                 | 2 --
 src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h       | 2 --
 src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h         | 2 --
 src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h               | 2 --
 src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h             | 2 --
 src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h           | 2 --
 src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h | 2 --
 src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h                   | 2 --
 src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h                   | 2 --
 src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h       | 2 --
 src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h   | 2 --
 src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h   | 2 --
 src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h           | 2 --
 src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h               | 2 --
 src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h                   | 2 --
 src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h                 | 2 --
 src/overlays/actors/ovl_Obj_Um/z_obj_um.h                       | 2 --
 src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h             | 2 --
 src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h         | 2 --
 src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h       | 2 --
 src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h         | 2 --
 src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h                   | 2 --
 src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h                 | 2 --
 src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h               | 2 --
 src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h         | 2 --
 src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h                   | 2 --
 src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h                   | 2 --
 src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h         | 2 --
 src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h               | 2 --
 src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h             | 2 --
 src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h               | 2 --
 src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h             | 2 --
 src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h             | 2 --
 src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h             | 2 --
 src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h             | 2 --
 src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h             | 2 --
 src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h             | 2 --
 src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h                   | 2 --
 src/overlays/actors/ovl_TG_Sw/z_tg_sw.h                         | 2 --
 560 files changed, 1120 deletions(-)

diff --git a/docs/tutorial/beginning_decomp.md b/docs/tutorial/beginning_decomp.md
index eadfa9adc5..417395dd41 100644
--- a/docs/tutorial/beginning_decomp.md
+++ b/docs/tutorial/beginning_decomp.md
@@ -122,8 +122,6 @@ typedef struct EnRecepgirl {
     /* 0x02AC */ char unk_2AC[0x8];
 } EnRecepgirl; // size = 0x2B4
 
-extern const ActorInit En_Recepgirl_InitVars;
-
 #endif // Z_EN_RECEPGIRL_H
 ```
 
diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
index cee615da1e..13ddded53f 100644
--- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
+++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
@@ -20,6 +20,4 @@ typedef struct ArmsHook {
     /* 0x20C */ ArmsHookActionFunc actionFunc;
 } ArmsHook; // size = 0x210
 
-extern const ActorInit Arms_Hook_InitVars;
-
 #endif // Z_ARMS_HOOK_H
diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h
index ce43cc5ed9..1d0c09dcb0 100644
--- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h
+++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h
@@ -21,6 +21,4 @@ typedef struct ArrowFire {
 } ArrowFire; // size = 0x264
 
 
-extern const ActorInit Arrow_Fire_InitVars;
-
 #endif // Z_ARROW_FIRE_H
diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
index a90cfe0aeb..bf7a1ae513 100644
--- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
+++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
@@ -18,6 +18,4 @@ typedef struct ArrowIce {
     /* 0x160 */ ArrowIceActionFunc actionFunc;
 } ArrowIce; // size = 0x164
 
-extern const ActorInit Arrow_Ice_InitVars;
-
 #endif // Z_ARROW_ICE_H
diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h
index bf58b1e402..0f42435cab 100644
--- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h
+++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h
@@ -19,6 +19,4 @@ typedef struct ArrowLight {
 } ArrowLight; // size = 0x164
 
 
-extern const ActorInit Arrow_Light_InitVars;
-
 #endif // Z_ARROW_LIGHT_H
diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h
index 58b60b9445..4f42a8b3c3 100644
--- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h
+++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h
@@ -15,6 +15,4 @@ typedef struct BgAstrBombwall {
     /* 0x180 */ ColliderTrisElement colliderElements[2];
     /* 0x238 */ s16 cutscenes[1];
 } BgAstrBombwall;
-extern const ActorInit Bg_Astr_Bombwall_InitVars;
-
 #endif // Z_BG_ASTR_BOMBWALL_H
diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h
index 529b5a904f..6cb290f659 100644
--- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h
+++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.h
@@ -13,6 +13,4 @@ typedef struct BgBotihasira {
     /* 0x160 */ ColliderCylinder collider;
 } BgBotihasira; // size = 0x1AC
 
-extern const ActorInit Bg_Botihasira_InitVars;
-
 #endif // Z_BG_BOTIHASIRA_H
diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
index 77c1b88089..bcdda23272 100644
--- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
+++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
@@ -26,6 +26,4 @@ typedef struct BgBreakwall {
     /* 0x160 */ BgBreakwallActionFunc actionFunc;
 } BgBreakwall; // size = 0x164
 
-extern const ActorInit Bg_Breakwall_InitVars;
-
 #endif // Z_BG_BREAKWALL_H
diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h
index c1e4940d62..a4e8b4549a 100644
--- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h
+++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h
@@ -16,6 +16,4 @@ typedef struct BgCraceMovebg {
     /* 0x174 */ char unk_174[0x20];
 } BgCraceMovebg; // size = 0x194
 
-extern const ActorInit Bg_Crace_Movebg_InitVars;
-
 #endif // Z_BG_CRACE_MOVEBG_H
diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h
index 952a13c4a9..afea1bf0d6 100644
--- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h
+++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.h
@@ -19,6 +19,4 @@ typedef struct BgCtowerGear {
     /* 0x000 */ DynaPolyActor dyna;
 } BgCtowerGear; // size = 0x15C
 
-extern const ActorInit Bg_Ctower_Gear_InitVars;
-
 #endif // Z_BG_CTOWER_GEAR_H
diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h
index e8b83fa226..52a905ed56 100644
--- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h
+++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.h
@@ -21,6 +21,4 @@ typedef struct BgCtowerRot {
     /* 0x164 */ f32 timer;
 } BgCtowerRot; // size = 0x168
 
-extern const ActorInit Bg_Ctower_Rot_InitVars;
-
 #endif // Z_BG_CTOWER_ROT_H
diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h
index 1bdf179338..c99bb813fa 100644
--- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h
+++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h
@@ -15,6 +15,4 @@ typedef struct BgDanpeiMovebg {
     /* 0x1CE */ char unk_1CE[0xA];
 } BgDanpeiMovebg; // size = 0x1D8
 
-extern const ActorInit Bg_Danpei_Movebg_InitVars;
-
 #endif // Z_BG_DANPEI_MOVEBG_H
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h
index 098f967703..f2200e96fe 100644
--- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h
+++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.h
@@ -44,6 +44,4 @@ typedef struct BgDblueBalance {
     /* 0x228 */ f32 unk_228;
 } BgDblueBalance; // size = 0x22C
 
-extern const ActorInit Bg_Dblue_Balance_InitVars;
-
 #endif // Z_BG_DBLUE_BALANCE_H
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h
index db6cba5b46..89a18dd0ca 100644
--- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h
+++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.h
@@ -14,6 +14,4 @@ typedef struct BgDblueElevator {
     /* 0x160 */ char unk_160[0x10];
 } BgDblueElevator; // size = 0x170
 
-extern const ActorInit Bg_Dblue_Elevator_InitVars;
-
 #endif // Z_BG_DBLUE_ELEVATOR_H
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h
index 83fb1df621..dbc53a8d14 100644
--- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h
+++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h
@@ -55,6 +55,4 @@ typedef struct BgDblueMovebg {
     /* 0x310 */ UNK_TYPE1 unk310[0x60];
 } BgDblueMovebg; // size = 0x370
 
-extern const ActorInit Bg_Dblue_Movebg_InitVars;
-
 #endif // Z_BG_DBLUE_MOVEBG_H
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h
index c02b826195..5ab64495e2 100644
--- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h
+++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.h
@@ -28,6 +28,4 @@ typedef struct BgDblueWaterfall {
     /* 0x1A8 */ f32 unk_1A8;
 } BgDblueWaterfall; // size = 0x1AC
 
-extern const ActorInit Bg_Dblue_Waterfall_InitVars;
-
 #endif // Z_BG_DBLUE_WATERFALL_H
diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h
index c4d824dc09..bb30e988cd 100644
--- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h
+++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.h
@@ -14,6 +14,4 @@ typedef struct BgDkjailIvy {
     /* 0x1AC */ char unk_1AC[0x4];
 } BgDkjailIvy; // size = 0x1B0
 
-extern const ActorInit Bg_Dkjail_Ivy_InitVars;
-
 #endif // Z_BG_DKJAIL_IVY_H
diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
index 5d9d847490..bd06cdb384 100644
--- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
+++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
@@ -13,6 +13,4 @@ typedef struct BgDyYoseizo {
     /* 0x0148 */ char unk_148[0x33BC];
 } BgDyYoseizo; // size = 0x3504
 
-extern const ActorInit Bg_Dy_Yoseizo_InitVars;
-
 #endif // Z_BG_DY_YOSEIZO_H
diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h
index df21bf9336..37a5c360e1 100644
--- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h
+++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.h
@@ -19,6 +19,4 @@ typedef struct BgF40Block {
     /* 0x16C */ BgF40BlockActionFunc actionFunc;
 } BgF40Block; // size = 0x170
 
-extern const ActorInit Bg_F40_Block_InitVars;
-
 #endif // Z_BG_F40_BLOCK_H
diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h
index 95b2e9073a..4bdb16e3ec 100644
--- a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h
+++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.h
@@ -13,6 +13,4 @@ typedef struct BgF40Flift {
     /* 0x160 */ s32 timer;
 } BgF40Flift; // size = 0x164
 
-extern const ActorInit Bg_F40_Flift_InitVars;
-
 #endif // Z_BG_F40_FLIFT_H
diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h
index b0fe89341a..cfa8c54623 100644
--- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h
+++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.h
@@ -20,6 +20,4 @@ typedef struct BgF40Switch {
     /* 0x164 */ BgF40SwitchActionFunc actionFunc;
 } BgF40Switch; // size = 0x168
 
-extern const ActorInit Bg_F40_Switch_InitVars;
-
 #endif // Z_BG_F40_SWITCH_H
diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h
index 48a369e305..a687fc642a 100644
--- a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h
+++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.h
@@ -10,6 +10,4 @@ typedef struct BgF40Swlift {
     /* 0x144 */ char unk_144[0x1C];
 } BgF40Swlift; // size = 0x160
 
-extern const ActorInit Bg_F40_Swlift_InitVars;
-
 #endif // Z_BG_F40_SWLIFT_H
diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h
index 018e9f5f12..3c8eb19826 100644
--- a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h
+++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.h
@@ -21,6 +21,4 @@ typedef struct BgFireWall {
     /* 0x164 */ ColliderCylinder collider;
 } BgFireWall; // size = 0x1B0
 
-extern const ActorInit Bg_Fire_Wall_InitVars;
-
 #endif // Z_BG_FIRE_WALL_H
diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h
index 6937fbf534..b09083519a 100644
--- a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h
+++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.h
@@ -15,6 +15,4 @@ typedef struct BgFuKaiten {
     /* 0x16C */ s16 bounce;
 } BgFuKaiten; // size = 0x170
 
-extern const ActorInit Bg_Fu_Kaiten_InitVars;
-
 #endif // Z_BG_FU_KAITEN_H
diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h
index 89b1df3236..d17f64638b 100644
--- a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h
+++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.h
@@ -11,6 +11,4 @@ typedef struct BgFuMizu {
     /* 0x160 */ s16 unk_160;
 } BgFuMizu; // size = 0x164
 
-extern const ActorInit Bg_Fu_Mizu_InitVars;
-
 #endif // Z_BG_FU_MIZU_H
diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h
index 6a37e36254..9e5bd1c43f 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.h
@@ -16,6 +16,4 @@ typedef struct BgHakaBombwall {
     /* 0x1AC */ s8 csTimer;
 } BgHakaBombwall; // size = 0x1B0
 
-extern const ActorInit Bg_Haka_Bombwall_InitVars;
-
 #endif // Z_BG_HAKA_BOMBWALL_H
diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h
index 4b5e564b28..ab5ec0e89e 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.h
@@ -12,6 +12,4 @@ typedef struct BgHakaCurtain {
     /* 0x15C */ BgHakaCurtainActionFunc actionFunc;
 } BgHakaCurtain; // size = 0x160
 
-extern const ActorInit Bg_Haka_Curtain_InitVars;
-
 #endif // Z_BG_HAKA_CURTAIN_H
diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h
index c1cefddc8b..3c607e0e25 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h
@@ -13,6 +13,4 @@ typedef struct BgHakaTomb {
     /* 0x160 */ s16 cutscenes[1];
 } BgHakaTomb; // size = 0x164
 
-extern const ActorInit Bg_Haka_Tomb_InitVars;
-
 #endif // Z_BG_HAKA_TOMB_H
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h
index f849b356f1..24b04139e0 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.h
@@ -19,6 +19,4 @@ typedef struct BgHakuginBombwall {
     /* 0x1AC */ s32 unk_1AC;
 } BgHakuginBombwall; // size = 0x1B0
 
-extern const ActorInit Bg_Hakugin_Bombwall_InitVars;
-
 #endif // Z_BG_HAKUGIN_BOMBWALL_H
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h
index 777c498640..c821a6bc2e 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.h
@@ -13,6 +13,4 @@ typedef struct BgHakuginElvpole {
     /* 0x164 */ BgHakuginElvpoleActionFunc actionFunc;
 } BgHakuginElvpole; // size = 0x168
 
-extern const ActorInit Bg_Hakugin_Elvpole_InitVars;
-
 #endif // Z_BG_HAKUGIN_ELVPOLE_H
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h
index 8e702a0063..5a23fa070b 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.h
@@ -70,6 +70,4 @@ typedef struct BgHakuginPost {
     /* 0x186 */ s16 unk_186;
 } BgHakuginPost; // size = 0x188
 
-extern const ActorInit Bg_Hakugin_Post_InitVars;
-
 #endif // Z_BG_HAKUGIN_POST_H
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h
index 74757f8369..164220b29e 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.h
@@ -32,6 +32,4 @@ typedef struct BgHakuginSwitch {
     /* 0x1C8 */ f32 unk_1C8;
 } BgHakuginSwitch; // size = 0x1CC
 
-extern const ActorInit Bg_Hakugin_Switch_InitVars;
-
 #endif // Z_BG_HAKUGIN_SWITCH_H
diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h
index 91c007d262..0278089cf9 100644
--- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h
+++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.h
@@ -13,6 +13,4 @@ typedef struct BgIcefloe {
     /* 0x160 */ s32 timer;
 } BgIcefloe; // size = 0x164
 
-extern const ActorInit Bg_Icefloe_InitVars;
-
 #endif // Z_BG_ICEFLOE_H
diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h
index 20450f9299..b8f432458c 100644
--- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h
+++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.h
@@ -23,6 +23,4 @@ typedef struct BgIcicle {
     /* 0x164 */ ColliderCylinder collider;
 } BgIcicle; // size = 0x1B0
 
-extern const ActorInit Bg_Icicle_InitVars;
-
 #endif // Z_BG_ICICLE_H
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h
index 5c5281911d..416a1c2dc1 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h
+++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h
@@ -24,6 +24,4 @@ typedef struct BgIkanaBlock {
     /* 0x17F */ s8 unk_17F;
 } BgIkanaBlock; // size = 0x180
 
-extern const ActorInit Bg_Ikana_Block_InitVars;
-
 #endif // Z_BG_IKANA_BLOCK_H
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h
index da11bcfea4..e9ff850ada 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h
+++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.h
@@ -17,6 +17,4 @@ typedef struct BgIkanaBombwall {
     /* 0x1AC */ s8 unk_1AC;
 } BgIkanaBombwall; // size = 0x1B0
 
-extern const ActorInit Bg_Ikana_Bombwall_InitVars;
-
 #endif // Z_BG_IKANA_BOMBWALL_H
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h
index 4642a43694..ac1bcadf0e 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h
+++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h
@@ -19,6 +19,4 @@ typedef struct BgIkanaDharma {
     /* 0x1AC */ s8 cutsceneFramesRemaining;
 } BgIkanaDharma; // size = 0x1B0
 
-extern const ActorInit Bg_Ikana_Dharma_InitVars;
-
 #endif // Z_BG_IKANA_DHARMA_H
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h
index 9aa4f89d4a..79d406fde3 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h
+++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.h
@@ -16,6 +16,4 @@ typedef struct BgIkanaRay {
     /* 0x194 */ BgIkanaRayActionFunc actionFunc;
 } BgIkanaRay; // size = 0x198
 
-extern const ActorInit Bg_Ikana_Ray_InitVars;
-
 #endif // Z_BG_IKANA_RAY_H
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h
index 89021fa541..4184220e01 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h
+++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h
@@ -49,6 +49,4 @@ typedef struct BgIkanaRotaryroom {
     /* 0x584 */ s16 unk_584;
 } BgIkanaRotaryroom; // size = 0x588
 
-extern const ActorInit Bg_Ikana_Rotaryroom_InitVars;
-
 #endif // Z_BG_IKANA_ROTARYROOM_H
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h
index 1d39f3593a..0943346006 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h
+++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.h
@@ -12,6 +12,4 @@ typedef struct BgIkanaShutter {
     /* 0x15C */ BgIkanaShutterActionFunc actionFunc;
 } BgIkanaShutter; // size = 0x160
 
-extern const ActorInit Bg_Ikana_Shutter_InitVars;
-
 #endif // Z_BG_IKANA_SHUTTER_H
diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h
index f5f5b384f8..9f860108ba 100644
--- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h
+++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.h
@@ -19,6 +19,4 @@ typedef struct BgIkninSusceil {
     /* 0x16A */ UNK_TYPE2 unk16A;
 } BgIkninSusceil; // size = 0x16C
 
-extern const ActorInit Bg_Iknin_Susceil_InitVars;
-
 #endif // Z_BG_IKNIN_SUSCEIL_H
diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h
index d9c4f78ada..f363938697 100644
--- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h
+++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.h
@@ -23,6 +23,4 @@ typedef struct BgIknvDoukutu {
     /* 0x164 */ BgIknvDoukutuActionFunc actionFunc;
 } BgIknvDoukutu;// size = 0x168
 
-extern const ActorInit Bg_Iknv_Doukutu_InitVars;
-
 #endif // Z_BG_IKNV_DOUKUTU_H
diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h
index 333b9d59e3..a5c01165d5 100644
--- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h
+++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.h
@@ -22,6 +22,4 @@ typedef enum {
     /* 2 */ IKNV_OBJ_SAKON_DOOR,  // door to Sakon's Hideout
 } BgIknvObjType;
 
-extern const ActorInit Bg_Iknv_Obj_InitVars;
-
 #endif // Z_BG_IKNV_OBJ_H
diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
index b38ce2eeb4..cc0befd194 100644
--- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
+++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
@@ -26,6 +26,4 @@ typedef struct BgIngate {
     /* 0x18C */ s32 timePathElapsedTime;
 } BgIngate; // size = 0x190
 
-extern const ActorInit Bg_Ingate_InitVars;
-
 #endif // Z_BG_INGATE_H
diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h
index 92494a35f9..d35328c3da 100644
--- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h
+++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.h
@@ -14,6 +14,4 @@ typedef struct BgInibsMovebg {
     /* 0x164 */ AnimatedMaterial* unk_164;
 } BgInibsMovebg; // size = 0x168
 
-extern const ActorInit Bg_Inibs_Movebg_InitVars;
-
 #endif // Z_BG_INIBS_MOVEBG_H
diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h
index c39994d779..6a3bad9c87 100644
--- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h
+++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h
@@ -16,6 +16,4 @@ typedef struct BgKeikokuSaku {
     /* 0x162 */ s16 timer;
 } BgKeikokuSaku; // Size = 0x164
 
-extern const ActorInit Bg_Keikoku_Saku_InitVars;
-
 #endif // Z_BG_KEIKOKU_SAKU_H
diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h
index ca72665b8e..9686a44a1b 100644
--- a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h
+++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.h
@@ -9,6 +9,4 @@ typedef struct BgKeikokuSpr {
     /* 0x000 */ Actor actor;
 } BgKeikokuSpr; // size = 0x144
 
-extern const ActorInit Bg_Keikoku_Spr_InitVars;
-
 #endif // Z_BG_KEIKOKU_SPR_H
diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h
index 00d08b85f9..98bb51243d 100644
--- a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h
+++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.h
@@ -17,6 +17,4 @@ typedef struct BgKin2Fence {
     /* 0x282 */ s8 waitBeforeOpenTimer;
 } BgKin2Fence; // size = 0x284
 
-extern const ActorInit Bg_Kin2_Fence_InitVars;
-
 #endif // Z_BG_KIN2_FENCE_H
diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h
index 19651ef575..458c7f6eb0 100644
--- a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h
+++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.h
@@ -14,6 +14,4 @@ typedef struct BgKin2Picture {
     /* 0x238 */ char unk_238[0xC];
 } BgKin2Picture; // size = 0x244
 
-extern const ActorInit Bg_Kin2_Picture_InitVars;
-
 #endif // Z_BG_KIN2_PICTURE_H
diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h
index ce88b25e0b..bd5180c345 100644
--- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h
+++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.h
@@ -19,6 +19,4 @@ typedef struct BgKin2Shelf {
     /* 0x167 */ s8 unk_167;
 } BgKin2Shelf; // size = 0x168
 
-extern const ActorInit Bg_Kin2_Shelf_InitVars;
-
 #endif // Z_BG_KIN2_SHELF_H
diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h
index e5fe13b749..2d0618eff2 100644
--- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h
+++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.h
@@ -24,6 +24,4 @@ typedef enum {
     LADDER_SIZE_24RUNG,
 } BgLadderSize;
 
-extern const ActorInit Bg_Ladder_InitVars;
-
 #endif // Z_BG_LADDER_H
diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h
index c393b55af7..7e1c7fbe34 100644
--- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h
+++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.h
@@ -14,6 +14,4 @@ typedef struct BgLastBwall {
     /* 0x160 */ char unk_160[0xDC];
 } BgLastBwall; // size = 0x23C
 
-extern const ActorInit Bg_Last_Bwall_InitVars;
-
 #endif // Z_BG_LAST_BWALL_H
diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h
index 069bfa0489..2874a2d139 100644
--- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h
+++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.h
@@ -10,6 +10,4 @@ typedef struct BgLbfshot {
     /* 0x15C */ UNK_TYPE1 pad15C[0x4];
 } BgLbfshot; // size = 0x160
 
-extern const ActorInit Bg_Lbfshot_InitVars;
-
 #endif // Z_BG_LBFSHOT_H
diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h
index a4d8f2ebbc..540c21b0e0 100644
--- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h
+++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.h
@@ -16,6 +16,4 @@ typedef struct BgLotus {
     /* 0x168 */ s16 timer2;
 } BgLotus; // size = 0x16C
 
-extern const ActorInit Bg_Lotus_InitVars;
-
 #endif // Z_BG_LOTUS_H
diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h
index aa98c0aa1b..f580aeb895 100644
--- a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h
+++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.h
@@ -9,6 +9,4 @@ typedef struct BgMarketStep {
     /* 0x000 */ Actor actor;
 } BgMarketStep; // size = 0x144
 
-extern const ActorInit Bg_Market_Step_InitVars;
-
 #endif // Z_BG_MARKET_STEP_H
diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h
index ee4854d073..0d93264647 100644
--- a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h
+++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.h
@@ -9,6 +9,4 @@ typedef struct BgMbarChair {
     /* 0x000 */ DynaPolyActor dyna;
 } BgMbarChair; // size = 0x15C
 
-extern const ActorInit Bg_Mbar_Chair_InitVars;
-
 #endif // Z_BG_MBAR_CHAIR_H
diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h
index e715b5c09d..fd71577cd8 100644
--- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h
+++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.h
@@ -40,6 +40,4 @@ typedef struct BgNumaHana {
     /* 0x33E */ s16 transitionTimer;
 } BgNumaHana; // size = 0x340
 
-extern const ActorInit Bg_Numa_Hana_InitVars;
-
 #endif // Z_BG_NUMA_HANA_H
diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h
index fdf2791e13..f6c6067d4b 100644
--- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h
+++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.h
@@ -16,6 +16,4 @@ typedef struct BgOpenShutter {
     /* 0x164 */ s32 unk_164;
 } BgOpenShutter; // size = 0x168
 
-extern const ActorInit Bg_Open_Shutter_InitVars;
-
 #endif // Z_BG_OPEN_SHUTTER_H
diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h
index 3a2b92125c..0cc4d55b9c 100644
--- a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h
+++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.h
@@ -10,6 +10,4 @@ typedef struct BgOpenSpot {
     /* 0x144 */ AnimatedMaterial* texScrolls;
 } BgOpenSpot; // size = 0x148
 
-extern const ActorInit Bg_Open_Spot_InitVars;
-
 #endif // Z_BG_OPEN_SPOT_H
diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h
index bc39da0ee1..abb341797b 100644
--- a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h
+++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.h
@@ -17,6 +17,4 @@ typedef struct BgSinkaiKabe {
     /* 0x16C */ s32 pythonIndex;
 } BgSinkaiKabe; // size = 0x170
 
-extern const ActorInit Bg_Sinkai_Kabe_InitVars;
-
 #endif // Z_BG_SINKAI_KABE_H
diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h
index 64a6fd34b0..c57353ce0e 100644
--- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h
+++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h
@@ -24,6 +24,4 @@ typedef struct BgSpdweb {
     /* 0x2F8 */ Vec3s* unk_2F8;
 } BgSpdweb; // size = 0x2FC
 
-extern const ActorInit Bg_Spdweb_InitVars;
-
 #endif // Z_BG_SPDWEB_H
diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h
index 808b720617..5cbf36a054 100644
--- a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h
+++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.h
@@ -15,6 +15,4 @@ typedef struct BgSpoutFire {
     /* 0x14C */ ColliderCylinder collider;
 } BgSpoutFire; // size = 0x198
 
-extern const ActorInit Bg_Spout_Fire_InitVars;
-
 #endif // Z_BG_SPOUT_FIRE_H
diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h
index 559ea6351d..14a5e1b8e1 100644
--- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h
+++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.h
@@ -17,6 +17,4 @@ typedef struct BgTobira01 {
     /* 0x16C */ s32 unk_16C; // unused besides being set to 0
 } BgTobira01; // size = 0x170
 
-extern const ActorInit Bg_Tobira01_InitVars;
-
 #endif // Z_BG_TOBIRA01_H
diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h
index 22fe9ca44f..4e68899a90 100644
--- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h
+++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h
@@ -10,6 +10,4 @@ typedef struct BgUmajump {
     /* 0x144 */ char unk_144[0x28];
 } BgUmajump; // size = 0x16C
 
-extern const ActorInit Bg_Umajump_InitVars;
-
 #endif // Z_BG_UMAJUMP_H
diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.h b/src/overlays/actors/ovl_Boss_01/z_boss_01.h
index 3d874a01fd..37c8d4b006 100644
--- a/src/overlays/actors/ovl_Boss_01/z_boss_01.h
+++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.h
@@ -14,6 +14,4 @@ typedef struct Boss01 {
     /* 0x468 */ char unk_468[0x674];
 } Boss01; // size = 0xADC
 
-extern const ActorInit Boss_01_InitVars;
-
 #endif // Z_BOSS_01_H
diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.h b/src/overlays/actors/ovl_Boss_02/z_boss_02.h
index 17028912b7..e7efc1199b 100644
--- a/src/overlays/actors/ovl_Boss_02/z_boss_02.h
+++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.h
@@ -108,6 +108,4 @@ typedef struct Boss02 {
     /* 0x1D7E */ s16 unk_1D7E;
 } Boss02; // size = 0x1D80
 
-extern const ActorInit Boss_02_InitVars;
-
 #endif // Z_BOSS_02_H
diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.h b/src/overlays/actors/ovl_Boss_04/z_boss_04.h
index c0944ce82d..6aa1535970 100644
--- a/src/overlays/actors/ovl_Boss_04/z_boss_04.h
+++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.h
@@ -76,6 +76,4 @@ typedef struct Boss04 {
     /* 0x74A */ u8 unk_74A;
 } Boss04; // size = 0x74C
 
-extern const ActorInit Boss_04_InitVars;
-
 #endif // Z_BOSS_04_H
diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.h b/src/overlays/actors/ovl_Boss_05/z_boss_05.h
index 7a3f295070..8f46476eae 100644
--- a/src/overlays/actors/ovl_Boss_05/z_boss_05.h
+++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.h
@@ -14,6 +14,4 @@ typedef struct Boss05 {
     /* 0x174 */ char unk_174[0x394];
 } Boss05; // size = 0x508
 
-extern const ActorInit Boss_05_InitVars;
-
 #endif // Z_BOSS_05_H
diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.h b/src/overlays/actors/ovl_Boss_06/z_boss_06.h
index 39d2f900af..f7b4d3ec05 100644
--- a/src/overlays/actors/ovl_Boss_06/z_boss_06.h
+++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.h
@@ -50,6 +50,4 @@ typedef struct Boss06 {
     /* 0xA2C */ f32 unk_A2C;
 } Boss06; // size = 0xA30
 
-extern const ActorInit Boss_06_InitVars;
-
 #endif // Z_BOSS_06_H
diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.h b/src/overlays/actors/ovl_Boss_07/z_boss_07.h
index f8a4d4d91a..d17e3b1723 100644
--- a/src/overlays/actors/ovl_Boss_07/z_boss_07.h
+++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.h
@@ -13,6 +13,4 @@ typedef struct Boss07 {
     /* 0x0148 */ char unk_148[0xAAD8];
 } Boss07; // size = 0xAC20
 
-extern const ActorInit Boss_07_InitVars;
-
 #endif // Z_BOSS_07_H
diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h
index ce809a32a1..d8ae5d3519 100644
--- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h
+++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h
@@ -27,6 +27,4 @@ typedef struct BossHakugin {
     /* 0x2618 */ char unk_2618[0x11F8];
 } BossHakugin; // size = 0x3810
 
-extern const ActorInit Boss_Hakugin_InitVars;
-
 #endif // Z_BOSS_HAKUGIN_H
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
index 985e2c30c5..9901a31898 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
@@ -34,6 +34,4 @@ typedef struct DemoEffect {
     /* 0x178 */ DemoEffectActionFunc actionFunc;
 } DemoEffect; // size = 0x17C
 
-extern const ActorInit Demo_Effect_InitVars;
-
 #endif // Z_DEMO_EFFECT_H
diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h
index acc2c0312d..91c7dc97e9 100644
--- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h
+++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.h
@@ -17,6 +17,4 @@ typedef struct DemoGetitem {
     /* 0x14C */ DemoGetitemActionFunc actionFunc;
 } DemoGetitem; // size = 0x150
 
-extern const ActorInit Demo_Getitem_InitVars;
-
 #endif // Z_DEMO_GETITEM_H
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
index f6f05d0a6d..971adb3bd2 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
@@ -48,6 +48,4 @@ typedef enum {
     /* 3 */ DEMO_KANKYO_STATE_DISABLED,
 } DemoKankyoStateType;
 
-extern const ActorInit Demo_Kankyo_InitVars;
-
 #endif // Z_DEMO_KANKYO_H
diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h
index 212e93d841..d36dcb284f 100644
--- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h
+++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.h
@@ -13,6 +13,4 @@ typedef struct DemoMoonend {
     /* 0x2E0 */ DemoMoonendActionFunc actionFunc;
 } DemoMoonend; // size = 0x2E4
 
-extern const ActorInit Demo_Moonend_InitVars;
-
 #endif // Z_DEMO_MOONEND_H
diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h
index 4e375a2436..05707f073c 100644
--- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h
+++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h
@@ -10,6 +10,4 @@ typedef struct DemoShd {
     /* 0x0144 */ char unk_0144[0x118C];
 } DemoShd; // size = 0x12D0
 
-extern const ActorInit Demo_Shd_InitVars;
-
 #endif // Z_DEMO_SHD_H
diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h
index b0a00f2a68..7b60ae951e 100644
--- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h
+++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.h
@@ -37,6 +37,4 @@ typedef struct DemoSyoten {
     /* 0x3F4 */ DemoSyotenActionFunc actionFunc;
 } DemoSyoten; // size = 0x3F8
 
-extern const ActorInit Demo_Syoten_InitVars;
-
 #endif // Z_DEMO_SYOTEN_H
diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
index 83a210b8c5..e6d5d568ca 100644
--- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
+++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
@@ -18,6 +18,4 @@ typedef struct DemoTreLgt {
     /* 0x174 */ s32 animationType;
 } DemoTreLgt; // size = 0x178
 
-extern const ActorInit Demo_Tre_Lgt_InitVars;
-
 #endif // Z_DEMO_TRE_LGT_H
diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h
index f52f92d691..0163f884aa 100644
--- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h
+++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.h
@@ -14,6 +14,4 @@ typedef struct DmAh {
     /* 0x18C */ char unk_18C[0x114];
 } DmAh; // size = 0x2A0
 
-extern const ActorInit Dm_Ah_InitVars;
-
 #endif // Z_DM_AH_H
diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.h b/src/overlays/actors/ovl_Dm_Al/z_dm_al.h
index f15513177c..115601fdd9 100644
--- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.h
+++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.h
@@ -26,6 +26,4 @@ typedef enum {
     /* 0x1 */ MADAME_AROMA_ANIMATION_1
 } DmAlAnimations;
 
-extern const ActorInit Dm_Al_InitVars;
-
 #endif // Z_DM_AL_H
diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.h b/src/overlays/actors/ovl_Dm_An/z_dm_an.h
index 2282fee9c0..2001a8ba6f 100644
--- a/src/overlays/actors/ovl_Dm_An/z_dm_an.h
+++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.h
@@ -36,6 +36,4 @@ typedef struct DmAn {
     /* 0x2D4 */ s32 unk_2D4;
 } DmAn; // size = 0x2D8
 
-extern const ActorInit Dm_An_InitVars;
-
 #endif // Z_DM_AN_H
diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h
index bda05149f2..7b38356538 100644
--- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h
+++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h
@@ -23,6 +23,4 @@ typedef struct DmBal {
     /* 0x33A */ s16 unk_33A;
 } DmBal; /* size = 0x33C */
 
-extern const ActorInit Dm_Bal_InitVars;
-
 #endif // Z_DM_BAL_H
diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h
index 1df0df06db..62ee0cb406 100644
--- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h
+++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.h
@@ -28,6 +28,4 @@ typedef struct DmChar00 {
     /* 0x262 */ u16 unk_262;
 } DmChar00; // size = 0x264
 
-extern const ActorInit Dm_Char00_InitVars;
-
 #endif // Z_DM_CHAR00_H
diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h
index 677a2b59b7..6f29531a04 100644
--- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h
+++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.h
@@ -28,6 +28,4 @@ typedef struct DmChar01 {
     /* 0x34D */ u8 unk_34D;
 } DmChar01; // size = 0x350
 
-extern const ActorInit Dm_Char01_InitVars;
-
 #endif // Z_DM_CHAR01_H
diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h
index 6979894965..7a97225545 100644
--- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h
+++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.h
@@ -18,6 +18,4 @@ typedef struct DmChar02 {
     /* 0x2F0 */ u32 unk_2F0;
 } DmChar02; // size = 0x2F4
 
-extern const ActorInit Dm_Char02_InitVars;
-
 #endif // Z_DM_CHAR02_H
diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h
index f736220c8f..5b4a2e6213 100644
--- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h
+++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.h
@@ -17,6 +17,4 @@ typedef struct DmChar03 {
     /* 0x190 */ Vec3f offset;
 } DmChar03; // size = 0x19C
 
-extern const ActorInit Dm_Char03_InitVars;
-
 #endif // Z_DM_CHAR03_H
diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h
index 91de6d567f..0a7e31bde5 100644
--- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h
+++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.h
@@ -20,6 +20,4 @@ typedef struct DmChar04 {
     /* 0x262 */ u16 timer;
 } DmChar04; // size = 0x264
 
-extern const ActorInit Dm_Char04_InitVars;
-
 #endif // Z_DM_CHAR04_H
diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h
index 212cdb03e1..3bff39f6a0 100644
--- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h
+++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.h
@@ -42,6 +42,4 @@ typedef struct DmChar05 {
     /* 0x1B4 */ u8 unk_1B4;
 } DmChar05; // size = 0x1B8
 
-extern const ActorInit Dm_Char05_InitVars;
-
 #endif // Z_DM_CHAR05_H
diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h
index 49a026063f..bbc6c40f9b 100644
--- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h
+++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.h
@@ -14,6 +14,4 @@ typedef struct DmChar06 {
     /* 0x294 */ char unk_294[0x10];
 } DmChar06; // size = 0x2A4
 
-extern const ActorInit Dm_Char06_InitVars;
-
 #endif // Z_DM_CHAR06_H
diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h
index 39f09856a7..4deedb915b 100644
--- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h
+++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.h
@@ -32,6 +32,4 @@ typedef struct DmChar07 {
     /* 0x2BA */ u8 isStage;
 } DmChar07; // size = 0x2BC
 
-extern const ActorInit Dm_Char07_InitVars;
-
 #endif // Z_DM_CHAR07_H
diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h
index 1718a9fb02..57832d3ff2 100644
--- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h
+++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.h
@@ -14,6 +14,4 @@ typedef struct DmChar08 {
     /* 0x1A4 */ char unk_1A4[0x68];
 } DmChar08; // size = 0x20C
 
-extern const ActorInit Dm_Char08_InitVars;
-
 #endif // Z_DM_CHAR08_H
diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h
index 770c9358c2..b6d3cf0602 100644
--- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h
+++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.h
@@ -14,6 +14,4 @@ typedef struct DmChar09 {
     /* 0x204 */ char unk_204[0x2C];
 } DmChar09; // size = 0x230
 
-extern const ActorInit Dm_Char09_InitVars;
-
 #endif // Z_DM_CHAR09_H
diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h
index b7e45a3a1f..54db8d30fb 100644
--- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h
+++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.h
@@ -36,6 +36,4 @@ typedef struct DmGm {
     /* 0x2D4 */ s32 unk_2D4;
 } DmGm; // size = 0x2D8
 
-extern const ActorInit Dm_Gm_InitVars;
-
 #endif // Z_DM_GM_H
diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h
index 02d12ee7d4..21c9e55dcd 100644
--- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h
+++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.h
@@ -16,6 +16,4 @@ typedef struct DmHina {
     /* 0x160 */ char unk_160[0x24];
 } DmHina; // size = 0x184
 
-extern const ActorInit Dm_Hina_InitVars;
-
 #endif // Z_DM_HINA_H
diff --git a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h
index eafc4ef996..2f5e6d90b1 100644
--- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h
+++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.h
@@ -19,6 +19,4 @@ typedef struct DmNb {
     /* 0x1F8 */ s32 unk1F8;
 } DmNb; // size = 0x1FC
 
-extern const ActorInit Dm_Nb_InitVars;
-
 #endif // Z_DM_NB_H
diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h
index 073efa1bfe..3d9195413b 100644
--- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h
+++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h
@@ -24,6 +24,4 @@ typedef struct DmOpstage {
     /* 0x1A4 */ Vec3f drawOffset;
 } DmOpstage; // size = 0x1B0
 
-extern const ActorInit Dm_Opstage_InitVars;
-
 #endif // Z_DM_OPSTAGE_H
diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h
index d634ec5e93..01b9b52af5 100644
--- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h
+++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.h
@@ -20,6 +20,4 @@ typedef struct DmRavine {
     /* 0x149 */ u8 isActive;
 } DmRavine; // size = 0x14C
 
-extern const ActorInit Dm_Ravine_InitVars;
-
 #endif // Z_DM_RAVINE_H
diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h
index d1d37128b8..3dd827a15c 100644
--- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h
+++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.h
@@ -20,6 +20,4 @@ typedef struct DmSa {
     /* 0x2F0 */ u32 alpha;
 } DmSa; // size = 0x2F4
 
-extern const ActorInit Dm_Sa_InitVars;
-
 #endif // Z_DM_SA_H
diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h
index 1ad123523b..eb06acd01b 100644
--- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h
+++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.h
@@ -10,6 +10,4 @@ typedef struct DmStatue {
     /* 0x144 */ char unk_144[0x50];
 } DmStatue; // size = 0x194
 
-extern const ActorInit Dm_Statue_InitVars;
-
 #endif // Z_DM_STATUE_H
diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h
index ffea612652..f55321ef7c 100644
--- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h
+++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h
@@ -51,6 +51,4 @@ typedef struct DmStk {
     /* 0x33B */ u8 shouldDraw;
 } DmStk; // size = 0x33C
 
-extern const ActorInit Dm_Stk_InitVars;
-
 #endif // Z_DM_STK_H
diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h
index fda9397c7b..aba01ce1ed 100644
--- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h
+++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.h
@@ -14,6 +14,4 @@ typedef struct DmTag {
     /* 0x18C */ char unk_18C[0x20];
 } DmTag; // size = 0x1AC
 
-extern const ActorInit Dm_Tag_InitVars;
-
 #endif // Z_DM_TAG_H
diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h
index e1263ef2d4..e8e62b6c27 100644
--- a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h
+++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.h
@@ -10,6 +10,4 @@ typedef struct DmTsg {
     /* 0x144 */ char unk_144[0x7DC];
 } DmTsg; // size = 0x920
 
-extern const ActorInit Dm_Tsg_InitVars;
-
 #endif // Z_DM_TSG_H
diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h
index 1d9a80166d..21f597748e 100644
--- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h
+++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h
@@ -26,6 +26,4 @@ typedef struct DmZl {
     /* 0x2BC */ UNK_TYPE1 pad2BC[0x18]; // unused by DmZl
 } DmZl; // size = 0x2D4
 
-extern const ActorInit Dm_Zl_InitVars;
-
 #endif // Z_DM_ZL_H
diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h
index 980d0140f9..8e016824d8 100644
--- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h
+++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h
@@ -13,8 +13,6 @@ typedef struct DoorAna {
     /* 0x190 */ DoorAnaActionFunc actionFunc;
 } DoorAna; // size = 0x194
 
-extern const ActorInit Door_Ana_InitVars;
-
 #define DOORANA_TYPE_BITMASK            0x300
 #define DOORANA_TYPE_VISIBLE            0x000
 #define DOORANA_TYPE_HIDDEN_STORMS      0x100 // Incomplete, leftover from OoT 
diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
index 78861d55c9..207337caad 100644
--- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
+++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h
@@ -28,6 +28,4 @@ typedef struct DoorShutter {
     /* 0x016C */ DoorShutterActionFunc actionFunc;
 } DoorShutter; // size = 0x170
 
-extern const ActorInit Door_Shutter_InitVars;
-
 #endif // Z_DOOR_SHUTTER_H
diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h
index 207765e383..ae5487ff03 100644
--- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h
+++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.h
@@ -19,6 +19,4 @@ typedef struct DoorSpiral {
     /* 0x14C */ DoorSpiralActionFunc actionFunc;
 } DoorSpiral; // size = 0x150
 
-extern const ActorInit Door_Spiral_InitVars;
-
 #endif // Z_DOOR_SPIRAL_H
diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
index c57f610a08..076999e576 100644
--- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
+++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
@@ -56,6 +56,4 @@ typedef struct DoorWarp1 {
     /* 0x208 */ u8 unk_208;
 } DoorWarp1; // size = 0x20C
 
-extern const ActorInit Door_Warp1_InitVars;
-
 #endif // Z_DOOR_WARP1_H
diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.h b/src/overlays/actors/ovl_Eff_Change/z_eff_change.h
index aed7e534a8..194ae3ee23 100644
--- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.h
+++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.h
@@ -21,6 +21,4 @@ typedef struct EffChange {
     /* 0x1C8 */ EffChangeActionFunc actionFunc;
 } EffChange; // size = 0x1CC
 
-extern const ActorInit Eff_Change_InitVars;
-
 #endif // Z_EFF_CHANGE_H
diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
index ec864ea4d7..b5b9a89104 100644
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
+++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
@@ -30,6 +30,4 @@ typedef enum {
     /* 0x5 */ EFF_DUST_TYPE_5
 } EffDustType;
 
-extern const ActorInit Eff_Dust_InitVars;
-
 #endif // Z_EFF_DUST_H
diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h
index 9b4713034c..c79537363f 100644
--- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h
+++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.h
@@ -21,6 +21,4 @@ typedef enum params {
     /* 0x1 */ EFFKAMEJIMAWAVE_PARAMS_1
 } EffKamejimaWaveParams;
 
-extern const ActorInit Eff_Kamejima_Wave_InitVars;
-
 #endif // Z_EFF_KAMEJIMA_WAVE_H
diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h
index d1f81a184d..89266d7443 100644
--- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h
+++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.h
@@ -26,6 +26,4 @@ typedef enum EffLastDayParams {
     /* 0x3 */ EFFLASTDAY_PARAMS_3
 } EffLastDayParams;
 
-extern const ActorInit Eff_Lastday_InitVars;
-
 #endif // Z_EFF_LASTDAY_H
diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h
index 9c8d5946ee..4b2b84783c 100644
--- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h
+++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.h
@@ -13,6 +13,4 @@ typedef struct EffStk {
     /* 0x14C */ EffStkActionFunc actionFunc;
 } EffStk; // size = 0x150
 
-extern const ActorInit Eff_Stk_InitVars;
-
 #endif // Z_EFF_STK_H
diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h
index 2ecaf71876..4fdb977d88 100644
--- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h
+++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.h
@@ -16,6 +16,4 @@ typedef struct EffZoraband {
     /* 0x148 */ EffZorabandActionFunc actionFunc;
 } EffZoraband; // size = 0x14C
 
-extern const ActorInit Eff_Zoraband_InitVars;
-
 #endif // Z_EFF_ZORABAND_H
diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
index f335f01584..51a3ddda3d 100644
--- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
+++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
@@ -16,6 +16,4 @@ typedef struct ElfMsg {
     /* 0x144 */ ElfMsgActionFunc actionFunc;
 } ElfMsg; // size = 0x148
 
-extern const ActorInit Elf_Msg_InitVars;
-
 #endif // Z_ELF_MSG_H
diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
index e8b48dfd78..4d9583d207 100644
--- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
+++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
@@ -15,6 +15,4 @@ typedef struct ElfMsg2 {
     /* 0x144 */ ElfMsg2ActionFunc actionFunc;
 } ElfMsg2; // size = 0x148
 
-extern const ActorInit Elf_Msg2_InitVars;
-
 #endif // Z_ELF_MSG2_H
diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h
index cb71166e8d..615cde1eb5 100644
--- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h
+++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h
@@ -16,6 +16,4 @@ typedef struct ElfMsg3 {
     /* 0x144 */ ElfMsg3ActionFunc actionFunc;
 } ElfMsg3; // size = 0x148
 
-extern const ActorInit Elf_Msg3_InitVars;
-
 #endif // Z_ELF_MSG3_H
diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h
index f3d523ba4b..e9ccbc9062 100644
--- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h
+++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h
@@ -17,6 +17,4 @@ typedef struct ElfMsg4 {
     /* 0x148 */ ElfMsg4ActionFunc actionFunc;
 } ElfMsg4; // size = 0x14C
 
-extern const ActorInit Elf_Msg4_InitVars;
-
 #endif // Z_ELF_MSG4_H
diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h
index af25894345..36daecca1e 100644
--- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h
+++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h
@@ -15,6 +15,4 @@ typedef struct ElfMsg5 {
     /* 0x144 */ ElfMsg5ActionFunc actionFunc;
 } ElfMsg5; // size = 0x148
 
-extern const ActorInit Elf_Msg5_InitVars;
-
 #endif // Z_ELF_MSG5_H
diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h
index cd33b350b4..8e9a5d0ed3 100644
--- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h
+++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h
@@ -16,6 +16,4 @@ typedef struct ElfMsg6 {
     /* 0x144 */ ElfMsg6ActionFunc actionFunc;
 } ElfMsg6; // size = 0x148
 
-extern const ActorInit Elf_Msg6_InitVars;
-
 #endif // Z_ELF_MSG6_H
diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.h b/src/overlays/actors/ovl_En_Ah/z_en_ah.h
index 78872a270d..d361a8358a 100644
--- a/src/overlays/actors/ovl_En_Ah/z_en_ah.h
+++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.h
@@ -38,6 +38,4 @@ typedef struct EnAh {
     /* 0x300 */ s32 unk_300;
 } EnAh; // size = 0x304
 
-extern const ActorInit En_Ah_InitVars;
-
 #endif // Z_EN_AH_H
diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h
index ec0446f95a..72c932d0c0 100644
--- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h
+++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.h
@@ -50,6 +50,4 @@ typedef struct EnAkindonuts {
     /* 0x368 */ s16 unk_368;
 } EnAkindonuts; // size = 0x36C
 
-extern const ActorInit En_Akindonuts_InitVars;
-
 #endif // Z_EN_AKINDONUTS_H
diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.h b/src/overlays/actors/ovl_En_Al/z_en_al.h
index 4a92743df9..77e1011bfa 100644
--- a/src/overlays/actors/ovl_En_Al/z_en_al.h
+++ b/src/overlays/actors/ovl_En_Al/z_en_al.h
@@ -45,6 +45,4 @@ typedef struct EnAl {
     /* 0x4FC */ UNK_TYPE1 unk4FC[4];
 } EnAl; // size = 0x500
 
-extern const ActorInit En_Al_InitVars;
-
 #endif // Z_EN_AL_H
diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.h b/src/overlays/actors/ovl_En_Am/z_en_am.h
index 79d3a81bdd..e482e2cba4 100644
--- a/src/overlays/actors/ovl_En_Am/z_en_am.h
+++ b/src/overlays/actors/ovl_En_Am/z_en_am.h
@@ -27,6 +27,4 @@ typedef struct EnAm {
     /* 0x334 */ ColliderCylinder interactCollider; // Collider for when an interactable Armos is docile
 } EnAm; // size = 0x380
 
-extern const ActorInit En_Am_InitVars;
-
 #endif // Z_EN_AM_H
diff --git a/src/overlays/actors/ovl_En_An/z_en_an.h b/src/overlays/actors/ovl_En_An/z_en_an.h
index c4d2dd5aef..7f1a119300 100644
--- a/src/overlays/actors/ovl_En_An/z_en_an.h
+++ b/src/overlays/actors/ovl_En_An/z_en_an.h
@@ -14,6 +14,4 @@ typedef struct EnAn {
     /* 0x18C */ char unk_18C[0x23C];
 } EnAn; // size = 0x3C8
 
-extern const ActorInit En_An_InitVars;
-
 #endif // Z_EN_AN_H
diff --git a/src/overlays/actors/ovl_En_And/z_en_and.h b/src/overlays/actors/ovl_En_And/z_en_and.h
index 0ebd1a743c..a0610a408c 100644
--- a/src/overlays/actors/ovl_En_And/z_en_and.h
+++ b/src/overlays/actors/ovl_En_And/z_en_and.h
@@ -14,6 +14,4 @@ typedef struct EnAnd {
     /* 0x18C */ char unk_18C[0x188];
 } EnAnd; // size = 0x314
 
-extern const ActorInit En_And_InitVars;
-
 #endif // Z_EN_AND_H
diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h
index 7414f18900..2507b1728e 100644
--- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h
+++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h
@@ -42,6 +42,4 @@ typedef struct EnAob01 {
     /* 0x440 */ s16 unk_440;
 } EnAob01; // size = 0x444
 
-extern const ActorInit En_Aob_01_InitVars;
-
 #endif // Z_EN_AOB_01_H
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
index fadf7fbf25..d16dbd380f 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
@@ -53,6 +53,4 @@ typedef struct EnArrow {
     /* 0x274 */ EnArrowActionFunc actionFunc;
 } EnArrow; // size = 0x278
 
-extern const ActorInit En_Arrow_InitVars;
-
 #endif // Z_EN_ARROW_H
diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h
index a1e29d6278..f49778d9a7 100644
--- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h
+++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h
@@ -54,8 +54,6 @@ typedef struct EnAttackNiw {
     /* 0x2DC */ f32 targetHeight; // never set, but sent to Actor_SetFocus 
 } EnAttackNiw; // size = 0x2E0
 
-extern const ActorInit En_Attack_Niw_InitVars;
-
 
 #define ATTACK_NIW_REGULAR  0    // spawned by EnNiw
 
diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.h b/src/overlays/actors/ovl_En_Az/z_en_az.h
index 5c302c6f3f..32557df47f 100644
--- a/src/overlays/actors/ovl_En_Az/z_en_az.h
+++ b/src/overlays/actors/ovl_En_Az/z_en_az.h
@@ -13,6 +13,4 @@ typedef struct EnAz {
     /* 0x148 */ char unk_148[0x290];
 } EnAz; // size = 0x3D8
 
-extern const ActorInit En_Az_InitVars;
-
 #endif // Z_EN_AZ_H
diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.h b/src/overlays/actors/ovl_En_Baba/z_en_baba.h
index 2335dcb70f..7da0ed054f 100644
--- a/src/overlays/actors/ovl_En_Baba/z_en_baba.h
+++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.h
@@ -58,6 +58,4 @@ typedef struct EnBaba {
     /* 0x43C */ s32 timePathHasReachedEnd;
 } EnBaba; // size = 0x440
 
-extern const ActorInit En_Baba_InitVars;
-
 #endif // Z_EN_BABA_H
diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h
index 6c98eeaeb0..d6eb2173c9 100644
--- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h
+++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h
@@ -44,6 +44,4 @@ typedef struct EnBaguo {
     /* 0x23C */ NejironEffect effects[EN_BAGUO_EFFECT_COUNT];
 } EnBaguo; // size = 0x8CC
 
-extern const ActorInit En_Baguo_InitVars;
-
 #endif // Z_EN_BAGUO_H
diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h
index 3fb45f70a7..4c0ced24f5 100644
--- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h
+++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.h
@@ -32,6 +32,4 @@ typedef struct EnBaisen {
     /* 0x2B0 */ ColliderCylinder collider;
 } EnBaisen; // size = 0x2FC
 
-extern const ActorInit En_Baisen_InitVars;
-
 #endif // Z_EN_BAISEN_H
diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.h b/src/overlays/actors/ovl_En_Bal/z_en_bal.h
index 9184cfa688..2b95815011 100644
--- a/src/overlays/actors/ovl_En_Bal/z_en_bal.h
+++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.h
@@ -14,6 +14,4 @@ typedef struct EnBal {
     /* 0x190 */ char unk_190[0x224];
 } EnBal; // size = 0x3B4
 
-extern const ActorInit En_Bal_InitVars;
-
 #endif // Z_EN_BAL_H
diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.h b/src/overlays/actors/ovl_En_Bat/z_en_bat.h
index 4f4ada8102..479cfa24d8 100644
--- a/src/overlays/actors/ovl_En_Bat/z_en_bat.h
+++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.h
@@ -40,6 +40,4 @@ typedef struct EnBat {
     /* 0x184 */ ColliderSphere collider;
 } EnBat; // size = 0x1DC
 
-extern const ActorInit En_Bat_InitVars;
-
 #endif // Z_EN_BAT_H
diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.h b/src/overlays/actors/ovl_En_Bb/z_en_bb.h
index e6171065a8..c852397d46 100644
--- a/src/overlays/actors/ovl_En_Bb/z_en_bb.h
+++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.h
@@ -37,6 +37,4 @@ typedef struct EnBb {
     /* 0x2F4 */ ColliderSphere collider;
 } EnBb; // size = 0x34C
 
-extern const ActorInit En_Bb_InitVars;
-
 #endif // Z_EN_BB_H
diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h
index c9030f1125..7160594d89 100644
--- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h
+++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h
@@ -14,6 +14,4 @@ typedef struct EnBba01 {
     /* 0x3EC */ UNK_TYPE1 unk_3EC[0x230];
 } EnBba01; // size = 0x61C
 
-extern const ActorInit En_Bba_01_InitVars;
-
 #endif // Z_EN_BBA_01_H
diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h
index e835015e19..19c643ea72 100644
--- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h
+++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.h
@@ -33,6 +33,4 @@ typedef struct EnBbfall {
     /* 0x3A4 */ ColliderJntSphElement colliderElements[3];
 } EnBbfall; // size = 0x464
 
-extern const ActorInit En_Bbfall_InitVars;
-
 #endif // Z_EN_BBFALL_H
diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.h b/src/overlays/actors/ovl_En_Bee/z_en_bee.h
index 1676a55079..6a464a241b 100644
--- a/src/overlays/actors/ovl_En_Bee/z_en_bee.h
+++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.h
@@ -14,6 +14,4 @@ typedef struct EnBee {
     /* 0x204 */ char unk_204[0x84];
 } EnBee; // size = 0x288
 
-extern const ActorInit En_Bee_InitVars;
-
 #endif // Z_EN_BEE_H
diff --git a/src/overlays/actors/ovl_En_Bh/z_en_bh.h b/src/overlays/actors/ovl_En_Bh/z_en_bh.h
index b5e8a7c0c9..a3c88fb589 100644
--- a/src/overlays/actors/ovl_En_Bh/z_en_bh.h
+++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.h
@@ -22,6 +22,4 @@ typedef struct EnBh {
     /* 0x1E8 */ EnBhActionFunc actionFunc;
 } EnBh; // size = 0x1EC
 
-extern const ActorInit En_Bh_InitVars;
-
 #endif // Z_EN_BH_H
diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
index ba59e9a976..d51290c6fd 100644
--- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
+++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h
@@ -32,6 +32,4 @@ typedef struct EnBigokuta {
     /* 0x3AC */ ColliderCylinder bodyCollider;
 } EnBigokuta; // size = 0x3F8
 
-extern const ActorInit En_Bigokuta_InitVars;
-
 #endif // Z_EN_BIGOKUTA_H
diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h
index b2d01d4686..da7614ebc0 100644
--- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h
+++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h
@@ -16,6 +16,4 @@ typedef struct EnBigpamet {
     /* 0x2B0 */ char unk_2B0[0x31C];
 } EnBigpamet; // size = 0x5CC
 
-extern const ActorInit En_Bigpamet_InitVars;
-
 #endif // Z_EN_BIGPAMET_H
diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
index 6ba8eac966..30ec467773 100644
--- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
+++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
@@ -82,8 +82,6 @@ void EnBigpo_DrawLantern(Actor* thisx, PlayState* play);
 void EnBigpo_DrawCircleFlames(Actor* thisx, PlayState* play);
 void EnBigpo_RevealedFire(Actor* thisx, PlayState* play);
 
-extern const ActorInit En_Bigpo_InitVars;
-
 const ActorInit En_Bigpo_InitVars = {
     ACTOR_EN_BIGPO,
     ACTORCAT_ENEMY,
diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h
index c66dd78507..52a29013cf 100644
--- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h
+++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h
@@ -125,6 +125,4 @@ typedef struct EnBigslime {
     /* 0x0A54 */ EnBigslimeIceShardEffect iceShardEffect[BIGSLIME_NUM_ICE_SHARD]; // 312 = 162 (bigslime) + 10 * 15 (minislime)
 } EnBigslime; // size = 0x3634
 
-extern const ActorInit En_Bigslime_InitVars;
-
 #endif // Z_EN_BIGSLIME_H
diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
index ac738bc715..5935691930 100644
--- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
+++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
@@ -35,6 +35,4 @@ typedef struct EnBji01 {
     /* 0x2B0 */ ObjMoonStone* moonsTear;
 } EnBji01; // size = 0x2B4
 
-extern const ActorInit En_Bji_01_InitVars;
-
 #endif // Z_EN_BJI_01_H
diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h
index d1aabb9999..12426a37ed 100644
--- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h
+++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.h
@@ -32,6 +32,4 @@ typedef struct EnBjt {
 } EnBjt; // size = 0x25C
 
 
-extern const ActorInit En_Bjt_InitVars;
-
 #endif // Z_EN_BJT_H
diff --git a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h
index cfee748df9..78f4968c2d 100644
--- a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h
+++ b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.h
@@ -10,6 +10,4 @@ typedef struct EnBoj01 {
     /* 0x144 */ char unk_144[0x1D0];
 } EnBoj01; // size = 0x314
 
-extern const ActorInit En_Boj_01_InitVars;
-
 #endif // Z_EN_BOJ_01_H
diff --git a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h
index 1ef9785efb..c27d05d381 100644
--- a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h
+++ b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.h
@@ -10,6 +10,4 @@ typedef struct EnBoj02 {
     /* 0x144 */ char unk_144[0x4D8];
 } EnBoj02; // size = 0x61C
 
-extern const ActorInit En_Boj_02_InitVars;
-
 #endif // Z_EN_BOJ_02_H
diff --git a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h
index eac4fc691c..12776093de 100644
--- a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h
+++ b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.h
@@ -10,6 +10,4 @@ typedef struct EnBoj03 {
     /* 0x144 */ char unk_144[0x4D8];
 } EnBoj03; // size = 0x61C
 
-extern const ActorInit En_Boj_03_InitVars;
-
 #endif // Z_EN_BOJ_03_H
diff --git a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h
index 9681073e8d..4b05014fba 100644
--- a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h
+++ b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.h
@@ -10,6 +10,4 @@ typedef struct EnBoj04 {
     /* 0x144 */ char unk_144[0x4D8];
 } EnBoj04; // size = 0x61C
 
-extern const ActorInit En_Boj_04_InitVars;
-
 #endif // Z_EN_BOJ_04_H
diff --git a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h
index bed1ad78eb..b2e5e7c7e5 100644
--- a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h
+++ b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.h
@@ -10,6 +10,4 @@ typedef struct EnBoj05 {
     /* 0x144 */ char unk_144[0x4D8];
 } EnBoj05; // size = 0x61C
 
-extern const ActorInit En_Boj_05_InitVars;
-
 #endif // Z_EN_BOJ_05_H
diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.h b/src/overlays/actors/ovl_En_Bom/z_en_bom.h
index fe8eaadf1d..23218a1831 100644
--- a/src/overlays/actors/ovl_En_Bom/z_en_bom.h
+++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.h
@@ -31,6 +31,4 @@ typedef struct EnBom {
     /* 0x200 */ EnBomActionFunc actionFunc;
 } EnBom; // size = 0x204
 
-extern const ActorInit En_Bom_InitVars;
-
 #endif // Z_EN_BOM_H
diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h
index 5f630e4e6e..fc911dd041 100644
--- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h
+++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h
@@ -57,6 +57,4 @@ typedef struct EnBomBowlMan {
     /* 0x02F8 */ s32 unk_2F8;
 } EnBomBowlMan; // size = 0x2FC
 
-extern const ActorInit En_Bom_Bowl_Man_InitVars;
-
 #endif // Z_EN_BOM_BOWL_MAN_H
diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h
index 35998aeac4..686bbb384d 100644
--- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h
+++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h
@@ -25,6 +25,4 @@ typedef struct EnBomChu {
     /* 0x188 */ ColliderSphere collider;
 } EnBomChu; // size = 0x1E0
 
-extern const ActorInit En_Bom_Chu_InitVars;
-
 #endif // Z_EN_BOM_CHU_H
diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h
index 5731208a40..c10a5d5876 100644
--- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h
+++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.h
@@ -18,6 +18,4 @@ typedef struct EnBombal {
     /* 0x02B0 */ char unk2B0[0x2794];
 } EnBombal; // size = 0x2A44
 
-extern const ActorInit En_Bombal_InitVars;
-
 #endif // Z_EN_BOMBAL_H
diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h
index 538b0d8b56..85c5ecdb31 100644
--- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h
+++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.h
@@ -50,6 +50,4 @@ typedef struct EnBombers {
     /* 0x2C8 */ ColliderCylinder collider;
 } EnBombers; // size = 0x314
 
-extern const ActorInit En_Bombers_InitVars;
-
 #endif // Z_EN_BOMBERS_H
diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h
index 0a62fd7042..4a79e6615f 100644
--- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h
+++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h
@@ -41,6 +41,4 @@ typedef struct EnBombers2 {
     /* 0x2D0 */ ColliderCylinder collider;
 } EnBombers2; // size = 0x31C
 
-extern const ActorInit En_Bombers2_InitVars;
-
 #endif // Z_EN_BOMBERS2_H
diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
index 18a2a32ede..55b7f7bae7 100644
--- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
+++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
@@ -26,6 +26,4 @@ typedef struct EnBombf {
     /* 0x204 */ f32 unk_204;
 } EnBombf; // size = 0x208
 
-extern const ActorInit En_Bombf_InitVars;
-
 #endif // Z_EN_BOMBF_H
diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h
index b247e03ea0..136916f85c 100644
--- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h
+++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.h
@@ -56,6 +56,4 @@ typedef struct EnBomjima {
     /* 0x2F8 */ ColliderCylinder collider;
 } EnBomjima; // size = 0x344
 
-extern const ActorInit En_Bomjima_InitVars;
-
 #endif // Z_EN_BOMJIMA_H
diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h
index 8b73ef9727..f411f21a26 100644
--- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h
+++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.h
@@ -61,6 +61,4 @@ typedef struct EnBomjimb {
     /* 0x2E8 */ ColliderCylinder collider;
 } EnBomjimb; // size = 0x334
 
-extern const ActorInit En_Bomjimb_InitVars;
-
 #endif // Z_EN_BOMJIMB_H
diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h
index 45e3618ed1..e5e3fa2b34 100644
--- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h
+++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h
@@ -21,6 +21,4 @@ typedef struct EnBoom {
     /* 0x1F0 */ EnBoomActionFunc actionFunc;
 } EnBoom; // size = 0x1F4
 
-extern const ActorInit En_Boom_InitVars;
-
 #endif // Z_EN_BOOM_H
diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h
index cd164c9248..432025f14c 100644
--- a/src/overlays/actors/ovl_En_Box/z_en_box.h
+++ b/src/overlays/actors/ovl_En_Box/z_en_box.h
@@ -66,7 +66,5 @@ typedef struct EnBox {
     /* 0x220 */ s32 collectableFlag;
 } EnBox; // size = 0x224
 
-extern const ActorInit En_Box_InitVars;
-
 
 #endif // Z_EN_BOX_H
diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h
index 38ec4078fe..d2f67c008e 100644
--- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h
+++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.h
@@ -14,6 +14,4 @@ typedef struct EnBsb {
     /* 0x0288 */ char unk_288[0xED0];
 } EnBsb; // size = 0x1158
 
-extern const ActorInit En_Bsb_InitVars;
-
 #endif // Z_EN_BSB_H
diff --git a/src/overlays/actors/ovl_En_Bu/z_en_bu.h b/src/overlays/actors/ovl_En_Bu/z_en_bu.h
index 0f828477ca..05149742f0 100644
--- a/src/overlays/actors/ovl_En_Bu/z_en_bu.h
+++ b/src/overlays/actors/ovl_En_Bu/z_en_bu.h
@@ -14,6 +14,4 @@ typedef struct EnBu {
     /* 0x18C */ Gfx* displayListPtr;
 } EnBu; // size = 0x190
 
-extern const ActorInit En_Bu_InitVars;
-
 #endif // Z_EN_BU_H
diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
index 2217b86b15..815dc1641e 100644
--- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
+++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h
@@ -13,6 +13,4 @@ typedef struct EnBubble {
     /* 0x148 */ char unk_148[0x110];
 } EnBubble; // size = 0x258
 
-extern const ActorInit En_Bubble_InitVars;
-
 #endif // Z_EN_BUBBLE_H
diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.h b/src/overlays/actors/ovl_En_Butte/z_en_butte.h
index 2d7a6a0bc6..4bcaf440c3 100644
--- a/src/overlays/actors/ovl_En_Butte/z_en_butte.h
+++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.h
@@ -33,6 +33,4 @@ typedef struct EnButte {
     /* 0x25C */ f32 unk_25C;
 } EnButte; // size = 0x260
 
-extern const ActorInit En_Butte_InitVars;
-
 #endif // Z_EN_BUTTE_H
diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.h b/src/overlays/actors/ovl_En_Cha/z_en_cha.h
index b3cfe7312b..845ebc1636 100644
--- a/src/overlays/actors/ovl_En_Cha/z_en_cha.h
+++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.h
@@ -13,6 +13,4 @@ typedef struct EnCha {
     /* 0x190 */ EnChaActionFunc actionFunc;
 } EnCha; // size = 0x194
 
-extern const ActorInit En_Cha_InitVars;
-
 #endif // Z_EN_CHA_H
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
index c14cc36fdd..677fcc6984 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
+++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
@@ -41,6 +41,4 @@ typedef struct EnClearTag {
     /* 0x2E78 */ Vec3f subCamAt;
 } EnClearTag; // size = 0x2E84
 
-extern const ActorInit En_Clear_Tag_InitVars;
-
 #endif // Z_EN_CLEAR_TAG_H
diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h
index 0b9e1e08b8..2530257607 100644
--- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h
+++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h
@@ -14,6 +14,4 @@ typedef struct EnCne01 {
     /* 0x3EC */ UNK_TYPE1 unk_3EC[0x230];
 } EnCne01; // size = 0x61C
 
-extern const ActorInit En_Cne_01_InitVars;
-
 #endif // Z_EN_CNE_01_H
diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h
index 1e8f540dc7..977bf24733 100644
--- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h
+++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.h
@@ -24,6 +24,4 @@ typedef enum {
     /* 4 */ EN_COL_MAN_GAMEPLAY_BOMB,
 } EnColManType;
 
-extern const ActorInit En_Col_Man_InitVars;
-
 #endif // Z_EN_COL_MAN_H
diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.h b/src/overlays/actors/ovl_En_Cow/z_en_cow.h
index 1fd6a36a9a..3c73b747fb 100644
--- a/src/overlays/actors/ovl_En_Cow/z_en_cow.h
+++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.h
@@ -32,6 +32,4 @@ typedef struct EnCow {
     /* 0x0274 */ EnCowActionFunc actionFunc;
 } EnCow; // size = 0x278
 
-extern const ActorInit En_Cow_InitVars;
-
 #endif // Z_EN_COW_H
diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.h b/src/overlays/actors/ovl_En_Crow/z_en_crow.h
index 86ffba903f..527f822f6c 100644
--- a/src/overlays/actors/ovl_En_Crow/z_en_crow.h
+++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.h
@@ -31,6 +31,4 @@ typedef struct EnCrow {
     /* 0x298 */ f32 drawDmgEffScale;
 } EnCrow; // size = 0x29C
 
-extern const ActorInit En_Crow_InitVars;
-
 #endif // Z_EN_CROW_H
diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.h b/src/overlays/actors/ovl_En_Dai/z_en_dai.h
index 0b0316d05f..4dc059c399 100644
--- a/src/overlays/actors/ovl_En_Dai/z_en_dai.h
+++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.h
@@ -46,6 +46,4 @@ typedef struct EnDai {
     /* 0xA70 */ s32 unk_A70;
 } EnDai; // size = 0xA74
 
-extern const ActorInit En_Dai_InitVars;
-
 #endif // Z_EN_DAI_H
diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h
index 4f93b3ea15..fa161e9fd5 100644
--- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h
+++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h
@@ -45,6 +45,4 @@ typedef struct EnDaiku {
     /* 0x29C */ ColliderCylinder collider;
 } EnDaiku; // size = 0x2E8
 
-extern const ActorInit En_Daiku_InitVars;
-
 #endif // Z_EN_DAIKU_H
diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h
index dab4096c04..f13b896119 100644
--- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h
+++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h
@@ -53,6 +53,4 @@ typedef struct EnDaiku2 {
     /* 0xD7C */ ColliderCylinder collider;
 } EnDaiku2; // size = 0xDC8
 
-extern const ActorInit En_Daiku2_InitVars;
-
 #endif // Z_EN_DAIKU2_H
diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.h b/src/overlays/actors/ovl_En_Death/z_en_death.h
index bc4e326bb2..16863cf836 100644
--- a/src/overlays/actors/ovl_En_Death/z_en_death.h
+++ b/src/overlays/actors/ovl_En_Death/z_en_death.h
@@ -14,6 +14,4 @@ typedef struct EnDeath {
     /* 0x18C */ char unk_18C[0x7AC];
 } EnDeath; // size = 0x938
 
-extern const ActorInit En_Death_InitVars;
-
 #endif // Z_EN_DEATH_H
diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
index 923f336aa4..848f056bf9 100644
--- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
+++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h
@@ -14,6 +14,4 @@ typedef struct EnDekubaba {
     /* 0x18C */ char unk_18C[0x290];
 } EnDekubaba; // size = 0x41C
 
-extern const ActorInit En_Dekubaba_InitVars;
-
 #endif // Z_EN_DEKUBABA_H
diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
index 596369c62a..c6672b06e4 100644
--- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
+++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h
@@ -36,6 +36,4 @@ typedef struct EnDekunuts {
     /* 0x27C */ ColliderCylinder collider;
 } EnDekunuts; // size = 0x2C8
 
-extern const ActorInit En_Dekunuts_InitVars;
-
 #endif // Z_EN_DEKUNUTS_H
diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h
index c14fa53269..181198e0f9 100644
--- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h
+++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.h
@@ -28,6 +28,4 @@ typedef struct EnDemoheishi {
     /* 0x274 */ ColliderCylinder colliderCylinder;
 } EnDemoheishi; //size = 0x2C0
 
-extern const ActorInit En_Demo_heishi_InitVars;
-
 #endif // Z_EN_DEMO_HEISHI_H
diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.h b/src/overlays/actors/ovl_En_Dg/z_en_dg.h
index 2b2bdd7cb4..62c01a011b 100644
--- a/src/overlays/actors/ovl_En_Dg/z_en_dg.h
+++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.h
@@ -65,6 +65,4 @@ typedef struct EnDg {
     /* 0x294 */ Vec3f curRot;
 } EnDg; // size = 0x2A0
 
-extern const ActorInit En_Dg_InitVars;
-
 #endif // Z_EN_DG_H
diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h
index fcdf48c320..4284d55952 100644
--- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h
+++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.h
@@ -39,6 +39,4 @@ typedef struct EnDinofos {
     /* 0x5C4 */ ColliderQuad colliderQuad;
 } EnDinofos; // size = 0x644
 
-extern const ActorInit En_Dinofos_InitVars;
-
 #endif // Z_EN_DINOFOS_H
diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h
index 17ee19abef..aa17663bf9 100644
--- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h
+++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h
@@ -41,6 +41,4 @@ typedef struct EnDnb {
     /* 0x0D38 */ EnDnbUnkStruct unk_0D38[256];
 } EnDnb; // size = 0x3538
 
-extern const ActorInit En_Dnb_InitVars;
-
 #endif // Z_EN_DNB_H
diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h
index e26b9a7c02..c2331d7771 100644
--- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h
+++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.h
@@ -13,6 +13,4 @@ typedef struct EnDnh {
     /* 0x148 */ char unk_148[0x74];
 } EnDnh; // size = 0x1BC
 
-extern const ActorInit En_Dnh_InitVars;
-
 #endif // Z_EN_DNH_H
diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h
index 9b69135489..f0665f1b5b 100644
--- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h
+++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.h
@@ -40,6 +40,4 @@ typedef struct EnDnk {
     /* 0x2A2 */ s16 unk_2A2;
 } EnDnk; // size = 0x2A4
 
-extern const ActorInit En_Dnk_InitVars;
-
 #endif // Z_EN_DNK_H
diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.h b/src/overlays/actors/ovl_En_Dno/z_en_dno.h
index bf357cad67..0ad9b98d2c 100644
--- a/src/overlays/actors/ovl_En_Dno/z_en_dno.h
+++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.h
@@ -56,6 +56,4 @@ typedef struct EnDno {
     /* 0x468 */ u8 unk_468;
 } EnDno; // size = 0x46C
 
-extern const ActorInit En_Dno_InitVars;
-
 #endif // Z_EN_DNO_H
diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h
index e76180afe5..f44110a85c 100644
--- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h
+++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.h
@@ -38,6 +38,4 @@ typedef struct EnDnp {
     /* 0x340 */ s32 unk_340;
 } EnDnp; // size = 0x344
 
-extern const ActorInit En_Dnp_InitVars;
-
 #endif // Z_EN_DNP_H
diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h
index 6c3027c8b9..5378f0e11f 100644
--- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h
+++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.h
@@ -35,6 +35,4 @@ typedef struct EnDnq {
     /* 0x3A4 */ s32 unk_3A4;
 } EnDnq; // size = 0x3A8
 
-extern const ActorInit En_Dnq_InitVars;
-
 #endif // Z_EN_DNQ_H
diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/src/overlays/actors/ovl_En_Dns/z_en_dns.h
index 3a252b1ec7..13ce0c9e97 100644
--- a/src/overlays/actors/ovl_En_Dns/z_en_dns.h
+++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h
@@ -57,6 +57,4 @@ typedef struct EnDns {
     /* 0x2FC */ s32 unk_2FC;
 } EnDns; // size = 0x300
 
-extern const ActorInit En_Dns_InitVars;
-
 #endif // Z_EN_DNS_H
diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
index a196b1f8c0..3cc80b0d1e 100644
--- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
+++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
@@ -36,6 +36,4 @@ typedef struct EnDodongo {
     /* 0x754 */ ColliderJntSphElement collider3Elements[3];
 } EnDodongo; // size = 0x814
 
-extern const ActorInit En_Dodongo_InitVars;
-
 #endif // Z_EN_DODONGO_H
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h
index 359f34cd2c..bea44a1226 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.h
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.h
@@ -26,6 +26,4 @@ typedef struct EnDoor {
     /* 0x1C8 */ EnDoorActionFunc actionFunc;
 } EnDoor;
 
-extern const ActorInit En_Door_InitVars;
-
 #endif // Z_EN_DOOR_H
diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h
index 18d525f44a..7dda15d43c 100644
--- a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h
+++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.h
@@ -13,6 +13,4 @@ typedef struct EnDoorEtc {
     /* 0x1F8 */ EnDoorEtcActionFunc actionFunc;
 } EnDoorEtc; // size = 0x1FC
 
-extern const ActorInit En_Door_Etc_InitVars;
-
 #endif // Z_EN_DOOR_ETC_H
diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h
index b12c63dd05..81261e291b 100644
--- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h
+++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.h
@@ -61,6 +61,4 @@ typedef struct EnDragon {
     /* 0x2FC */ ColliderJntSphElement colliderElements[8];
 } EnDragon; // size = 0x4FC
 
-extern const ActorInit En_Dragon_InitVars;
-
 #endif // Z_EN_DRAGON_H
diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.h b/src/overlays/actors/ovl_En_Drs/z_en_drs.h
index d86121efb1..d811ae7809 100644
--- a/src/overlays/actors/ovl_En_Drs/z_en_drs.h
+++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.h
@@ -19,6 +19,4 @@ typedef struct EnDrs {
     /* 0x208 */ s8 moonMaskObjBankIndex;
 } EnDrs; // size = 0x20C */
 
-extern const ActorInit En_Drs_InitVars;
-
 #endif // Z_EN_DRS_H
diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h
index c7155ed740..f2a6c07257 100644
--- a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h
+++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h
@@ -22,6 +22,4 @@ typedef struct EnDs2n {
 
 } EnDs2n; // size = 0x234
 
-extern const ActorInit En_Ds2n_InitVars;
-
 #endif // Z_EN_DS2N_H
diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.h b/src/overlays/actors/ovl_En_Dt/z_en_dt.h
index 78b0987891..6afbf8cd22 100644
--- a/src/overlays/actors/ovl_En_Dt/z_en_dt.h
+++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.h
@@ -14,6 +14,4 @@ typedef struct EnDt {
     /* 0x240 */ char unk_240[0xA0];
 } EnDt; // size = 0x2E0
 
-extern const ActorInit En_Dt_InitVars;
-
 #endif // Z_EN_DT_H
diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h
index 9a0b53223f..6f3a98b8d6 100644
--- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h
+++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h
@@ -19,6 +19,4 @@ typedef struct EnDyExtra {
     /* 0x160 */ Vec3f unk160;
 } EnDyExtra; // size = 0x16C
 
-extern const ActorInit En_Dy_Extra_InitVars;
-
 #endif // Z_EN_DY_EXTRA_H
diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h
index d1222a5ebf..88abf1efea 100644
--- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h
+++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.h
@@ -14,6 +14,4 @@ typedef struct EnEgblock {
     /* 0x1A4 */ char unk_1A4[0xC10];
 } EnEgblock; // size = 0xDB4
 
-extern const ActorInit En_Egblock_InitVars;
-
 #endif // Z_EN_EGBLOCK_H
diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.h b/src/overlays/actors/ovl_En_Egol/z_en_egol.h
index 9e00971529..bfcc532310 100644
--- a/src/overlays/actors/ovl_En_Egol/z_en_egol.h
+++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.h
@@ -14,6 +14,4 @@ typedef struct EnEgol {
     /* 0x02AC */ char unk_2AC[0x1BC4];
 } EnEgol; // size = 0x1E70
 
-extern const ActorInit En_Egol_InitVars;
-
 #endif // Z_EN_EGOL_H
diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
index 64d53744f0..680d59158c 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
@@ -60,6 +60,4 @@ typedef enum {
     /* 0x07 */ ENELF_TYPE_7
 } FairyType;
 
-extern const ActorInit En_Elf_InitVars;
-
 #endif // Z_EN_ELF_H
diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h
index cab77c8a41..50c6bd672d 100644
--- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h
+++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.h
@@ -21,6 +21,4 @@ typedef struct EnElfbub {
     /* 0x1A0 */ EnElfbubActionFunc actionFunc;
 } EnElfbub; // size = 0x1A4
 
-extern const ActorInit En_Elfbub_InitVars;
-
 #endif // Z_EN_ELFBUB_H
diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h
index 8536b806e7..975b08c2c5 100644
--- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h
+++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h
@@ -28,6 +28,4 @@ typedef struct EnElfgrp {
     /* 0x14C */ EnElfgrpActionFunc actionFunc;
 } EnElfgrp; // size = 0x150
 
-extern const ActorInit En_Elfgrp_InitVars;
-
 #endif // Z_EN_ELFGRP_H
diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h
index 5de48e955a..798982b09a 100644
--- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h
+++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h
@@ -55,6 +55,4 @@ typedef struct EnElforg {
     /* 0x22C */ EnElforgActionFunc actionFunc;
 } EnElforg; // size = 0x230
 
-extern const ActorInit En_Elforg_InitVars;
-
 #endif // Z_EN_ELFORG_H
diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
index d625f21519..e89ad27f20 100644
--- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
+++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h
@@ -17,6 +17,4 @@ typedef struct EnEncount1 {
     /* 0x15C */ char unk_15C[0x8];
 } EnEncount1; // size = 0x164
 
-extern const ActorInit En_Encount1_InitVars;
-
 #endif // Z_EN_ENCOUNT1_H
diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
index 8f2a6c66a0..cb9c03488b 100644
--- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
+++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
@@ -35,6 +35,4 @@ typedef struct EnEncount2 {
 
 #define GET_ENCOUNT2_SWITCH_FLAG(actor) ((s16)(((Actor*)actor)->params & 0x7F))
 
-extern const ActorInit En_Encount2_InitVars;
-
 #endif // Z_EN_ENCOUNT2_H
diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h
index 2b0bb59d8e..9ebc87303b 100644
--- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h
+++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.h
@@ -13,6 +13,4 @@ typedef struct EnEncount3 {
     /* 0x148 */ char unk_148[0x84];
 } EnEncount3; // size = 0x1CC
 
-extern const ActorInit En_Encount3_InitVars;
-
 #endif // Z_EN_ENCOUNT3_H
diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h
index 499da9663c..63df20f656 100644
--- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h
+++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.h
@@ -17,6 +17,4 @@ typedef struct EnEncount4 {
     /* 0x0152 */ char unk_152[0x6];
 } EnEncount4; // size = 0x158
 
-extern const ActorInit En_Encount4_InitVars;
-
 #endif // Z_EN_ENCOUNT4_H
diff --git a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h
index 098f2ffe06..6049e34495 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h
+++ b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.h
@@ -18,6 +18,4 @@ typedef struct EnEndingHero {
     /* 0x244 */ u16 unk244;
 } EnEndingHero; // size = 0x248
 
-extern const ActorInit En_Ending_Hero_InitVars;
-
 #endif // Z_EN_ENDING_HERO_H
diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h
index 80ee813fa0..2ad3b49141 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h
+++ b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.h
@@ -16,6 +16,4 @@ typedef struct EnEndingHero2 {
     /* 0x27C */ u16 unk27C;
 } EnEndingHero2; // size = 0x280
 
-extern const ActorInit En_Ending_Hero2_InitVars;
-
 #endif // Z_EN_ENDING_HERO2_H
diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h
index 2a30f1d9c3..0887df1ab1 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h
+++ b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.h
@@ -16,6 +16,4 @@ typedef struct EnEndingHero3 {
     /* 0x258 */ u16 unk258;
 } EnEndingHero3; // size = 0x25C
 
-extern const ActorInit En_Ending_Hero3_InitVars;
-
 #endif // Z_EN_ENDING_HERO3_H
diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h
index 2f050f2df4..4cada4183f 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h
+++ b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.h
@@ -16,6 +16,4 @@ typedef struct EnEndingHero4 {
     /* 0x258 */ u16 unk258;
 } EnEndingHero4; // size = 0x25C
 
-extern const ActorInit En_Ending_Hero4_InitVars;
-
 #endif // Z_EN_ENDING_HERO4_H
diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h
index 4b26b03dbf..9e3dab09e7 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h
+++ b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.h
@@ -17,6 +17,4 @@ typedef struct EnEndingHero5 {
     /* 0x25C */ s32 unk25C;
 } EnEndingHero5; // size = 0x260
 
-extern const ActorInit En_Ending_Hero5_InitVars;
-
 #endif // Z_EN_ENDING_HERO5_H
diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h
index f30d09a7a2..76af1d67f5 100644
--- a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h
+++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.h
@@ -23,6 +23,4 @@ typedef struct EnEndingHero6 {
     /* 0x290 */ s16 isIdle;
 } EnEndingHero6; // size = 0x294
 
-extern const ActorInit En_Ending_Hero6_InitVars;
-
 #endif // Z_EN_ENDING_HERO6_H
diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.h b/src/overlays/actors/ovl_En_Estone/z_en_estone.h
index b265bf4de8..8e4fa075db 100644
--- a/src/overlays/actors/ovl_En_Estone/z_en_estone.h
+++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.h
@@ -13,6 +13,4 @@ typedef struct EnEstone {
     /* 0x0148 */ char unk_148[0x2C2C];
 } EnEstone; // size = 0x2D74
 
-extern const ActorInit En_Estone_InitVars;
-
 #endif // Z_EN_ESTONE_H
diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.h b/src/overlays/actors/ovl_En_Fall/z_en_fall.h
index 21746b6832..c9eaaf44f9 100644
--- a/src/overlays/actors/ovl_En_Fall/z_en_fall.h
+++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.h
@@ -50,6 +50,4 @@ typedef struct EnFall {
     /* 0x160 */ EnFallActionFunc actionFunc;
 } EnFall; // size = 0x164
 
-extern const ActorInit En_Fall_InitVars;
-
 #endif // Z_EN_FALL_H
diff --git a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.h b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.h
index 5ac33b27de..41f0644983 100644
--- a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.h
+++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.h
@@ -20,6 +20,4 @@ typedef struct EnFall2 {
     /* 0x2E8 */ EnFall2ActionFunc actionFunc;
 } EnFall2; // size = 0x2EC
 
-extern const ActorInit En_Fall2_InitVars;
-
 #endif // Z_EN_FALL2_H
diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h
index 84c437ac10..e2b32aaf9f 100644
--- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h
+++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h
@@ -10,6 +10,4 @@ typedef struct EnFireRock {
     /* 0x144 */ char unk_144[0x94];
 } EnFireRock; // size = 0x1D8
 
-extern const ActorInit En_Fire_Rock_InitVars;
-
 #endif // Z_EN_FIRE_ROCK_H
diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h
index ffb295e6a3..6ac9fb008f 100644
--- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h
+++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h
@@ -38,6 +38,4 @@ typedef struct EnFirefly {
     /* 0x31C */ ColliderSphere collider;
 } EnFirefly; // size = 0x374
 
-extern const ActorInit En_Firefly_InitVars;
-
 #endif // Z_EN_FIREFLY_H
diff --git a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h
index c60f26ae21..b1e8179e11 100644
--- a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h
+++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.h
@@ -10,6 +10,4 @@ typedef struct EnFirefly2 {
     /* 0x144 */ char unk_144[0x228];
 } EnFirefly2; // size = 0x36C
 
-extern const ActorInit En_Firefly2_InitVars;
-
 #endif // Z_EN_FIREFLY2_H
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.h b/src/overlays/actors/ovl_En_Fish/z_en_fish.h
index 4596c79b17..528eeb40c9 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.h
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.h
@@ -48,6 +48,4 @@ typedef struct EnFish {
     /* 0x279 */ s8 unk_279;
 } EnFish; // size = 0x27C
 
-extern const ActorInit En_Fish_InitVars;
-
 #endif // Z_EN_FISH_H
diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h
index 5f79700c96..68b9b19bfe 100644
--- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h
+++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.h
@@ -61,6 +61,4 @@ typedef struct EnFish2 {
     /* 0x03F8 */ EnFish2UnkStruct unk_3F8[200];
 } EnFish2; // size = 0x2018
 
-extern const ActorInit En_Fish2_InitVars;
-
 #endif // Z_EN_FISH2_H
diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h
index 5af536dbb0..a3dcb3a95b 100644
--- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h
+++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.h
@@ -61,6 +61,4 @@ typedef struct EnFishing {
     /* 0x248 */ ColliderJntSphElement colliderElements[12];
 } EnFishing; // size = 0x548
 
-extern const ActorInit En_Fishing_InitVars;
-
 #endif // Z_EN_FISHING_H
diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
index c4500973ff..002f9e67ca 100644
--- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
+++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h
@@ -36,6 +36,4 @@ typedef struct EnFloormas {
     /* 0x354 */ ColliderCylinder collider;
 } EnFloormas; // size = 0x3A0
 
-extern const ActorInit En_Floormas_InitVars;
-
 #endif // Z_EN_FLOORMAS_H
diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/src/overlays/actors/ovl_En_Fr/z_en_fr.h
index f0de1936db..27682ce404 100644
--- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h
+++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h
@@ -12,6 +12,4 @@ typedef struct EnFr {
     /* 0x000 */ Actor actor;
 } EnFr; // size = 0x144
 
-extern const ActorInit En_Fr_InitVars;
-
 #endif // Z_EN_FR_H
diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h
index f003a79212..b05de96ff9 100644
--- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h
+++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h
@@ -68,6 +68,4 @@ typedef struct EnFsn {
     /* 0x44E */ u16 flags;
 } EnFsn; // size = 0x450
 
-extern const ActorInit En_Fsn_InitVars;
-
 #endif // Z_EN_FSN_H
diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/src/overlays/actors/ovl_En_Fu/z_en_fu.h
index 9ed3b69c5a..10280ea65e 100644
--- a/src/overlays/actors/ovl_En_Fu/z_en_fu.h
+++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.h
@@ -52,6 +52,4 @@ typedef struct EnFu {
     /* 0x552 */ u16 unk_552;
 } EnFu; // size = 0x554
 
-extern const ActorInit En_Fu_InitVars;
-
 #endif // Z_EN_FU_H
diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h
index 909e7b24d8..48bd69a27a 100644
--- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h
+++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.h
@@ -27,6 +27,4 @@ typedef struct EnFuKago {
     /* 0x33C */ s16 unk_33C;
 } EnFuKago; // size = 0x340
 
-extern const ActorInit En_Fu_Kago_InitVars;
-
 #endif // Z_EN_FU_KAGO_H
diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h
index d24ac91d56..2065784d76 100644
--- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h
+++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.h
@@ -34,6 +34,4 @@ typedef struct EnFuMato {
     /* 0x30A */ s16 unk_30A;
 } EnFuMato; // size = 0x30C
 
-extern const ActorInit En_Fu_Mato_InitVars;
-
 #endif // Z_EN_FU_MATO_H
diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.h b/src/overlays/actors/ovl_En_Fz/z_en_fz.h
index 58d1fb6d46..539560c880 100644
--- a/src/overlays/actors/ovl_En_Fz/z_en_fz.h
+++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h
@@ -70,6 +70,4 @@ typedef struct EnFz {
     /* 0xBD9 */ u8 unk_BD9;
 } EnFz; /* size = 0xBDC */
 
-extern const ActorInit En_Fz_InitVars;
-
 #endif // Z_EN_FZ_H
diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h
index c9db31b75f..04d9c71590 100644
--- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h
+++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.h
@@ -21,6 +21,4 @@ typedef struct EnGakufu {
     /* 0x150 */ EnGakufuActionFunc actionFunc;
 } EnGakufu; // size = 0x154
 
-extern const ActorInit En_Gakufu_InitVars;
-
 #endif // Z_EN_GAKUFU_H
diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h
index 4ee6a5b117..5d45f31681 100644
--- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h
+++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h
@@ -18,6 +18,4 @@ typedef struct EnGamelupy {
     /* 0x1A0 */ s16 unk_1A0;
 } EnGamelupy; // size = 0x1A4
 
-extern const ActorInit En_Gamelupy_InitVars;
-
 #endif // Z_EN_GAMELUPY_H
diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h
index cb53ada3b6..ec3b379a15 100644
--- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h
+++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.h
@@ -38,6 +38,4 @@ typedef struct EnGb2 {
     /* 0x290 */ s16 unk_290;
 } EnGb2; // size = 0x294
 
-extern const ActorInit En_Gb2_InitVars;
-
 #endif // Z_EN_GB2_H
diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
index a3c04a93a9..4f1cc3332d 100644
--- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
+++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h
@@ -13,6 +13,4 @@ typedef struct EnGe1 {
     /* 0x2C8 */ EnGe1ActionFunc actionFunc;
 } EnGe1; // size = 0x2CC
 
-extern const ActorInit En_Ge1_InitVars;
-
 #endif // Z_EN_GE1_H
diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
index f0d97869df..0558166db6 100644
--- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
+++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h
@@ -13,6 +13,4 @@ typedef struct EnGe2 {
     /* 0x308 */ EnGe2ActionFunc actionFunc;
 } EnGe2; // size = 0x30C
 
-extern const ActorInit En_Ge2_InitVars;
-
 #endif // Z_EN_GE2_H
diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
index 10912aae08..909ed7599c 100644
--- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
+++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h
@@ -13,6 +13,4 @@ typedef struct EnGe3 {
     /* 0x31C */ EnGe3ActionFunc actionFunc;
 } EnGe3; // size = 0x320
 
-extern const ActorInit En_Ge3_InitVars;
-
 #endif // Z_EN_GE3_H
diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.h b/src/overlays/actors/ovl_En_Geg/z_en_geg.h
index 4a20068bd7..ea29fd6cfd 100644
--- a/src/overlays/actors/ovl_En_Geg/z_en_geg.h
+++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.h
@@ -46,6 +46,4 @@ typedef struct EnGeg {
     /* 0x4E4 */ Vec3f unk_4E4;
 } EnGeg; // size = 0x4F0
 
-extern const ActorInit En_Geg_InitVars;
-
 #endif // Z_EN_GEG_H
diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.h b/src/overlays/actors/ovl_En_Gg/z_en_gg.h
index 421168e995..cb9f9e7cb8 100644
--- a/src/overlays/actors/ovl_En_Gg/z_en_gg.h
+++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.h
@@ -57,6 +57,4 @@ typedef struct EnGg {
     /* 0x344 */ EnGgStruct unk_344;
 } EnGg; // size = 0x390
 
-extern const ActorInit En_Gg_InitVars;
-
 #endif // Z_EN_GG_H
diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h
index 21c1f84417..f913107751 100644
--- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h
+++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.h
@@ -35,6 +35,4 @@ typedef struct EnGg2 {
     /* 0x304 */ Vec3f unk_304;
 } EnGg2; // size = 0x310
 
-extern const ActorInit En_Gg2_InitVars;
-
 #endif // Z_EN_GG2_H
diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.h b/src/overlays/actors/ovl_En_Giant/z_en_giant.h
index ff4a79485c..b19c710583 100644
--- a/src/overlays/actors/ovl_En_Giant/z_en_giant.h
+++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.h
@@ -58,6 +58,4 @@ typedef struct EnGiant {
     /* 0x298 */ EnGiantActionFunc actionFunc;
 } EnGiant; // size = 0x29C
 
-extern const ActorInit En_Giant_InitVars;
-
 #endif // Z_EN_GIANT_H
diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h
index 3ed6bc89be..9a9120913b 100644
--- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h
+++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.h
@@ -24,8 +24,6 @@ typedef struct EnGinkoMan {
     /* 0x264 */ s16 animTimer;
 } EnGinkoMan; // size = 0x268
 
-extern const ActorInit En_Ginko_Man_InitVars;
-
 #define GINKOMAN_CHOICE_DEPOSIT   0
 #define GINKOMAN_CHOICE_WITHDRAWL 1
 #define GINKOMAN_CHOICE_CANCEL    2
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
index cb48f591d4..f61b50b5a2 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
@@ -107,8 +107,6 @@ typedef enum {
     /* 0x2B */ SI_MAX
 } EnGirlAShopItemId;
 
-extern const ActorInit En_GirlA_InitVars;
-
 /* 
 * Shopkeeper Common Defines 
 */
diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.h b/src/overlays/actors/ovl_En_Gk/z_en_gk.h
index 61610d684d..bebe6c6c94 100644
--- a/src/overlays/actors/ovl_En_Gk/z_en_gk.h
+++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.h
@@ -56,6 +56,4 @@ typedef struct EnGk {
     /* 0x354 */ f32 unk_354;
 } EnGk; // size = 0x358
 
-extern const ActorInit En_Gk_InitVars;
-
 #endif // Z_EN_GK_H
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
index 0f74de16b4..3bed5335a0 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.h
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
@@ -76,6 +76,4 @@ typedef struct EnGm {
     /* 0x400 */ s32 unk_400;
 } EnGm; // size = 0x404
 
-extern const ActorInit En_Gm_InitVars;
-
 #endif // Z_EN_GM_H
diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h
index 0278a70df3..fd4876430a 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.h
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.h
@@ -101,6 +101,4 @@ typedef struct EnGo {
     /* 0x3F8 */ EnGoStruct unk_3F8[32];
 } EnGo; // size = 0xB78
 
-extern const ActorInit En_Go_InitVars;
-
 #endif // Z_EN_GO_H
diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
index fc4f66f51f..e672355e52 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
@@ -81,6 +81,4 @@ typedef struct EnGoroiwa {
     /* 0x248 */ s32 unk_248;
 } EnGoroiwa; // size = 0x24C
 
-extern const ActorInit En_Goroiwa_InitVars;
-
 #endif // Z_EN_GOROIWA_H
diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h
index dc8e95008a..d8395fa4b5 100644
--- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h
+++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.h
@@ -14,6 +14,4 @@ typedef struct EnGrasshopper {
     /* 0x02AC */ char unk_2AC[0x15C4];
 } EnGrasshopper; // size = 0x1870
 
-extern const ActorInit En_Grasshopper_InitVars;
-
 #endif // Z_EN_GRASSHOPPER_H
diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.h b/src/overlays/actors/ovl_En_Gs/z_en_gs.h
index eed8d75f9c..51e899fccd 100644
--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.h
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.h
@@ -57,6 +57,4 @@ typedef struct EnGs {
     /* 0x21E */ s16 unk_21E;
 } EnGs; // size = 0x220
 
-extern const ActorInit En_Gs_InitVars;
-
 #endif // Z_EN_GS_H
diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h
index 6f45691ada..8cbe26f035 100644
--- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h
+++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.h
@@ -29,6 +29,4 @@ typedef struct EnGuardNuts {
     /* 0x244 */ ColliderCylinder collider;
 } EnGuardNuts; // size = 0x290
 
-extern const ActorInit En_Guard_Nuts_InitVars;
-
 #endif // Z_EN_GUARD_NUTS_H
diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h
index 2178c62783..cd95f7ae29 100644
--- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h
+++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.h
@@ -30,6 +30,4 @@ typedef struct EnGuruguru {
     /* 0x278 */ ColliderCylinder collider;
 } EnGuruguru; // size = 0x2C4
 
-extern const ActorInit En_Guruguru_InitVars;
-
 #endif // Z_EN_GURUGURU_H
diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h
index 93931e9f33..4934c7fc82 100644
--- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h
+++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h
@@ -22,6 +22,4 @@ typedef struct EnHakurock {
     /* 0x14C */ ColliderCylinder collider;
 } EnHakurock; // size = 0x198
 
-extern const ActorInit En_Hakurock_InitVars;
-
 #endif // Z_EN_HAKUROCK_H
diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h
index a219ab2baf..4c0c2e2164 100644
--- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h
+++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.h
@@ -32,6 +32,4 @@ typedef struct EnHanabi {
     /* 0x4654 */ EnHanabiActionFunc actionFunc;
 } EnHanabi; // size = 0x4658
 
-extern const ActorInit En_Hanabi_InitVars;
-
 #endif // Z_EN_HANABI_H
diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.h b/src/overlays/actors/ovl_En_Hata/z_en_hata.h
index fc96f302af..155460f600 100644
--- a/src/overlays/actors/ovl_En_Hata/z_en_hata.h
+++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.h
@@ -17,6 +17,4 @@ typedef struct EnHata {
     /* 0x2A4 */ Vec3f unk_2A4;
 } EnHata; /* size = 0x2B0 */
 
-extern const ActorInit En_Hata_InitVars;
-
 #endif // Z_EN_HATA_H
diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.h b/src/overlays/actors/ovl_En_Hg/z_en_hg.h
index 2883143791..f887924df9 100644
--- a/src/overlays/actors/ovl_En_Hg/z_en_hg.h
+++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.h
@@ -23,6 +23,4 @@ typedef struct EnHg {
     /* 0x310 */ u16 cutscenes[4];
 } EnHg; // size = 0x318
 
-extern const ActorInit En_Hg_InitVars;
-
 #endif // Z_EN_HG_H
diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h
index 34e4ebdc48..c9b0b53e1a 100644
--- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h
+++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.h
@@ -27,6 +27,4 @@ typedef struct EnHgo {
     /* 0x316 */ u16 unk_316;
 } EnHgo; // size = 0x318
 
-extern const ActorInit En_Hgo_InitVars;
-
 #endif // Z_EN_HGO_H
diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h
index a8edd1d75d..e40a89193e 100644
--- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h
+++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.h
@@ -33,6 +33,4 @@ typedef struct EnHiddenNuts {
     /* 0x234 */ ColliderCylinder collider;
 } EnHiddenNuts; // size = 0x280
 
-extern const ActorInit En_Hidden_Nuts_InitVars;
-
 #endif // Z_EN_HIDDEN_NUTS_H
diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h
index 44fd8c4ef8..22f72084d6 100644
--- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h
+++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.h
@@ -32,6 +32,4 @@ typedef struct EnHintSkb {
     /* 0x3E9 */ u8 drawDmgEffType;
 } EnHintSkb; // size = 0x3EC
 
-extern const ActorInit En_Hint_Skb_InitVars;
-
 #endif // Z_EN_HINT_SKB_H
diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h
index f48ffbe9d9..8f07b7d9ea 100644
--- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h
+++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.h
@@ -15,6 +15,4 @@ typedef struct EnHitTag {
     /* 0x190 */ EnHitTagActionFunc actionFunc;
 } EnHitTag; // size = 0x194
 
-extern const ActorInit En_Hit_Tag_InitVars;
-
 #endif // Z_EN_HIT_TAG_H
diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.h b/src/overlays/actors/ovl_En_Holl/z_en_holl.h
index 39c35220ca..e4d8791bae 100644
--- a/src/overlays/actors/ovl_En_Holl/z_en_holl.h
+++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.h
@@ -71,6 +71,4 @@ typedef struct EnHoll {
 #define EN_HOLL_SCALE_ALPHA(playerDistFromCentralPlane) ((playerDistFromCentralPlane - sTransparencyPlaneDistance) * (255 / (sTranslucencyPlaneDistance - sTransparencyPlaneDistance)))
 #define EN_HOLL_SCALE_BG_COVER_ALPHA(playerDistFromCentralPlane) ((EN_HOLL_ACTIVATION_PLANE_DISTANCE_VERTICAL - playerDistFromCentralPlane) * (255 / (EN_HOLL_ACTIVATION_PLANE_DISTANCE_VERTICAL - EN_HOLL_LOADING_PLANE_DISTANCE_VERTICAL)))
 
-extern const ActorInit En_Holl_InitVars;
-
 #endif // Z_EN_HOLL_H
diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
index bf4b08fd74..570269fe2b 100644
--- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
+++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h
@@ -13,6 +13,4 @@ typedef struct EnHonotrap {
     /* 0x148 */ char unk_148[0x17C];
 } EnHonotrap; // size = 0x2C4
 
-extern const ActorInit En_Honotrap_InitVars;
-
 #endif // Z_EN_HONOTRAP_H
diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h
index 9f32331c6d..95dc0f8c3d 100644
--- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h
+++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h
@@ -232,6 +232,4 @@ typedef struct EnHorse {
     /* 0x590 */ s32 unk_590;
 } EnHorse; // size = 0x594
 
-extern const ActorInit En_Horse_InitVars;
-
 #endif // Z_EN_HORSE_H
diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
index f07aafc1d3..52cdc2b645 100644
--- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
+++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h
@@ -55,6 +55,4 @@ typedef struct EnHorseGameCheck {
     /* 0x180 */ UNK_TYPE1 pad180[0x38];
 } EnHorseGameCheck; // size = 0x1B8
 
-extern const ActorInit En_Horse_Game_Check_InitVars;
-
 #endif // Z_EN_HORSE_GAME_CHECK_H
diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
index 660261ca21..62fac6a635 100644
--- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
+++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
@@ -23,6 +23,4 @@ typedef struct EnHorseLinkChild {
     /* 0x298 */ UNK_TYPE1 unk298[4];
 } EnHorseLinkChild; // size = 0x29C
 
-extern const ActorInit En_Horse_Link_Child_InitVars;
-
 #endif // Z_EN_HORSE_LINK_CHILD_H
diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.h b/src/overlays/actors/ovl_En_Hs/z_en_hs.h
index d72c72d158..79f94fd4ba 100644
--- a/src/overlays/actors/ovl_En_Hs/z_en_hs.h
+++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.h
@@ -34,6 +34,4 @@ typedef struct EnHs {
     /* 0x394 */ EnHsActionFunc actionFunc;
 } EnHs; // size = 0x398
 
-extern const ActorInit En_Hs_InitVars;
-
 #endif // Z_EN_HS_H
diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h
index 2c7568235a..69836605d5 100644
--- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h
+++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h
@@ -13,6 +13,4 @@ typedef struct EnHs2 {
     /* 0x394 */ EnHs2ActionFunc actionFunc;
 } EnHs2; // size = 0x398
 
-extern const ActorInit En_Hs2_InitVars;
-
 #endif // Z_EN_HS2_H
diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.h b/src/overlays/actors/ovl_En_Ig/z_en_ig.h
index 5ff18dfef2..c3fd0c3fb9 100644
--- a/src/overlays/actors/ovl_En_Ig/z_en_ig.h
+++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.h
@@ -62,6 +62,4 @@ typedef struct EnIg {
     /* 0x408 */ s32 unk_408;
 } EnIg; // size = 0x40C
 
-extern const ActorInit En_Ig_InitVars;
-
 #endif // Z_EN_IG_H
diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h
index a02c4845e7..3489329b1d 100644
--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h
@@ -48,6 +48,4 @@ typedef struct EnIk {
     /* 0x0550 */ IronKnuckleEffect effects[7];
 } EnIk; // size = 0x668
 
-extern const ActorInit En_Ik_InitVars;
-
 #endif // Z_EN_IK_H
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h
index 6c6a2f3dd3..1d5d18cbff 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.h
+++ b/src/overlays/actors/ovl_En_In/z_en_in.h
@@ -62,6 +62,4 @@ typedef struct EnIn {
     /* 0x4C0 */ s32 prevTalkState;
 } EnIn; // size = 0x4CC
 
-extern const ActorInit En_In_InitVars;
-
 #endif // Z_EN_IN_H
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.h b/src/overlays/actors/ovl_En_Insect/z_en_insect.h
index ae8304caee..ea40254141 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.h
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h
@@ -25,6 +25,4 @@ typedef struct EnInsect {
     /* 0x316 */ s16 unk_316;
 } EnInsect; // size = 0x318
 
-extern const ActorInit En_Insect_InitVars;
-
 #endif // Z_EN_INSECT_H
diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h
index 3826397a84..8c736bf3cb 100644
--- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h
+++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h
@@ -152,6 +152,4 @@ typedef struct EnInvadepoh {
     /* 0x3BC */ s8 unk3BC;
 } EnInvadepoh; // size = 0x3C0
 
-extern const ActorInit En_Invadepoh_InitVars;
-
 #endif // Z_EN_INVADEPOH_H
diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h
index 35cbb4da9c..ff13ca6686 100644
--- a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h
+++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.h
@@ -13,6 +13,4 @@ typedef struct EnInvadepohDemo {
     /* 0x148 */ char unk_148[0x180];
 } EnInvadepohDemo; // size = 0x2C8
 
-extern const ActorInit En_Invadepoh_Demo_InitVars;
-
 #endif // Z_EN_INVADEPOH_DEMO_H
diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h
index 49d9bd6ef6..5b6f6ca64f 100644
--- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h
+++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.h
@@ -18,6 +18,4 @@ typedef struct EnInvisibleRuppe {
     /* 0x194 */ EnInvisibleRuppeActionFunc actionFunc;
 } EnInvisibleRuppe; // size = 0x198
 
-extern const ActorInit En_Invisible_Ruppe_InitVars;
-
 #endif // Z_EN_INVISIBLE_RUPPE_H
diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
index 080abbf4af..65381f638a 100644
--- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
+++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
@@ -28,6 +28,4 @@ typedef struct EnIshi {
     /* 0x197 */ u8 unk_197;
 } EnIshi; // size = 0x198
 
-extern const ActorInit En_Ishi_InitVars;
-
 #endif // Z_EN_ISHI_H
diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.h b/src/overlays/actors/ovl_En_Ja/z_en_ja.h
index e2fd8287f3..00746ec63a 100644
--- a/src/overlays/actors/ovl_En_Ja/z_en_ja.h
+++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.h
@@ -60,6 +60,4 @@ typedef struct EnJa {
     /* 0x374 */ s32 prevTalkState;
 } EnJa; // size = 0x378
 
-extern const ActorInit En_Ja_InitVars;
-
 #endif // Z_EN_JA_H
diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h
index 165a768e2c..f2c64c37cc 100644
--- a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h
+++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h
@@ -16,6 +16,4 @@ typedef struct EnJcMato {
     /* 0x1A4 */ Vec3f pos;
 } EnJcMato; // size = 0x1B0
 
-extern const ActorInit En_Jc_Mato_InitVars;
-
 #endif // Z_EN_JC_MATO_H
diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.h b/src/overlays/actors/ovl_En_Jg/z_en_jg.h
index f225b51f7c..f1b4075f53 100644
--- a/src/overlays/actors/ovl_En_Jg/z_en_jg.h
+++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.h
@@ -40,6 +40,4 @@ typedef struct EnJg {
     /* 0x3D0 */ u8 focusedShrineGoronParam;
 } EnJg; // size = 0x3D4
 
-extern const ActorInit En_Jg_InitVars;
-
 #endif // Z_EN_JG_H
diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h
index 5fdf911ccf..c32a51565f 100644
--- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h
+++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.h
@@ -37,6 +37,4 @@ typedef struct EnJgameTsn {
     /* 0x300 */ u16 unk_300;
 } EnJgameTsn; // size = 0x304
 
-extern const ActorInit En_Jgame_Tsn_InitVars;
-
 #endif // Z_EN_JGAME_TSN_H
diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.h b/src/overlays/actors/ovl_En_Js/z_en_js.h
index 96c1bbf49e..d52bfeb43c 100644
--- a/src/overlays/actors/ovl_En_Js/z_en_js.h
+++ b/src/overlays/actors/ovl_En_Js/z_en_js.h
@@ -13,6 +13,4 @@ typedef struct EnJs {
     /* 0x2C4 */ EnJsActionFunc actionFunc;
 } EnJs; // size = 0x2C8
 
-extern const ActorInit En_Js_InitVars;
-
 #endif // Z_EN_JS_H
diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.h b/src/overlays/actors/ovl_En_Jso/z_en_jso.h
index e2961c3aec..7f5db07570 100644
--- a/src/overlays/actors/ovl_En_Jso/z_en_jso.h
+++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.h
@@ -14,6 +14,4 @@ typedef struct EnJso {
     /* 0x27C */ char unk_27C[0xD70];
 } EnJso; // size = 0xFEC
 
-extern const ActorInit En_Jso_InitVars;
-
 #endif // Z_EN_JSO_H
diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h
index 30f7872d55..274aaa284c 100644
--- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h
+++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.h
@@ -14,6 +14,4 @@ typedef struct EnJso2 {
     /* 0x027C */ char unk_27C[0xE14];
 } EnJso2; // size = 0x1090
 
-extern const ActorInit En_Jso2_InitVars;
-
 #endif // Z_EN_JSO2_H
diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h
index 8ef208926a..cc282f19f0 100644
--- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h
+++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h
@@ -17,6 +17,4 @@ typedef struct EnKaizoku {
     /* 0x2F6 */ char unk_2F6[0x2FA];
 } EnKaizoku; // size = 0x5F0
 
-extern const ActorInit En_Kaizoku_InitVars;
-
 #endif // Z_EN_KAIZOKU_H
diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h
index c1a788d466..659fb74284 100644
--- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h
+++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h
@@ -41,8 +41,6 @@ typedef struct EnKakasi {
     /* 0x254 */ ColliderCylinder collider;
 } EnKakasi; // size = 0x2A0
 
-extern const ActorInit En_Kakasi_InitVars;
-
 #define ENKAKASI_ABOVE_GROUND_TYPE 2
 
 #define GET_KAKASI_SUMMON_DISTANCE(thisx) (((thisx)->params >> 0x8) & 0xFF) 
diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.h b/src/overlays/actors/ovl_En_Kame/z_en_kame.h
index 6e0aa371b5..b6ebc3a23a 100644
--- a/src/overlays/actors/ovl_En_Kame/z_en_kame.h
+++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.h
@@ -33,6 +33,4 @@ typedef struct EnKame {
     /* 0x340 */ ColliderCylinder collider;
 } EnKame; // size = 0x38C
 
-extern const ActorInit En_Kame_InitVars;
-
 #endif // Z_EN_KAME_H
diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h
index 201364bc02..e54bb3fad9 100644
--- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h
+++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h
@@ -105,6 +105,4 @@ typedef struct EnKanban {
 #define ENKANBAN_PIECE ((s16)0xFFDD)
 #define ENKANBAN_FISHING 0x300
 
-extern const ActorInit En_Kanban_InitVars;
-
 #endif // Z_EN_KANBAN_H
diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
index 9d41245e69..5063a8dbe6 100644
--- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
+++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h
@@ -30,6 +30,4 @@ typedef struct EnKarebaba {
     /* 0x27C */ ColliderCylinder collider2;
 } EnKarebaba; // size = 0x2C8
 
-extern const ActorInit En_Karebaba_InitVars;
-
 #endif // Z_EN_KAREBABA_H
diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h
index dbbb96e768..eb491bf281 100644
--- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h
+++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.h
@@ -23,6 +23,4 @@ typedef struct EnKbt {
     /* 0x288 */ EnKbtActionFunc actionFunc;
 } EnKbt; // size = 0x28C
 
-extern const ActorInit En_Kbt_InitVars;
-
 #endif // Z_EN_KBT_H
diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h
index 2d49058e8f..1992f72347 100644
--- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h
+++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h
@@ -32,6 +32,4 @@ typedef struct EnKendoJs {
     /* 0x292 */ u8 unk_292;
 } EnKendoJs; // size = 0x294
 
-extern const ActorInit En_Kendo_Js_InitVars;
-
 #endif // Z_EN_KENDO_JS_H
diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h
index ce7deceb4f..d9423783d2 100644
--- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h
+++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.h
@@ -38,6 +38,4 @@ typedef struct EnKgy {
     /* 0x304 */ EnKgyActionFunc actionFunc;
 } EnKgy; // size = 0x308
 
-extern const ActorInit En_Kgy_InitVars;
-
 #endif // Z_EN_KGY_H
diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h
index 2ef14c942f..9d2ae096b0 100644
--- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h
+++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.h
@@ -13,6 +13,4 @@ typedef struct EnKitan {
     /* 0x2D8 */ EnKitanActionFunc actionFunc;
 } EnKitan; // size = 0x2DC
 
-extern const ActorInit En_Kitan_InitVars;
-
 #endif // Z_EN_KITAN_H
diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.h b/src/overlays/actors/ovl_En_Knight/z_en_knight.h
index a4fca8554e..bccdd0b47d 100644
--- a/src/overlays/actors/ovl_En_Knight/z_en_knight.h
+++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.h
@@ -26,6 +26,4 @@ typedef struct EnKnight {
     /* 0x68C */ char pad68C[0x48];
 } EnKnight; // size = 0x6D4
 
-extern const ActorInit En_Knight_InitVars;
-
 #endif // Z_EN_KNIGHT_H
diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h
index 69fad156ed..5d449963b1 100644
--- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h
+++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.h
@@ -14,6 +14,4 @@ typedef struct EnKujiya {
     /* 0x14A */ s16 textId;
 } EnKujiya; // size = 0x14C
 
-extern const ActorInit En_Kujiya_InitVars;
-
 #endif // Z_EN_KUJIYA_H
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
index a4be56cf68..43aacd2210 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h
@@ -25,8 +25,6 @@ typedef struct EnKusa {
     /* 0x198 */ u8 isInWater;
 } EnKusa; // size = 0x19C
 
-extern const ActorInit En_Kusa_InitVars;
-
 #define KUSA_GET_COLLECTIBLE_ID(thisx) (((thisx)->params >> 8) & 0x7F)
 #define KUSA_GET_RAND_COLLECTIBLE_ID(thisx) (((thisx)->params >> 8) & 0xF)
 #define KUSA_SHOULD_SPAWN_BUGS(thisx) (((thisx)->params >> 0x4) & 1)
diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h
index 67e172ee8d..c7fd17359d 100644
--- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h
+++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h
@@ -81,6 +81,4 @@ typedef struct EnKusa2 {
     /* 0x1D1 */ s8 unk_1D1;
 } EnKusa2; // size = 0x1D4
 
-extern const ActorInit En_Kusa2_InitVars;
-
 #endif // Z_EN_KUSA2_H
diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h
index ad6014dd9f..61de8ad4fa 100644
--- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h
+++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.h
@@ -14,6 +14,4 @@ typedef struct EnLiftNuts {
     /* 0x1D8 */ char unk_1D8[0x180];
 } EnLiftNuts; // size = 0x358
 
-extern const ActorInit En_Lift_Nuts_InitVars;
-
 #endif // Z_EN_LIFT_NUTS_H
diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.h b/src/overlays/actors/ovl_En_Light/z_en_light.h
index b17f55fd72..17762d7fa7 100644
--- a/src/overlays/actors/ovl_En_Light/z_en_light.h
+++ b/src/overlays/actors/ovl_En_Light/z_en_light.h
@@ -20,6 +20,4 @@ typedef struct EnLight {
     /* 0x14C */ LightInfo lightInfo;
 } EnLight; // size = 0x15C
 
-extern const ActorInit En_Light_InitVars;
-
 #endif // Z_EN_LIGHT_H
diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h
index 9d5a1eb247..b72215ce69 100644
--- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h
+++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.h
@@ -35,6 +35,4 @@ typedef struct EnLookNuts {
     /* 0x244 */ ColliderCylinder collider;
 } EnLookNuts; // size = 0x290
 
-extern const ActorInit En_Look_Nuts_InitVars;
-
 #endif // Z_EN_LOOK_NUTS_H
diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
index fd5504e15f..144e48d4d2 100644
--- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
+++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.h
@@ -11,6 +11,4 @@ typedef struct EnMFire1 {
     /* 0x190 */ f32 timer;
 } EnMFire1; // size = 0x194
 
-extern const ActorInit En_M_Fire1_InitVars;
-
 #endif // Z_EN_M_FIRE1_H
diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
index 14d0227704..6628b5ceaa 100644
--- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
+++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h
@@ -14,6 +14,4 @@ typedef struct EnMThunder {
     /* 0x1BC */ char unk_1BC[0x8];
 } EnMThunder; // size = 0x1C4
 
-extern const ActorInit En_M_Thunder_InitVars;
-
 #endif // Z_EN_M_THUNDER_H
diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
index 148e2ef30d..3ac405b009 100644
--- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
+++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
@@ -35,6 +35,4 @@ typedef struct EnMa4 {
     /* 0x33E */ u16 textId;
 } EnMa4; // size = 0x340
 
-extern const ActorInit En_Ma4_InitVars;
-
 #endif // Z_EN_MA4_H
diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h
index 7f2c50fb3e..00b9cc3511 100644
--- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h
+++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h
@@ -30,8 +30,6 @@ typedef struct EnMaYto {
     /* 0x322 */ u16 textId;
 } EnMaYto; // size = 0x324
 
-extern const ActorInit En_Ma_Yto_InitVars;
-
 typedef enum {
     /* 0 */ MA_YTO_TYPE_DEFAULT, // Strokes cow on day 1
     /* 1 */ MA_YTO_TYPE_BARN,
diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h
index c3da6b71d7..201c958fea 100644
--- a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h
+++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h
@@ -31,8 +31,6 @@ typedef struct EnMaYts {
     /* 0x338 */ u16 textId;
 } EnMaYts; // size = 0x33C
 
-extern const ActorInit En_Ma_Yts_InitVars;
-
 typedef enum {
     /* 0 */ MA_YTS_TYPE_BARN,
     /* 1 */ MA_YTS_TYPE_SITTING,
diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.h b/src/overlays/actors/ovl_En_Mag/z_en_mag.h
index d55d63ccb8..9515abc716 100644
--- a/src/overlays/actors/ovl_En_Mag/z_en_mag.h
+++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.h
@@ -47,6 +47,4 @@ typedef struct EnMag {
     /* 0x11F74 */ UNK_TYPE1 unk11F74[4];
 } EnMag; // size = 0x11F78
 
-extern const ActorInit En_Mag_InitVars;
-
 #endif // Z_EN_MAG_H
diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h
index 1af506c587..0216ba3830 100644
--- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h
+++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.h
@@ -27,6 +27,4 @@ typedef struct EnMaruta {
     /* 0x220 */ s16 unk_220;
 } EnMaruta; // size = 0x224
 
-extern const ActorInit En_Maruta_InitVars;
-
 #endif // Z_EN_MARUTA_H
diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h
index 427bafa1ef..0a08318abd 100644
--- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h
+++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.h
@@ -13,6 +13,4 @@ typedef struct EnMinideath {
     /* 0x148 */ char unk_148[0x164];
 } EnMinideath; // size = 0x2AC
 
-extern const ActorInit En_Minideath_InitVars;
-
 #endif // Z_EN_MINIDEATH_H
diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h
index a71caa6501..9a3801d91c 100644
--- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h
+++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.h
@@ -38,6 +38,4 @@ typedef struct EnMinifrog {
     /* 0x2B8 */ ColliderCylinder collider;
 } EnMinifrog; // size = 0x304
 
-extern const ActorInit En_Minifrog_InitVars;
-
 #endif // Z_EN_MINIFROG_H
diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h
index 28629f464d..77cabe9b6b 100644
--- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h
+++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.h
@@ -50,6 +50,4 @@ typedef struct EnMinislime {
     /* 0x160 */ ColliderCylinder collider;
 } EnMinislime; // size = 0x1AC
 
-extern const ActorInit En_Minislime_InitVars;
-
 #endif // Z_EN_MINISLIME_H
diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.h b/src/overlays/actors/ovl_En_Mk/z_en_mk.h
index ed6cd69979..bbf126f4ee 100644
--- a/src/overlays/actors/ovl_En_Mk/z_en_mk.h
+++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.h
@@ -21,6 +21,4 @@ typedef struct EnMk {
     /* 0x280 */ EnMkActionFunc actionFunc;
 } EnMk; // size = 0x284
 
-extern const ActorInit En_Mk_InitVars;
-
 #endif // Z_EN_MK_H
diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h
index 200186c447..647b097cca 100644
--- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h
+++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.h
@@ -13,6 +13,4 @@ typedef struct EnMkk {
     /* 0x148 */ char unk_148[0x8C];
 } EnMkk; // size = 0x1D4
 
-extern const ActorInit En_Mkk_InitVars;
-
 #endif // Z_EN_MKK_H
diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
index 1b3dcc0aa5..4f961e1c08 100644
--- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
+++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h
@@ -14,6 +14,4 @@ typedef struct EnMm2 {
     /* 0x18C */ UNK_TYPE1 unk_18C[0x128];
 } EnMm2; // size = 0x2B4
 
-extern const ActorInit En_Mm2_InitVars;
-
 #endif // Z_EN_MM2_H
diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h
index b6f653935e..373da7ecba 100644
--- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h
+++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.h
@@ -25,6 +25,4 @@ typedef struct EnMm3 {
     /* 0x2B4 */ u16 unk_2B4;
 } EnMm3; // size = 0x2B8
 
-extern const ActorInit En_Mm3_InitVars;
-
 #endif // Z_EN_MM3_H
diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h
index 495b8f07bb..594817dd16 100644
--- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h
+++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.h
@@ -13,6 +13,4 @@ typedef struct EnMnk {
     /* 0x3E8 */ EnMnkActionFunc actionFunc;
 } EnMnk; // size = 0x3EC
 
-extern const ActorInit En_Mnk_InitVars;
-
 #endif // Z_EN_MNK_H
diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.h b/src/overlays/actors/ovl_En_Ms/z_en_ms.h
index dcff0cb58d..aa46b820d3 100644
--- a/src/overlays/actors/ovl_En_Ms/z_en_ms.h
+++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.h
@@ -16,6 +16,4 @@ typedef struct EnMs {
     /* 0x1F8 */ ColliderCylinder collider;
 } EnMs; // size = 0x244
 
-extern const ActorInit En_Ms_InitVars;
-
 #endif // Z_EN_MS_H
diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h
index 34f86048cc..19ebdb8d81 100644
--- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h
+++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.h
@@ -18,6 +18,4 @@ typedef struct EnMttag {
     /* 0x164 */ s32 shouldRestartRace;
 } EnMttag; // size = 0x168
 
-extern const ActorInit En_Mt_tag_InitVars;
-
 #endif // Z_EN_MT_TAG_H
diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h
index 159116928c..1a776a52ad 100644
--- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h
+++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.h
@@ -45,6 +45,4 @@ typedef struct EnMushi2 {
     /* 0x370 */ s16 unk_370;
 } EnMushi2; // size = 0x374
 
-extern const ActorInit En_Mushi2_InitVars;
-
 #endif // Z_EN_MUSHI2_H
diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.h b/src/overlays/actors/ovl_En_Muto/z_en_muto.h
index e05e294920..6ac984c8db 100644
--- a/src/overlays/actors/ovl_En_Muto/z_en_muto.h
+++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.h
@@ -30,6 +30,4 @@ typedef struct EnMuto {
     /* 0x294 */ ColliderCylinder collider;
 } EnMuto; // size = 0x2E0
 
-extern const ActorInit En_Muto_InitVars;
-
 #endif // Z_EN_MUTO_H
diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.h b/src/overlays/actors/ovl_En_Nb/z_en_nb.h
index b094456d92..9d780e468e 100644
--- a/src/overlays/actors/ovl_En_Nb/z_en_nb.h
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.h
@@ -14,6 +14,4 @@ typedef struct EnNb {
     /* 0x18C */ char unk_18C[0x110];
 } EnNb; // size = 0x29C
 
-extern const ActorInit En_Nb_InitVars;
-
 #endif // Z_EN_NB_H
diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h
index a739d96db7..2cd24c88e8 100644
--- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h
+++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.h
@@ -31,6 +31,4 @@ typedef struct EnNeoReeba {
     /* 0x310 */ u8 drawEffectType;
 } EnNeoReeba; // size = 0x314
 
-extern const ActorInit En_Neo_Reeba_InitVars;
-
 #endif // Z_EN_NEO_REEBA_H
diff --git a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h
index 634697736f..ed2b4feff4 100644
--- a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h
+++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.h
@@ -10,6 +10,4 @@ typedef struct EnNimotsu {
     /* 0x144 */ char unk_144[0x98];
 } EnNimotsu; // size = 0x1DC
 
-extern const ActorInit En_Nimotsu_InitVars;
-
 #endif // Z_EN_NIMOTSU_H
diff --git a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.h b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.h
index 344ccb3459..bcbf9caebc 100644
--- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.h
+++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.h
@@ -13,6 +13,4 @@ typedef struct EnNnh {
     /* 0x190 */ EnNnhActionFunc actionFunc;
 } EnNnh; // size = 0x194
 
-extern const ActorInit En_Nnh_InitVars;
-
 #endif // Z_EN_NNH_H
diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h
index a8ae31da2f..04e8077279 100644
--- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h
+++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h
@@ -12,6 +12,4 @@ typedef struct EnNutsball {
     /* 0x148 */ ColliderCylinder collider;
 } EnNutsball; // size = 0x194
 
-extern const ActorInit En_Nutsball_InitVars;
-
 #endif // Z_EN_NUTSBALL_H
diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
index 8d2d34c6a7..51c017dff4 100644
--- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
+++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
@@ -35,6 +35,4 @@ typedef struct EnNwc {
     /* 0x264 */ EnNwcActionFunc actionFunc;
 } EnNwc; // size = 0x268
 
-extern const ActorInit En_Nwc_InitVars;
-
 #endif // Z_EN_NWC_H
diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h
index 67fa74b2c9..b633ab3905 100644
--- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h
+++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.h
@@ -14,6 +14,4 @@ typedef struct EnOkarinaEffect {
     /* 0x148 */ EnOkarinaEffectActionFunc actionFunc;
 } EnOkarinaEffect; // size = 0x14C
 
-extern const ActorInit En_Okarina_Effect_InitVars;
-
 #endif // Z_EN_OKARINA_EFFECT_H
diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
index 8dd51805ce..0dd15c1c9c 100644
--- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
+++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h
@@ -22,6 +22,4 @@ typedef struct EnOkarinaTag {
     /* 0x158 */ f32 unk158;
 } EnOkarinaTag; // size = 0x15C
 
-extern const ActorInit En_Okarina_Tag_InitVars;
-
 #endif // Z_EN_OKARINA_TAG_H
diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
index c23a4db364..93a68ae380 100644
--- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
+++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
@@ -14,6 +14,4 @@ typedef struct EnOkuta {
     /* 0x18C */ char unk_18C[0x1A8];
 } EnOkuta; // size = 0x334
 
-extern const ActorInit En_Okuta_InitVars;
-
 #endif // Z_EN_OKUTA_H
diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h
index 88cd1e4df2..581ea35dd7 100644
--- a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h
+++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.h
@@ -16,6 +16,4 @@ typedef struct EnOnpuman {
     /* 0x2A8 */ EnOnpumanActionFunc actionFunc;
 } EnOnpuman; // size = 0x2AC
 
-extern const ActorInit En_Onpuman_InitVars;
-
 #endif // Z_EN_ONPUMAN_H
diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.h b/src/overlays/actors/ovl_En_Osk/z_en_osk.h
index d8a4be4ce3..0358911d36 100644
--- a/src/overlays/actors/ovl_En_Osk/z_en_osk.h
+++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.h
@@ -24,6 +24,4 @@ typedef struct EnOsk {
     /* 0x260 */ EnOskActionFunc actionFunc;
 } EnOsk; // size = 0x264
 
-extern const ActorInit En_Osk_InitVars;
-
 #endif // Z_EN_OSK_H
diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.h b/src/overlays/actors/ovl_En_Osn/z_en_osn.h
index fdc8ed2c76..5d9858bd4d 100644
--- a/src/overlays/actors/ovl_En_Osn/z_en_osn.h
+++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.h
@@ -26,8 +26,6 @@ typedef struct EnOsn {
     /* 0x1FA */ u8 unk_1FA;
 } EnOsn; // size = 0x1FB
 
-extern const ActorInit En_Osn_InitVars;
-
 #define ENOSN_GET_3(this) ((thisx)->params & 3) 
 
 #endif // Z_EN_OSN_H
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
index 32c6fc2889..d9ccf2e014 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
+++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
@@ -72,6 +72,4 @@ typedef enum {
     /* 1 */ ENOSSAN_PART_TIME_WORKER
 } EnOssanWorker;
 
-extern const ActorInit En_Ossan_InitVars;
-
 #endif // Z_EN_OSSAN_H
diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.h b/src/overlays/actors/ovl_En_Ot/z_en_ot.h
index e123b88716..ead9a6c69c 100644
--- a/src/overlays/actors/ovl_En_Ot/z_en_ot.h
+++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.h
@@ -64,6 +64,4 @@ typedef struct EnOt {
     /* 0x74C */ Vec3f unk_74C;
 } EnOt; // size = 0x758
 
-extern const ActorInit En_Ot_InitVars;
-
 #endif // Z_EN_OT_H
diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/src/overlays/actors/ovl_En_Owl/z_en_owl.h
index 781fd308c7..0338578868 100644
--- a/src/overlays/actors/ovl_En_Owl/z_en_owl.h
+++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h
@@ -56,6 +56,4 @@ typedef struct EnOwl {
     /* 0x414 */ EnOwlFunc unk_414;
 } EnOwl; // size = 0x418
 
-extern const ActorInit En_Owl_InitVars;
-
 #endif // Z_EN_OWL_H
diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h
index cf5611c4ed..34f18e8153 100644
--- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h
+++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h
@@ -37,6 +37,4 @@ typedef struct EnPamera {
     /* 0x326 */ u16 unk_326;
 } EnPamera; // size = 0x328
 
-extern const ActorInit En_Pamera_InitVars;
-
 #endif // Z_EN_PAMERA_H
diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h
index 3f3e82165b..298e3b5174 100644
--- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h
+++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h
@@ -49,6 +49,4 @@ typedef struct EnPametfrog {
     /* 0x3A4 */ ColliderJntSphElement colElement[2];
 } EnPametfrog; // size = 0x424
 
-extern const ActorInit En_Pametfrog_InitVars;
-
 #endif // Z_EN_PAMETFROG_H
diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.h b/src/overlays/actors/ovl_En_Paper/z_en_paper.h
index 9c4e6cc501..f8dbafa04b 100644
--- a/src/overlays/actors/ovl_En_Paper/z_en_paper.h
+++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.h
@@ -13,6 +13,4 @@ typedef struct EnPaper {
     /* 0x148 */ char unk_148[0xC40];
 } EnPaper; // size = 0xD88
 
-extern const ActorInit En_Paper_InitVars;
-
 #endif // Z_EN_PAPER_H
diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.h b/src/overlays/actors/ovl_En_Part/z_en_part.h
index 53a03f281f..662e8574e4 100644
--- a/src/overlays/actors/ovl_En_Part/z_en_part.h
+++ b/src/overlays/actors/ovl_En_Part/z_en_part.h
@@ -23,6 +23,4 @@ typedef struct EnPart {
     /* 0x150 */ Gfx* dList;
 } EnPart; // size = 0x154
 
-extern const ActorInit En_Part_InitVars;
-
 #endif // Z_EN_PART_H
diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h
index 182dd9175f..248599c63a 100644
--- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h
+++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h
@@ -35,6 +35,4 @@ typedef struct EnPeehat {
     /* 0x488 */ ColliderTrisElement colliderTriElements[2];
 } EnPeehat; // size = 0x540
 
-extern const ActorInit En_Peehat_InitVars;
-
 #endif // Z_EN_PEEHAT_H
diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.h b/src/overlays/actors/ovl_En_Pm/z_en_pm.h
index de7359d936..c7bf76e378 100644
--- a/src/overlays/actors/ovl_En_Pm/z_en_pm.h
+++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.h
@@ -58,6 +58,4 @@ typedef struct EnPm {
     /* 0x39C */ UNK_TYPE1 unk_39C[0x4];
 } EnPm; // size = 0x3A0
 
-extern const ActorInit En_Pm_InitVars;
-
 #endif // Z_EN_PM_H
diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h
index 3d70aa8a43..a42b5048f7 100644
--- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h
+++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.h
@@ -14,6 +14,4 @@ typedef struct EnPoComposer {
     /* 0x238 */ char unk_238[0x108];
 } EnPoComposer; // size = 0x340
 
-extern const ActorInit En_Po_Composer_InitVars;
-
 #endif // Z_EN_PO_COMPOSER_H
diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h
index 92f75afabb..0229399b38 100644
--- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h
+++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.h
@@ -30,6 +30,4 @@ typedef struct EnPoFusen {
     /* 0x270 */ s16 fuse;
 } EnPoFusen; // size = 0x274
 
-extern const ActorInit En_Po_Fusen_InitVars;
-
 #endif // Z_EN_PO_FUSEN_H
diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
index 368ad9da12..5e549c4d77 100644
--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h
@@ -68,6 +68,4 @@ typedef struct EnPoSisters {
     /* 0x358 */ MtxF mtxf;
 } EnPoSisters; // size = 0x398
 
-extern const ActorInit En_Po_Sisters_InitVars;
-
 #endif // Z_EN_PO_SISTERS_H
diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.h b/src/overlays/actors/ovl_En_Poh/z_en_poh.h
index 083b44f3f5..b07be6195a 100644
--- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h
+++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h
@@ -37,6 +37,4 @@ typedef struct EnPoh {
     /* 0x3D8 */ MtxF unk_3D8;
 } EnPoh; // size = 0x418
 
-extern const ActorInit En_Poh_InitVars;
-
 #endif // Z_EN_POH_H
diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.h b/src/overlays/actors/ovl_En_Pp/z_en_pp.h
index 4fab409b21..d0c018750f 100644
--- a/src/overlays/actors/ovl_En_Pp/z_en_pp.h
+++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.h
@@ -14,6 +14,4 @@ typedef struct EnPp {
     /* 0x2C4 */ char unk_2C4[0x328];
 } EnPp; // size = 0x5EC
 
-extern const ActorInit En_Pp_InitVars;
-
 #endif // Z_EN_PP_H
diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.h b/src/overlays/actors/ovl_En_Pr/z_en_pr.h
index 6a5fe8b5a8..dfa3081ca0 100644
--- a/src/overlays/actors/ovl_En_Pr/z_en_pr.h
+++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.h
@@ -54,6 +54,4 @@ typedef struct EnPr {
     /* 0x2FC */ ColliderCylinder collider;
 } EnPr; // size = 0x348
 
-extern const ActorInit En_Pr_InitVars;
-
 #endif // Z_EN_PR_H
diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
index df5afef4e4..617a5cc73b 100644
--- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
+++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
@@ -51,6 +51,4 @@ typedef struct EnPr2 {
     /* 0x27C */ ColliderCylinder collider;
 } EnPr2; // size = 0x2C8
 
-extern const ActorInit En_Pr2_InitVars;
-
 #endif // Z_EN_PR2_H
diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.h b/src/overlays/actors/ovl_En_Prz/z_en_prz.h
index 75087c9bce..db91c7c035 100644
--- a/src/overlays/actors/ovl_En_Prz/z_en_prz.h
+++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.h
@@ -42,6 +42,4 @@ typedef struct EnPrz {
     /* 0x224 */ ColliderCylinder collider;
 } EnPrz; // size = 0x270
 
-extern const ActorInit En_Prz_InitVars;
-
 #endif // Z_EN_PRZ_H
diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.h b/src/overlays/actors/ovl_En_Pst/z_en_pst.h
index ba60b4bf0e..77bc257918 100644
--- a/src/overlays/actors/ovl_En_Pst/z_en_pst.h
+++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.h
@@ -14,6 +14,4 @@ typedef struct EnPst {
     /* 0x18C */ char unk_18C[0x94];
 } EnPst; // size = 0x220
 
-extern const ActorInit En_Pst_InitVars;
-
 #endif // Z_EN_PST_H
diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h
index b0b40be64a..9d49ea4c26 100644
--- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h
+++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.h
@@ -51,6 +51,4 @@ typedef struct EnRacedog {
     /* 0x2C4 */ f32 selectionArrowScale;
 } EnRacedog; // size = 0x2C8
 
-extern const ActorInit En_Racedog_InitVars;
-
 #endif // Z_EN_RACEDOG_H
diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.h b/src/overlays/actors/ovl_En_Raf/z_en_raf.h
index 831346d38c..f4659f48be 100644
--- a/src/overlays/actors/ovl_En_Raf/z_en_raf.h
+++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.h
@@ -64,6 +64,4 @@ typedef struct EnRaf {
     /* 0x41C */ EnRafEffect effects[EN_RAF_EFFECT_COUNT];
 } EnRaf; // size = 0xAE4
 
-extern const ActorInit En_Raf_InitVars;
-
 #endif // Z_EN_RAF_H
diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h
index 09d3b4c4c9..10c2653c4e 100644
--- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h
+++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h
@@ -43,6 +43,4 @@ typedef struct EnRailSkb {
     /* 0x403 */ u8 drawDmgEffType;
 } EnRailSkb; // size = 0x404
 
-extern const ActorInit En_Rail_Skb_InitVars;
-
 #endif // Z_EN_RAIL_SKB_H
diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h
index 65e8e9736c..edd7fca481 100644
--- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h
+++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h
@@ -55,6 +55,4 @@ typedef struct EnRailgibud {
     /* 0x405 */ s8 unk_405; // related to player->unk_ADD
 } EnRailgibud; // size = 0x408
 
-extern const ActorInit En_Railgibud_InitVars;
-
 #endif // Z_EN_RAILGIBUD_H
diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.h b/src/overlays/actors/ovl_En_Rat/z_en_rat.h
index c3ad7eedc3..ac07dec3af 100644
--- a/src/overlays/actors/ovl_En_Rat/z_en_rat.h
+++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.h
@@ -10,6 +10,4 @@ typedef struct EnRat {
     /* 0x144 */ char unk_144[0x17C];
 } EnRat; // size = 0x2C0
 
-extern const ActorInit En_Rat_InitVars;
-
 #endif // Z_EN_RAT_H
diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h
index 0affac4f12..f5fbf82cba 100644
--- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h
+++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h
@@ -72,6 +72,4 @@ typedef struct EnRd {
     /* 0x3F1 */ s8 unk_3F1; // related to player->unk_ADD
 } EnRd; // size = 0x3F4
 
-extern const ActorInit En_Rd_InitVars;
-
 #endif // Z_EN_RD_H
diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h
index b6684fc9e7..a0fba9fdca 100644
--- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h
+++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.h
@@ -17,6 +17,4 @@ typedef struct EnRecepgirl {
     /* 0x2AE */ Vec3s headRot;
 } EnRecepgirl; // size = 0x2B4
 
-extern const ActorInit En_Recepgirl_InitVars;
-
 #endif // Z_EN_RECEPGIRL_H
diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.h b/src/overlays/actors/ovl_En_Rg/z_en_rg.h
index fe0a000b67..4db0b58e09 100644
--- a/src/overlays/actors/ovl_En_Rg/z_en_rg.h
+++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.h
@@ -52,6 +52,4 @@ typedef struct EnRg {
     /* 0x34C */ EnRgStruct unk_34C[32];
 } EnRg; // size = 0xACC
 
-extern const ActorInit En_Rg_InitVars;
-
 #endif // Z_EN_RG_H
diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h
index b8dbcc513c..eff4fbb472 100644
--- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h
+++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h
@@ -45,6 +45,4 @@ typedef struct EnRiverSound {
     /* 0x148 */ Vec3s* pathPoints;
 } EnRiverSound; // size = 0x14C
 
-extern const ActorInit En_River_Sound_InitVars;
-
 #endif // Z_EN_RIVER_SOUND_H
diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.h b/src/overlays/actors/ovl_En_Rr/z_en_rr.h
index 072e78105d..e996cfb129 100644
--- a/src/overlays/actors/ovl_En_Rr/z_en_rr.h
+++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.h
@@ -62,6 +62,4 @@ typedef struct EnRr {
     /* 0x324 */ EnRrStruct unk_324[5];
 } EnRr; // size = 0x3C4
 
-extern const ActorInit En_Rr_InitVars;
-
 #endif // Z_EN_RR_H
diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h
index b540144381..438a49b1e5 100644
--- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h
+++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h
@@ -16,6 +16,4 @@ typedef struct EnRsn {
     /* 0x1DE */ Vec3s unk1DE;
 } EnRsn; // size = 0x1E4
 
-extern const ActorInit En_Rsn_InitVars;
-
 #endif // Z_EN_RSN_H
diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.h b/src/overlays/actors/ovl_En_Ru/z_en_ru.h
index 29c903aff2..c498fd3848 100644
--- a/src/overlays/actors/ovl_En_Ru/z_en_ru.h
+++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.h
@@ -13,6 +13,4 @@ typedef struct EnRu {
     /* 0x148 */ char unk_148[0x30C];
 } EnRu; // size = 0x454
 
-extern const ActorInit En_Ru_InitVars;
-
 #endif // Z_EN_RU_H
diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h
index 620e4b9ac7..887cd8c6bb 100644
--- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h
+++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h
@@ -37,6 +37,4 @@ typedef struct EnRuppecrow {
     /* 0x2D4 */ Vec3f limbPos[ENRUPPECROW_LIMB_POS_COUNT];
 } EnRuppecrow; // size = 0x304
 
-extern const ActorInit En_Ruppecrow_InitVars;
-
 #endif // Z_EN_RUPPECROW_H
diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.h b/src/overlays/actors/ovl_En_Rz/z_en_rz.h
index 5106d14130..299acf7d36 100644
--- a/src/overlays/actors/ovl_En_Rz/z_en_rz.h
+++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.h
@@ -13,6 +13,4 @@ typedef struct EnRz {
     /* 0x430 */ EnRzActionFunc actionFunc;
 } EnRz; // size = 0x434
 
-extern const ActorInit En_Rz_InitVars;
-
 #endif // Z_EN_RZ_H
diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h
index 7d8e7627f0..f33c50fa92 100644
--- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h
+++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.h
@@ -16,6 +16,4 @@ typedef struct EnSGoro {
     /* 0x190 */ char unk_190[0x180];
 } EnSGoro; // size = 0x310
 
-extern const ActorInit En_S_Goro_InitVars;
-
 #endif // Z_EN_S_GORO_H
diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.h b/src/overlays/actors/ovl_En_Sb/z_en_sb.h
index f2b3e68e84..b273222269 100644
--- a/src/overlays/actors/ovl_En_Sb/z_en_sb.h
+++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.h
@@ -33,6 +33,4 @@ typedef struct EnSb {
     /* 0x253 */ u8 isDrawn;
 } EnSb; // size = 0x254
 
-extern const ActorInit En_Sb_InitVars;
-
 #endif // Z_EN_SB_H
diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h
index 80d7ed20eb..8ef0f4c56b 100644
--- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h
+++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h
@@ -26,6 +26,4 @@ typedef enum {
     /* 5 */ RUPEE_UNUSED,
 } RupeeType;
 
-extern const ActorInit En_Sc_Ruppe_InitVars;
-
 #endif // Z_EN_SC_RUPPE_H
diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h
index 37a6bbf8eb..0c82f74219 100644
--- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h
+++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.h
@@ -14,6 +14,4 @@ typedef struct EnScopecoin {
     /* 0x14A */ s16 unk14A;
 } EnScopecoin; // size = 0x14C
 
-extern const ActorInit En_Scopecoin_InitVars;
-
 #endif // Z_EN_SCOPECOIN_H
diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h
index 60775383e9..30f002fb59 100644
--- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h
+++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.h
@@ -27,6 +27,4 @@ typedef struct EnScopecrow {
     /* 0x264 */ s16 unk_264;
 } EnScopecrow; // size = 0x268
 
-extern const ActorInit En_Scopecrow_InitVars;
-
 #endif // Z_EN_SCOPECROW_H
diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h
index 3f6f435449..5ea0d15eb1 100644
--- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h
+++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.h
@@ -47,6 +47,4 @@ typedef struct EnScopenuts {
     /* 0x372 */ s16 unk_372;
 } EnScopenuts; // size = 0x374
 
-extern const ActorInit En_Scopenuts_InitVars;
-
 #endif // Z_EN_SCOPENUTS_H
diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.h b/src/overlays/actors/ovl_En_Sda/z_en_sda.h
index ff17a25382..fd11ad5bce 100644
--- a/src/overlays/actors/ovl_En_Sda/z_en_sda.h
+++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.h
@@ -11,6 +11,4 @@ typedef struct EnSda {
     /* 0x000 */ Actor actor;
 } EnSda; // size = 0x144
 
-extern const ActorInit En_Sda_InitVars;
-
 #endif // Z_EN_SDA_H
diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h
index e626b616de..fb4ad7e608 100644
--- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h
+++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.h
@@ -26,6 +26,4 @@ typedef enum SekihiType {
     /* 0x5 */ SEKIHI_TYPE_MAX
 } SekihiType;
 
-extern const ActorInit En_Sekihi_InitVars;
-
 #endif // Z_EN_SEKIHI_H
diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h
index 49023ce7f7..b9793a6d3d 100644
--- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h
+++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.h
@@ -46,6 +46,4 @@ typedef struct EnSellnuts {
     /* 0x374 */ f32 unk_374;
 } EnSellnuts; // size = 0x378
 
-extern const ActorInit En_Sellnuts_InitVars;
-
 #endif // Z_EN_SELLNUTS_H
diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.h b/src/overlays/actors/ovl_En_Shn/z_en_shn.h
index e373abde2a..bb4740142e 100644
--- a/src/overlays/actors/ovl_En_Shn/z_en_shn.h
+++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.h
@@ -43,6 +43,4 @@ typedef struct EnShn {
     /* 0x2EC */ s32 unk_2EC;
 } EnShn; // size = 0x2F0
 
-extern const ActorInit En_Shn_InitVars;
-
 #endif // Z_EN_SHN_H
diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.h b/src/overlays/actors/ovl_En_Si/z_en_si.h
index 032e1f1161..b401e5e6a5 100644
--- a/src/overlays/actors/ovl_En_Si/z_en_si.h
+++ b/src/overlays/actors/ovl_En_Si/z_en_si.h
@@ -13,6 +13,4 @@ typedef struct EnSi {
     /* 0x148 */ char unk_148[0x58];
 } EnSi; // size = 0x1A0
 
-extern const ActorInit En_Si_InitVars;
-
 #endif // Z_EN_SI_H
diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h
index 0026048380..ebdad3cd88 100644
--- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h
+++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h
@@ -36,6 +36,4 @@ typedef struct EnSkb {
     /* 0x3E6 */ u8 drawDmgEffType;
 } EnSkb; // size = 0x3E8
 
-extern const ActorInit En_Skb_InitVars;
-
 #endif // Z_EN_SKB_H
diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.h b/src/overlays/actors/ovl_En_Slime/z_en_slime.h
index dacbd824c8..0381a592a1 100644
--- a/src/overlays/actors/ovl_En_Slime/z_en_slime.h
+++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.h
@@ -13,6 +13,4 @@ typedef struct EnSlime {
     /* 0x148 */ char unk_148[0xC0];
 } EnSlime; // size = 0x208
 
-extern const ActorInit En_Slime_InitVars;
-
 #endif // Z_EN_SLIME_H
diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h
index 32a1ae352d..da0c0a30ad 100644
--- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h
+++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.h
@@ -54,6 +54,4 @@ typedef struct EnSnowman {
     /* 0x32C */ ColliderCylinder collider;
 } EnSnowman; // size = 0x378
 
-extern const ActorInit En_Snowman_InitVars;
-
 #endif // Z_EN_SNOWMAN_H
diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h
index 6706de8462..a83e5d05ac 100644
--- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h
+++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h
@@ -13,6 +13,4 @@ typedef struct EnSnowwd {
     /* 0x194 */ EnSnowwdActionFunc actionFunc;
 } EnSnowwd; // size = 0x198
 
-extern const ActorInit En_Snowwd_InitVars;
-
 #endif // Z_EN_SNOWWD_H
diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h
index 6cb615d6f9..eee86c112d 100644
--- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h
+++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h
@@ -88,6 +88,4 @@ typedef enum {
     /* 2 */ ENSOB1_CUTSCENESTATE_PLAYING
 } EnSob1CutsceneState;
 
-extern const ActorInit En_Sob1_InitVars;
-
 #endif // Z_EN_SOB1_H
diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
index 72a82e6928..094c63f7e7 100644
--- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
+++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h
@@ -56,6 +56,4 @@ typedef struct EnSsh {
     /* 0x5C8 */ s16 blinkTimer;
 } EnSsh; // size = 0x5CC
 
-extern const ActorInit En_Ssh_InitVars;
-
 #endif // Z_EN_SSH_H
diff --git a/src/overlays/actors/ovl_En_St/z_en_st.h b/src/overlays/actors/ovl_En_St/z_en_st.h
index d5ca31f2ce..5c63a96644 100644
--- a/src/overlays/actors/ovl_En_St/z_en_st.h
+++ b/src/overlays/actors/ovl_En_St/z_en_st.h
@@ -48,6 +48,4 @@ typedef struct EnSt {
     /* 0x49C */ Vec3s morphTable[30];
 } EnSt; // size = 0x550
 
-extern const ActorInit En_St_InitVars;
-
 #endif // Z_EN_ST_H
diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.h b/src/overlays/actors/ovl_En_Sth/z_en_sth.h
index 38d5fcc7fb..857b925053 100644
--- a/src/overlays/actors/ovl_En_Sth/z_en_sth.h
+++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.h
@@ -32,6 +32,4 @@ typedef struct EnSth {
     /* 0x2A0 */ EnSthActionFunc actionFunc;
 } EnSth; // size = 0x2A4
 
-extern const ActorInit En_Sth_InitVars;
-
 #endif // Z_EN_STH_H
diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h
index 1166c9d298..265332ffd8 100644
--- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h
+++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.h
@@ -18,6 +18,4 @@ typedef struct EnSth2 {
     /* 0x24C */ EnSth2ActionFunc actionFunc;
 } EnSth2; // size = 0x250
 
-extern const ActorInit En_Sth2_InitVars;
-
 #endif // Z_EN_STH2_H
diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h
index f4eb8e5f28..dbe1b15f94 100644
--- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h
+++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.h
@@ -14,6 +14,4 @@ typedef struct EnStoneheishi {
     /* 0x258 */ char unk_258[0x6C];
 } EnStoneheishi; // size = 0x2C4
 
-extern const ActorInit En_Stone_heishi_InitVars;
-
 #endif // Z_EN_STONE_HEISHI_H
diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h
index 5c2b639ef8..8e27f1c363 100644
--- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h
+++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.h
@@ -14,6 +14,4 @@ typedef struct EnStopheishi {
     /* 0x258 */ char unk_258[0x90];
 } EnStopheishi; // size = 0x2E8
 
-extern const ActorInit En_Stop_heishi_InitVars;
-
 #endif // Z_EN_STOP_HEISHI_H
diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.h b/src/overlays/actors/ovl_En_Stream/z_en_stream.h
index c544be02f7..88856c3dd6 100644
--- a/src/overlays/actors/ovl_En_Stream/z_en_stream.h
+++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.h
@@ -32,6 +32,4 @@ typedef struct EnStream {
     /* 0x14C */ UNK_TYPE1 unk_14C[0x4];
 } EnStream; // size = 0x150
 
-extern const ActorInit En_Stream_InitVars;
-
 #endif // Z_EN_STREAM_H
diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h
index 2861e59714..278b999510 100644
--- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h
+++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h
@@ -60,6 +60,4 @@ typedef struct EnSuttari {
     /* 0x45A */ s16 cutsceneIdx;
 } EnSuttari; // size = 0x45C
 
-extern const ActorInit En_Suttari_InitVars;
-
 #endif // Z_EN_SUTTARI_H
diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h
index 7bf39b6c2e..4544346a00 100644
--- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h
+++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h
@@ -50,6 +50,4 @@ typedef struct EnSw {
     /* 0x4A0 */ s32 unk_4A0;
 } EnSw; // size = 0x4A4
 
-extern const ActorInit En_Sw_InitVars;
-
 #endif // Z_EN_SW_H
diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h
index 05eec4ad0c..f92c7a13d8 100644
--- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h
+++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h
@@ -31,6 +31,4 @@ typedef struct EnSyatekiCrow {
     /* 0x25C */ ColliderJntSphElement unk_25C;
 } EnSyatekiCrow; // size = 0x29C
 
-extern const ActorInit En_Syateki_Crow_InitVars;
-
 #endif // Z_EN_SYATEKI_CROW_H
diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h
index 447dcaee70..1c80e08777 100644
--- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h
+++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.h
@@ -35,6 +35,4 @@ typedef struct EnSyatekiDekunuts {
     /* 0x26C */ UNK_TYPE1 unk_26C[0x4];
 } EnSyatekiDekunuts; // size = 0x270
 
-extern const ActorInit En_Syateki_Dekunuts_InitVars;
-
 #endif // Z_EN_SYATEKI_DEKUNUTS_H
diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
index 30bc1b1ad0..0b637fecfe 100644
--- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
+++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h
@@ -70,6 +70,4 @@ typedef struct EnSyatekiMan {
     /* 0x284 */ s16 prevTextId;
 } EnSyatekiMan; // size = 0x288
 
-extern const ActorInit En_Syateki_Man_InitVars;
-
 #endif // Z_EN_SYATEKI_MAN_H
diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h
index a455765cd7..0527354d06 100644
--- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h
+++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h
@@ -24,6 +24,4 @@ typedef struct EnSyatekiOkuta {
     /* 0x2AA */ s16 unk_2AA;
 } EnSyatekiOkuta; // size = 0x2AC
 
-extern const ActorInit En_Syateki_Okuta_InitVars;
-
 #endif // Z_EN_SYATEKI_OKUTA_H
diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h
index 4de182a106..7e133d4fae 100644
--- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h
+++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h
@@ -35,6 +35,4 @@ typedef struct EnSyatekiWf {
     /* 0x3AC */ UNK_TYPE1 unk_3AC[0x20];
 } EnSyatekiWf; // size = 0x3CC
 
-extern const ActorInit En_Syateki_Wf_InitVars;
-
 #endif // Z_EN_SYATEKI_WF_H
diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.h b/src/overlays/actors/ovl_En_Tab/z_en_tab.h
index 81ce92006b..6bb0503a77 100644
--- a/src/overlays/actors/ovl_En_Tab/z_en_tab.h
+++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.h
@@ -45,6 +45,4 @@ typedef struct EnTab {
     /* 0x338 */ s32 unk_338;
 } EnTab; // size = 0x33C
 
-extern const ActorInit En_Tab_InitVars;
-
 #endif // Z_EN_TAB_H
diff --git a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h
index 7a9fe909ae..e60f88ab29 100644
--- a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h
+++ b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.h
@@ -11,6 +11,4 @@ typedef struct EnTagObj {
     /* 0x194 */ s32 hasSpawnedSeahorse;
 } EnTagObj; // size = 0x198
 
-extern const ActorInit En_Tag_Obj_InitVars;
-
 #endif // Z_EN_TAG_OBJ_H
diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h
index cc707f0279..cfa37125ed 100644
--- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h
+++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.h
@@ -14,6 +14,4 @@ typedef struct EnTakaraya {
     /* 0x2AC */ char unk_2AC[0x10];
 } EnTakaraya; // size = 0x2BC
 
-extern const ActorInit En_Takaraya_InitVars;
-
 #endif // Z_EN_TAKARAYA_H
diff --git a/src/overlays/actors/ovl_En_Talk/z_en_talk.h b/src/overlays/actors/ovl_En_Talk/z_en_talk.h
index 393a457b51..ef2f67798e 100644
--- a/src/overlays/actors/ovl_En_Talk/z_en_talk.h
+++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.h
@@ -14,6 +14,4 @@ typedef struct EnTalk {
     /* 0x144 */ EnTalkActionFunc actionFunc;
 } EnTalk; // size = 0x148
 
-extern const ActorInit En_Talk_InitVars;
-
 #endif // Z_EN_TALK_H
diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h
index ba55f9fc3a..4d11e6c157 100644
--- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h
+++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.h
@@ -45,6 +45,4 @@ typedef struct EnTalkGibud {
     /* 0x3F7 */ s8 unk_3F7; // related to player->unk_ADD
 } EnTalkGibud; // size = 0x3F8
 
-extern const ActorInit En_Talk_Gibud_InitVars;
-
 #endif // Z_EN_TALK_GIBUD_H
diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h
index d8e96537f3..bff1b46bf8 100644
--- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h
+++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.h
@@ -39,6 +39,4 @@ typedef struct EnTanron1 {
     /* 0x3360 */ Vec3f unk_3360;
 } EnTanron1; // size = 0x336C
 
-extern const ActorInit En_Tanron1_InitVars;
-
 #endif // Z_EN_TANRON1_H
diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h
index efbcc31082..3ae619a2d9 100644
--- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h
+++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.h
@@ -28,6 +28,4 @@ typedef struct EnTanron2 {
     /* 0x1B0 */ ColliderCylinder collider2;
 } EnTanron2; // size = 0x1FC
 
-extern const ActorInit En_Tanron2_InitVars;
-
 #endif // Z_EN_TANRON2_H
diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h
index 14971d6e8e..8859de6a4b 100644
--- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h
+++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.h
@@ -41,6 +41,4 @@ typedef struct EnTanron3 {
     /* 0x2F8 */ EnTanron3ActionFunc actionFunc;
 } EnTanron3; // size = 0x2FC
 
-extern const ActorInit En_Tanron3_InitVars;
-
 #endif // Z_EN_TANRON3_H
diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h
index de4874cfc6..36a48c91a6 100644
--- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h
+++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h
@@ -28,6 +28,4 @@ typedef struct EnTanron4 {
 #define SEAGULL_CLONE -1
 #define SEAGULL_FOLLOW_ACTOR 100
 
-extern const ActorInit En_Tanron4_InitVars;
-
 #endif // Z_EN_TANRON4_H
diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h
index 9f9e470212..d40938bf86 100644
--- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h
+++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.h
@@ -25,6 +25,4 @@ typedef struct EnTanron5 {
     /* 0x1A1 */ u8 unk_1A1;
 } EnTanron5; // size = 0x1A4
 
-extern const ActorInit En_Tanron5_InitVars;
-
 #endif // Z_EN_TANRON5_H
diff --git a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h
index 13d060e2e5..1a6434e578 100644
--- a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h
+++ b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.h
@@ -13,6 +13,4 @@ typedef struct EnTanron6 {
     /* 0x200 */ EnTanron6ActionFunc actionFunc;
 } EnTanron6; // size = 0x204
 
-extern const ActorInit En_Tanron6_InitVars;
-
 #endif // Z_EN_TANRON6_H
diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.h b/src/overlays/actors/ovl_En_Test/z_en_test.h
index e01c44c6ab..2b8d62993f 100644
--- a/src/overlays/actors/ovl_En_Test/z_en_test.h
+++ b/src/overlays/actors/ovl_En_Test/z_en_test.h
@@ -28,6 +28,4 @@ typedef struct EnTest {
     /* 0x20C */ EnTestStruct unk_20C[20];
 } EnTest; // size = 0x6BC
 
-extern const ActorInit En_Test_InitVars;
-
 #endif // Z_EN_TEST_H
diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.h b/src/overlays/actors/ovl_En_Test2/z_en_test2.h
index b8eabec2c5..f331d8f3b3 100644
--- a/src/overlays/actors/ovl_En_Test2/z_en_test2.h
+++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.h
@@ -10,6 +10,4 @@ typedef struct EnTest2 {
     /* 0x144 */ char unk_144[0x4];
 } EnTest2; // size = 0x148
 
-extern const ActorInit En_Test2_InitVars;
-
 #endif // Z_EN_TEST2_H
diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.h b/src/overlays/actors/ovl_En_Test3/z_en_test3.h
index 9d902bad19..fbddc77f12 100644
--- a/src/overlays/actors/ovl_En_Test3/z_en_test3.h
+++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.h
@@ -14,6 +14,4 @@ typedef struct EnTest3 {
     /* 0x770 */ char unk_770[0x648];
 } EnTest3; // size = 0xDB8
 
-extern const ActorInit En_Test3_InitVars;
-
 #endif // Z_EN_TEST3_H
diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.h b/src/overlays/actors/ovl_En_Test4/z_en_test4.h
index 5f39f9f564..0a372f245b 100644
--- a/src/overlays/actors/ovl_En_Test4/z_en_test4.h
+++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.h
@@ -23,6 +23,4 @@ typedef enum {
     /* 1 */ TEST4_STATE_1
 } EnTest4State;
 
-extern const ActorInit En_Test4_InitVars;
-
 #endif // Z_EN_TEST4_H
diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.h b/src/overlays/actors/ovl_En_Test5/z_en_test5.h
index bcfcd98e33..8d0c477848 100644
--- a/src/overlays/actors/ovl_En_Test5/z_en_test5.h
+++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.h
@@ -17,6 +17,4 @@ typedef struct EnTest5 {
     /* 0x158 */ EnTest5ActionFunc actionFunc;    
 } EnTest5; // size = 0x15C
 
-extern const ActorInit En_Test5_InitVars;
-
 #endif // Z_EN_TEST5_H
diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.h b/src/overlays/actors/ovl_En_Test6/z_en_test6.h
index ad596960ef..ec06afb919 100644
--- a/src/overlays/actors/ovl_En_Test6/z_en_test6.h
+++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.h
@@ -49,6 +49,4 @@ typedef struct EnTest6 {
     /* 0x286 */ s16 unk_286;
 } EnTest6; // size = 0x288
 
-extern const ActorInit En_Test6_InitVars;
-
 #endif // Z_EN_TEST6_H
diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.h b/src/overlays/actors/ovl_En_Test7/z_en_test7.h
index da6dec94b0..30bf8e73cf 100644
--- a/src/overlays/actors/ovl_En_Test7/z_en_test7.h
+++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.h
@@ -62,6 +62,4 @@ typedef struct EnTest7 {
     /* 0x1E98 */ EnTest7UnkDrawFunc unk_1E98;
 } EnTest7; // size = 0x1E9C
 
-extern const ActorInit En_Test7_InitVars;
-
 #endif // Z_EN_TEST7_H
diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.h b/src/overlays/actors/ovl_En_Tg/z_en_tg.h
index 2798b99b3d..b908a40a90 100644
--- a/src/overlays/actors/ovl_En_Tg/z_en_tg.h
+++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.h
@@ -13,6 +13,4 @@ typedef struct EnTg {
     /* 0x148 */ char unk_148[0x400];
 } EnTg; // size = 0x548
 
-extern const ActorInit En_Tg_InitVars;
-
 #endif // Z_EN_TG_H
diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h
index 698d963bed..5fdb73f2f5 100644
--- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h
+++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h
@@ -42,6 +42,4 @@ typedef struct EnThiefbird {
     /* 0x3F0 */ EnThiefbirdUnkStruct unk_3F0[40];
 } EnThiefbird; // size = 0x990
 
-extern const ActorInit En_Thiefbird_InitVars;
-
 #endif // Z_EN_THIEFBIRD_H
diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
index 6ee46c1d3f..ed6b611e4d 100644
--- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
+++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
@@ -17,6 +17,4 @@ typedef struct EnTimeTag {
     /* 0x144 */ EnTimeTagActionFunc actionFunc;
 } EnTimeTag; // size = 0x148
 
-extern const ActorInit En_Time_Tag_InitVars;
-
 #endif // Z_EN_TIME_TAG_H
diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.h b/src/overlays/actors/ovl_En_Tite/z_en_tite.h
index 2d3a13a37a..4b87634a37 100644
--- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h
+++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h
@@ -37,6 +37,4 @@ typedef struct EnTite {
     /* 0x3AC */ ColliderSphere collider;
 } EnTite; // size = 0x404
 
-extern const ActorInit En_Tite_InitVars;
-
 #endif // Z_EN_TITE_H
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
index 279cd08100..42a8aa96ad 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
@@ -63,6 +63,4 @@ typedef struct EnTk {
     /* 0x3F0 */ s32 timePathElapsedTime;
 } EnTk; // size = 0x3F4
 
-extern const ActorInit En_Tk_InitVars;
-
 #endif // Z_EN_TK_H
diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.h b/src/overlays/actors/ovl_En_Torch/z_en_torch.h
index 87e1d67822..9ebfabb64b 100644
--- a/src/overlays/actors/ovl_En_Torch/z_en_torch.h
+++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.h
@@ -9,6 +9,4 @@ typedef struct EnTorch {
     /* 0x000 */ Actor actor;
 } EnTorch; // size = 0x144
 
-extern const ActorInit En_Torch_InitVars;
-
 #endif // Z_EN_TORCH_H
diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
index 744a7975c9..9033b99236 100644
--- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
+++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h
@@ -29,6 +29,4 @@ typedef enum {
     /* 4 */ TORCH2_STATE_DYING,
 } EnTorch2State;
 
-extern const ActorInit En_Torch2_InitVars;
-
 #endif // Z_EN_TORCH2_H
diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.h b/src/overlays/actors/ovl_En_Toto/z_en_toto.h
index 94c80ef4a4..3c95a7dbb5 100644
--- a/src/overlays/actors/ovl_En_Toto/z_en_toto.h
+++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.h
@@ -42,6 +42,4 @@ typedef struct EnToto {
     /* 0x2C8 */ s32 pad2C8;
 } EnToto; // size = 0x2CC
 
-extern const ActorInit En_Toto_InitVars;
-
 #endif // Z_EN_TOTO_H
diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.h b/src/overlays/actors/ovl_En_Trt/z_en_trt.h
index 13af94bcc1..481e1086f3 100644
--- a/src/overlays/actors/ovl_En_Trt/z_en_trt.h
+++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.h
@@ -64,6 +64,4 @@ typedef enum {
     /* 3 */ ENTRT_CUTSCENESTATE_PLAYING
 } EnTrtCutsceneState;
 
-extern const ActorInit En_Trt_InitVars;
-
 #endif // Z_EN_TRT_H
diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h
index da5c6fa9c8..44c2565f7e 100644
--- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h
+++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.h
@@ -41,6 +41,4 @@ typedef struct EnTrt2 {
     /* 0x3DA */ s16 unk_3DA;
 } EnTrt2; // size = 0x3DC
 
-extern const ActorInit En_Trt2_InitVars;
-
 #endif // Z_EN_TRT2_H
diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.h b/src/overlays/actors/ovl_En_Tru/z_en_tru.h
index 7e1c233806..64476027a6 100644
--- a/src/overlays/actors/ovl_En_Tru/z_en_tru.h
+++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.h
@@ -59,6 +59,4 @@ typedef struct EnTru {
     /* 0x394 */ EnTruUnkStruct unk_394[30];
 } EnTru; // size = 0x934
 
-extern const ActorInit En_Tru_InitVars;
-
 #endif // Z_EN_TRU_H
diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h
index 670d0d728a..5c47de1195 100644
--- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h
+++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.h
@@ -41,6 +41,4 @@ typedef struct EnTruMt {
     /* 0x3A4 */ u8 unk_3A4;
 } EnTruMt; // size = 0x3A8
 
-extern const ActorInit En_Tru_Mt_InitVars;
-
 #endif // Z_EN_TRU_MT_H
diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h
index ce61376495..fdb002536d 100644
--- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h
+++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.h
@@ -29,6 +29,4 @@ typedef struct EnTsn {
     /* 0x230 */ s16 unk_230;
 } EnTsn; // size = 0x234
 
-extern const ActorInit En_Tsn_InitVars;
-
 #endif // Z_EN_TSN_H
diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
index db3b9cbe40..8df1aeb552 100644
--- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
+++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h
@@ -15,6 +15,4 @@ typedef struct EnTuboTrap {
     /* 0x158 */ ColliderCylinder collider;
 } EnTuboTrap; // size = 0x1A4
 
-extern const ActorInit En_Tubo_Trap_InitVars;
-
 #endif // Z_EN_TUBO_TRAP_H
diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.h b/src/overlays/actors/ovl_En_Twig/z_en_twig.h
index 2caebeb82c..5047b50dd7 100644
--- a/src/overlays/actors/ovl_En_Twig/z_en_twig.h
+++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.h
@@ -14,6 +14,4 @@ typedef struct EnTwig {
     /* 0x160 */ char unk_160[0x2C];
 } EnTwig; // size = 0x18C
 
-extern const ActorInit En_Twig_InitVars;
-
 #endif // Z_EN_TWIG_H
diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
index 17cd47230a..1601959a15 100644
--- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
+++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h
@@ -13,6 +13,4 @@ typedef struct EnViewer {
     /* 0x148 */ char unk_148[0x10];
 } EnViewer; // size = 0x158
 
-extern const ActorInit En_Viewer_InitVars;
-
 #endif // Z_EN_VIEWER_H
diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.h b/src/overlays/actors/ovl_En_Vm/z_en_vm.h
index dd1c36aa21..ca0678d906 100644
--- a/src/overlays/actors/ovl_En_Vm/z_en_vm.h
+++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.h
@@ -35,6 +35,4 @@ typedef struct EnVm {
     /* 0x300 */ ColliderTrisElement colliderTrisElements[1];
 } EnVm; // size = 0x35C
 
-extern const ActorInit En_Vm_InitVars;
-
 #endif // Z_EN_VM_H
diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
index af7c6f18cf..ceb1d18231 100644
--- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
+++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h
@@ -52,6 +52,4 @@ typedef struct EnWallmas {
     /* 0x358 */ ColliderCylinder collider;
 } EnWallmas; // size = 0x3A4
 
-extern const ActorInit En_Wallmas_InitVars;
-
 #endif // Z_EN_WALLMAS_H
diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h
index a1a7766e6a..6b8bfb3629 100644
--- a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h
+++ b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.h
@@ -13,6 +13,4 @@ typedef struct EnWarpUzu {
     /* 0x148 */ ColliderCylinder collider;
 } EnWarpUzu; // size = 0x194
 
-extern const ActorInit En_Warp_Uzu_InitVars;
-
 #endif // Z_EN_WARP_UZU_H
diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h
index 8bc521f15e..2de2837004 100644
--- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h
+++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.h
@@ -18,8 +18,6 @@ typedef struct EnWarptag {
     /* 0x160 */ EnWarptagActionFunc actionFunc;
 } EnWarptag; // size = 0x164
 
-extern const ActorInit En_Warp_tag_InitVars;
-
 // Only two known Variants:
 //  Goron Trial (MOON):    0x03C1
 //  Deku Playground:       0x83C0
diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h
index 35aebd83e7..8aa59cb5db 100644
--- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h
+++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h
@@ -42,6 +42,4 @@ typedef struct EnWaterEffect {
     /* 0xE38 */ f32 unk_E38;
 } EnWaterEffect; // size = 0xE3C
 
-extern const ActorInit En_Water_Effect_InitVars;
-
 #endif // Z_EN_WATER_EFFECT_H
diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h
index adf19ce8c2..5eb02fa1a2 100644
--- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h
+++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.h
@@ -14,6 +14,4 @@ typedef struct EnWdhand {
     /* 0x1EC */ char unk_1EC[0x268];
 } EnWdhand; // size = 0x454
 
-extern const ActorInit En_Wdhand_InitVars;
-
 #endif // Z_EN_WDHAND_H
diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
index fe18c8e1ba..43134f13fa 100644
--- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
+++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
@@ -19,8 +19,6 @@ typedef struct EnWeatherTag {
     /* 0x158 */ u16 unk158; // increment/decrement amount for 154
 } EnWeatherTag; // size = 0x15C
 
-extern const ActorInit En_Weather_Tag_InitVars;
-
 #define WEATHER_TAG_TYPE(x) (x->actor.params & 0xF)
 #define WEATHER_TAG_PATHID(x) (x->actor.params >> 4 & 0xF)
 #define WEATHER_TAG_RANGE100(x) ((u8)(((x->actor.params >> 8) & 0xFF)) * 100.0f)
diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.h b/src/overlays/actors/ovl_En_Wf/z_en_wf.h
index 38570dd9e4..c8a0c7af80 100644
--- a/src/overlays/actors/ovl_En_Wf/z_en_wf.h
+++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h
@@ -37,6 +37,4 @@ typedef struct EnWf {
     /* 0x49C */ ColliderCylinder collider3;
 } EnWf; // size = 0x4E8
 
-extern const ActorInit En_Wf_InitVars;
-
 #endif // Z_EN_WF_H
diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h
index a1ae32032c..1040fd6467 100644
--- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h
+++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.h
@@ -20,6 +20,4 @@ typedef struct EnWiz {
     /* 0x74C */ char unk_74C[0x634];
 } EnWiz; // size = 0xD80
 
-extern const ActorInit En_Wiz_InitVars;
-
 #endif // Z_EN_WIZ_H
diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h
index 0f01506976..65f5fe1b62 100644
--- a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h
+++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h
@@ -18,6 +18,4 @@ typedef struct EnWizBrock {
     /* 0x1AC */ f32 alpha;
 } EnWizBrock; // size = 0x1B0
 
-extern const ActorInit En_Wiz_Brock_InitVars;
-
 #endif // Z_EN_WIZ_BROCK_H
diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h
index b628404bba..1b067bf0fb 100644
--- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h
+++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.h
@@ -51,6 +51,4 @@ typedef struct EnWizFire {
     /* 0x0254 */ EnWizFireStruct unk_254[200];
 } EnWizFire; // size = 0x2AF4
 
-extern const ActorInit En_Wiz_Fire_InitVars;
-
 #endif // Z_EN_WIZ_FIRE_H
diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h
index 310d1e5de3..1286074143 100644
--- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h
+++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h
@@ -50,6 +50,4 @@ typedef enum {
     /* 0x1A */ WOOD_TREE_SPECIAL = 0x1A
 } WoodType;
 
-extern const ActorInit En_Wood02_InitVars;
-
 #endif // Z_EN_WOOD02_H
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h
index e1b1181912..4138558fbf 100644
--- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h
+++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h
@@ -10,6 +10,4 @@ typedef struct EnZl1 {
     /* 0x144 */ char unk_144[0xC0];
 } EnZl1; // size = 0x204
 
-extern const ActorInit En_Zl1_InitVars;
-
 #endif // Z_EN_ZL1_H
diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
index eeb2725796..326d2545e4 100644
--- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
+++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h
@@ -14,6 +14,4 @@ typedef struct EnZl4 {
     /* 0x294 */ char unk_294[0x60];
 } EnZl4; // size = 0x2F4
 
-extern const ActorInit En_Zl4_InitVars;
-
 #endif // Z_EN_ZL4_H
diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.h b/src/overlays/actors/ovl_En_Zob/z_en_zob.h
index cd9ccc9088..25ce14fdc7 100644
--- a/src/overlays/actors/ovl_En_Zob/z_en_zob.h
+++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.h
@@ -32,6 +32,4 @@ typedef struct EnZob {
     /* 0x314 */ EnZobActionFunc actionFunc;
 } EnZob; // size = 0x318
 
-extern const ActorInit En_Zob_InitVars;
-
 #endif // Z_EN_ZOB_H
diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.h b/src/overlays/actors/ovl_En_Zod/z_en_zod.h
index 2fd9b74004..08cf29f2d4 100644
--- a/src/overlays/actors/ovl_En_Zod/z_en_zod.h
+++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.h
@@ -13,6 +13,4 @@ typedef struct EnZod {
     /* 0x29C */ EnZodActionFunc actionFunc;
 } EnZod; // size = 0x2A0
 
-extern const ActorInit En_Zod_InitVars;
-
 #endif // Z_EN_ZOD_H
diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.h b/src/overlays/actors/ovl_En_Zog/z_en_zog.h
index e649c52ab5..9971d77fa3 100644
--- a/src/overlays/actors/ovl_En_Zog/z_en_zog.h
+++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.h
@@ -40,6 +40,4 @@ typedef struct EnZog {
     /* 0x328 */ EnZogActionFunc actionFunc;
 } EnZog; // size = 0x32C
 
-extern const ActorInit En_Zog_InitVars;
-
 #endif // Z_EN_ZOG_H
diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h
index b5b19afde8..f36f77c2bc 100644
--- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h
+++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h
@@ -59,6 +59,4 @@ typedef struct EnZoraegg {
     /* 0x1F8 */ EnZoraeggActionFunc actionFunc;
 } EnZoraegg; // size = 0x1FC
 
-extern const ActorInit En_Zoraegg_InitVars;
-
 #endif // Z_EN_ZORAEGG_H
diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.h b/src/overlays/actors/ovl_En_Zos/z_en_zos.h
index 99125aad34..93837e6423 100644
--- a/src/overlays/actors/ovl_En_Zos/z_en_zos.h
+++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.h
@@ -30,6 +30,4 @@ typedef struct EnZos {
     /* 0x2C0 */ EnZosActionFunc actionFunc;
 } EnZos; // size = 0x2C4
 
-extern const ActorInit En_Zos_InitVars;
-
 #endif // Z_EN_ZOS_H
diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.h b/src/overlays/actors/ovl_En_Zot/z_en_zot.h
index b72328b202..1bab43ae32 100644
--- a/src/overlays/actors/ovl_En_Zot/z_en_zot.h
+++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.h
@@ -29,6 +29,4 @@ typedef struct EnZot {
     /* 0x2F8 */ EnZotActionFunc actionFunc;
 } EnZot; // size = 0x2FC
 
-extern const ActorInit En_Zot_InitVars;
-
 #endif // Z_EN_ZOT_H
diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.h b/src/overlays/actors/ovl_En_Zov/z_en_zov.h
index cabb82b435..859f1655da 100644
--- a/src/overlays/actors/ovl_En_Zov/z_en_zov.h
+++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.h
@@ -37,6 +37,4 @@ typedef struct EnZov {
     /* 0x330 */ EnZovActionFunc actionFunc;
 } EnZov; // size = 0x334
 
-extern const ActorInit En_Zov_InitVars;
-
 #endif // Z_EN_ZOV_H
diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.h b/src/overlays/actors/ovl_En_Zow/z_en_zow.h
index 777a0aa9dc..a9d9156675 100644
--- a/src/overlays/actors/ovl_En_Zow/z_en_zow.h
+++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.h
@@ -39,6 +39,4 @@ typedef struct EnZow {
     /* 0x618 */ EnZowActionFunc actionFunc;
 } EnZow; // size = 0x61C
 
-extern const ActorInit En_Zow_InitVars;
-
 #endif // Z_EN_ZOW_H
diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
index ccf7b43bdc..8f1be0ca0a 100644
--- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
+++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h
@@ -12,6 +12,4 @@ typedef struct ItemBHeart {
     /* 0x168 */ f32 unk_168;
 } ItemBHeart; // size = 0x16C
 
-extern const ActorInit Item_B_Heart_InitVars;
-
 #endif // Z_ITEM_B_HEART_H
diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
index e33f1e1fb6..4ac893ba56 100644
--- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
+++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
@@ -37,6 +37,4 @@ typedef struct ItemEtcetera {
     /* 0x154 */ ItemEtceteraActionFunc actionFunc;
 } ItemEtcetera; // size = 0x158
 
-extern const ActorInit Item_Etcetera_InitVars;
-
 #endif // Z_ITEM_ETCETERA_H
diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
index 0b3247ee75..e6b1adfd68 100644
--- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
+++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h
@@ -12,6 +12,4 @@ typedef struct ItemInbox {
     /* 0x144 */ ItemInboxActionFunc actionFunc;
 } ItemInbox; // size = 0x148
 
-extern const ActorInit Item_Inbox_InitVars;
-
 #endif // Z_ITEM_INBOX_H
diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
index 3ba21c444e..cd48cfed19 100644
--- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
+++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h
@@ -40,6 +40,4 @@ typedef struct MirRay {
     /* 0x2A6 */ u8 unLit; // Conditioned on. set in Cobra?
 } MirRay; // size = 0x2A8
 
-extern const ActorInit Mir_Ray_InitVars;
-
 #endif // Z_MIR_RAY_H
diff --git a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h
index 26f478ea3f..acd9357eee 100644
--- a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h
+++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.h
@@ -10,6 +10,4 @@ typedef struct MirRay2 {
     /* 0x144 */ char unk_144[0x7C];
 } MirRay2; // size = 0x1C0
 
-extern const ActorInit Mir_Ray2_InitVars;
-
 #endif // Z_MIR_RAY2_H
diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h
index 7aecd111fc..3e285c0505 100644
--- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h
+++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.h
@@ -19,6 +19,4 @@ typedef struct MirRay3 {
     /* 0x260 */ f32 unk_260;
 } MirRay3; // size = 0x264
 
-extern const ActorInit Mir_Ray3_InitVars;
-
 #endif // Z_MIR_RAY3_H
diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h
index fa2b1c6361..a47ea661aa 100644
--- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h
+++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h
@@ -19,6 +19,4 @@ typedef struct ObjAqua {
     /* 0x198 */ s16 unk_198;
 } ObjAqua; // size = 0x19C
 
-extern const ActorInit Obj_Aqua_InitVars;
-
 #endif // Z_OBJ_AQUA_H
diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h
index a0c91f2140..2e94530059 100644
--- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h
+++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.h
@@ -38,6 +38,4 @@ typedef struct ObjArmos {
     /* 0x270 */ s16 unk_270;
 } ObjArmos; // size = 0x274
 
-extern const ActorInit Obj_Armos_InitVars;
-
 #endif // Z_OBJ_ARMOS_H
diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
index 5af772007a..7699b34276 100644
--- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
+++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h
@@ -59,6 +59,4 @@ typedef struct ObjBean {
     /* 0x200 */ u8 unk_200;
 } ObjBean; // size = 0x204
 
-extern const ActorInit Obj_Bean_InitVars;
-
 #endif // Z_OBJ_BEAN_H
diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h
index 76265bcec2..004327337d 100644
--- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h
+++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.h
@@ -20,6 +20,4 @@ typedef struct ObjBell {
     /* 0x224 */ char unk_224[0x04];
 } ObjBell; // size = 0x228
 
-extern const ActorInit Obj_Bell_InitVars;
-
 #endif // Z_OBJ_BELL_H
diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h
index 7e28abd457..2eb5a00bd9 100644
--- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h
+++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.h
@@ -19,6 +19,4 @@ typedef struct ObjBigicicle {
     /* 0x198 */ ColliderCylinder collider2;
 } ObjBigicicle; // size = 0x1E4
 
-extern const ActorInit Obj_Bigicicle_InitVars;
-
 #endif // Z_OBJ_BIGICICLE_H
diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
index 95af6757c6..15d45a90bb 100644
--- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
+++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h
@@ -12,6 +12,4 @@ typedef struct ObjBlockstop {
     /* 0x144 */ ObjBlockstopActionFunc actionFunc;
 } ObjBlockstop; // size = 0x148
 
-extern const ActorInit Obj_Blockstop_InitVars;
-
 #endif // Z_OBJ_BLOCKSTOP_H
diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h
index a3ed2b147b..795c50689b 100644
--- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h
+++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h
@@ -20,6 +20,4 @@ typedef struct ObjBoat {
     /* 0x164 */ Vec3s* unk_164;
 } ObjBoat; // size = 0x168
 
-extern const ActorInit Obj_Boat_InitVars;
-
 #endif // Z_OBJ_BOAT_H
diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
index 50e0bbf92c..b49a893237 100644
--- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
+++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
@@ -32,6 +32,4 @@ typedef struct ObjBombiwa {
     /* 0x204 */ ObjBombiwaActionFunc actionFunc;
 } ObjBombiwa; // size = 0x208
 
-extern const ActorInit Obj_Bombiwa_InitVars;
-
 #endif // Z_OBJ_BOMBIWA_H
diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h
index 69e1885303..dcff2a893a 100644
--- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h
+++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.h
@@ -28,6 +28,4 @@ typedef struct ObjBoyo {
     /* 0x1AC */ s16 unk_1AC;
 } ObjBoyo; // size = 0x1B0
 
-extern const ActorInit Obj_Boyo_InitVars;
-
 #endif // Z_OBJ_BOYO_H
diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h
index a3a4e6d933..f08f18adf4 100644
--- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h
+++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.h
@@ -57,6 +57,4 @@ typedef struct ObjChan {
     /* 0x1E0 */ s16 cutscenes[2];
 } ObjChan; // size = 0x1E4
 
-extern const ActorInit Obj_Chan_InitVars;
-
 #endif // Z_OBJ_CHAN_H
diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h
index 7ebba3021f..ee51742466 100644
--- a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h
+++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.h
@@ -34,6 +34,4 @@ typedef struct ObjChikuwa {
     /* 0x9A6 */ u8 unk_9A6;
 } ObjChikuwa; // size = 0x9A8
 
-extern const ActorInit Obj_Chikuwa_InitVars;
-
 #endif // Z_OBJ_CHIKUWA_H
diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
index ed51885766..0ee61baaf0 100644
--- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
+++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h
@@ -34,6 +34,4 @@ typedef struct ObjComb {
     /* 0x1B8 */ s8 unk_1B8;
 } ObjComb; // size = 0x1BC
 
-extern const ActorInit Obj_Comb_InitVars;
-
 #endif // Z_OBJ_COMB_H
diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h
index 8b915a184c..c4f8d4e309 100644
--- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h
+++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.h
@@ -14,6 +14,4 @@ typedef struct ObjDanpeilift {
     /* 0x160 */ char unk_160[0x2C];
 } ObjDanpeilift; // size = 0x18C
 
-extern const ActorInit Obj_Danpeilift_InitVars;
-
 #endif // Z_OBJ_DANPEILIFT_H
diff --git a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h
index be774bf07a..065a21fe9d 100644
--- a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h
+++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.h
@@ -17,6 +17,4 @@ typedef struct ObjDemo {
     /* 0x150 */ f32 yRange;
 } ObjDemo; // size = 0x154
 
-extern const ActorInit Obj_Demo_InitVars;
-
 #endif // Z_OBJ_DEMO_H
diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h
index 807af52f94..c03dbed7df 100644
--- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h
+++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.h
@@ -45,6 +45,4 @@ typedef struct ObjDhouse {
     /* 0x1370 */ s16 unk_1370;
 } ObjDhouse; // size = 0x1374
 
-extern const ActorInit Obj_Dhouse_InitVars;
-
 #endif // Z_OBJ_DHOUSE_H
diff --git a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h
index 8dc49ee483..a27dce28be 100644
--- a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h
+++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.h
@@ -10,6 +10,4 @@ typedef struct ObjDinner {
     /* 0x144 */ char unk_144[0x4];
 } ObjDinner; // size = 0x148
 
-extern const ActorInit Obj_Dinner_InitVars;
-
 #endif // Z_OBJ_DINNER_H
diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h
index ece93f6274..3c1b17f2aa 100644
--- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h
+++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.h
@@ -21,6 +21,4 @@ typedef struct ObjDora {
     /* 0x3AA */ s16 unk3AA; // Set but not used
 } ObjDora; // size = 0x3AC
 
-extern const ActorInit Obj_Dora_InitVars;
-
 #endif // Z_OBJ_DORA_H
diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h
index 7b1125a283..879c99d807 100644
--- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h
+++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.h
@@ -18,6 +18,4 @@ typedef struct ObjDowsing {
     /* 0x000 */ Actor actor;
 } ObjDowsing; // size = 0x144
 
-extern const ActorInit Obj_Dowsing_InitVars;
-
 #endif // Z_OBJ_DOWSING_H
diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h
index 163134f364..dfe6a83ea3 100644
--- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h
+++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.h
@@ -16,6 +16,4 @@ typedef struct ObjEnding {
     /* 0x148 */ AnimatedMaterial* animMat;
 } ObjEnding; // size = 0x14C
 
-extern const ActorInit Obj_Ending_InitVars;
-
 #endif // Z_OBJ_ENDING_H
diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h
index a00a7fcd49..ba667b6c79 100644
--- a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h
+++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.h
@@ -14,6 +14,4 @@ typedef struct ObjEntotu {
     /* 0x1C6 */ s16 unk_1C6;
 } ObjEntotu; // size = 0x1C8
 
-extern const ActorInit Obj_Entotu_InitVars;
-
 #endif // Z_OBJ_ENTOTU_H
diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h
index 33810ae06a..1805e151a8 100644
--- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h
+++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h
@@ -33,6 +33,4 @@ typedef struct ObjEtcetera {
     /* 0x280 */ ObjEtceteraActionFunc actionFunc;
 } ObjEtcetera; // size = 0x284
 
-extern const ActorInit Obj_Etcetera_InitVars;
-
 #endif // Z_OBJ_ETCETERA_H
diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h
index bc01ceac4d..ffe1d7a356 100644
--- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h
+++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.h
@@ -28,6 +28,4 @@ typedef struct ObjFireshield {
     /* 0x1A8 */ s8 unk_1A8;
 } ObjFireshield; // size = 0x1AC
 
-extern const ActorInit Obj_Fireshield_InitVars;
-
 #endif // Z_OBJ_FIRESHIELD_H
diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h
index 3e803672ca..ec1ec43bb6 100644
--- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h
+++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h
@@ -21,6 +21,4 @@ typedef struct ObjFlowerpot {
     /* 0x1EC */ s8 unk_1EC;
 } ObjFlowerpot; // size = 0x1F0
 
-extern const ActorInit Obj_Flowerpot_InitVars;
-
 #endif // Z_OBJ_FLOWERPOT_H
diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h
index dfafc94cf3..eb7ca5e2b7 100644
--- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h
+++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.h
@@ -9,6 +9,4 @@ typedef struct ObjFunen {
     /* 0x000 */ Actor actor;
 } ObjFunen; // size = 0x144
 
-extern const ActorInit Obj_Funen_InitVars;
-
 #endif // Z_OBJ_FUNEN_H
diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h
index 275928f47a..0b52e91259 100644
--- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h
+++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.h
@@ -14,6 +14,4 @@ typedef struct ObjGhaka {
     /* 0x168 */ s16 unk_168;
 } ObjGhaka; // size = 0x16C
 
-extern const ActorInit Obj_Ghaka_InitVars;
-
 #endif // Z_OBJ_GHAKA_H
diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h
index be73c70b50..fffcdad4ef 100644
--- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h
+++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.h
@@ -43,6 +43,4 @@ typedef struct ObjGrass {
     /* 0x3298 */ struct ObjGrassCarry* unk_3298[2];
 } ObjGrass; // size = 0x32A0
 
-extern const ActorInit Obj_Grass_InitVars;
-
 #endif // Z_OBJ_GRASS_H
diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h
index 0e59033fcb..fa870305ef 100644
--- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h
+++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h
@@ -19,6 +19,4 @@ typedef struct ObjGrassCarry {
     /* 0x19C */ ObjGrassCarryActionFunc actionFunc;
 } ObjGrassCarry; // size = 0x1A0
 
-extern const ActorInit Obj_Grass_Carry_InitVars;
-
 #endif // Z_OBJ_GRASS_CARRY_H
diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h
index 113132e5e9..58a8a427ad 100644
--- a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h
+++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.h
@@ -9,6 +9,4 @@ typedef struct ObjGrassUnit {
     /* 0x000 */ Actor actor;
 } ObjGrassUnit; // size = 0x144
 
-extern const ActorInit Obj_Grass_Unit_InitVars;
-
 #endif // Z_OBJ_GRASS_UNIT_H
diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h
index a4e5d233c3..ed5341a82b 100644
--- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h
+++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h
@@ -24,6 +24,4 @@ typedef struct ObjHakaisi {
     /* 0x19E */ u8 unk_19E;
 } ObjHakaisi; // size = 0x1A0
 
-extern const ActorInit Obj_Hakaisi_InitVars;
-
 #endif // Z_OBJ_HAKAISI_H
diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h
index da838d4802..962a596123 100644
--- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h
+++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h
@@ -21,6 +21,4 @@ typedef struct ObjHamishi {
     /* 0x1A2 */ u8 unk_1A2;
 } ObjHamishi; // size = 0x1A4
 
-extern const ActorInit Obj_Hamishi_InitVars;
-
 #endif // Z_OBJ_HAMISHI_H
diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h
index f885850cd0..dd8c4676cb 100644
--- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h
+++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h
@@ -9,6 +9,4 @@ typedef struct ObjHana {
     /* 0x000 */ Actor actor;
 } ObjHana; // size = 0x144
 
-extern const ActorInit Obj_Hana_InitVars;
-
 #endif // Z_OBJ_HANA_H
diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h
index 5d9a8e39b9..88a51a83f5 100644
--- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h
+++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.h
@@ -16,6 +16,4 @@ typedef struct ObjHariko {
     /* 0x154 */ s16 unk154; // Set but not used
 } ObjHariko; // size = 0x158
 
-extern const ActorInit Obj_Hariko_InitVars;
-
 #endif // Z_OBJ_HARIKO_H
diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h
index 803236ac1a..ba2446cdc9 100644
--- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h
+++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.h
@@ -19,6 +19,4 @@ typedef struct ObjHgdoor {
     /* 0x166 */ u16 unk166;
 } ObjHgdoor; // size = 0x168
 
-extern const ActorInit Obj_Hgdoor_InitVars;
-
 #endif // Z_OBJ_HGDOOR_H
diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h
index 1f82a15b1e..0f06fdfaf1 100644
--- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h
+++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.h
@@ -20,6 +20,4 @@ typedef struct ObjHsStump {
     /* 0x168 */ f32 rotFactor;
 } ObjHsStump; // size = 0x16C
 
-extern const ActorInit Obj_HsStump_InitVars;
-
 #endif // Z_OBJ_HSSTUMP_H
diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
index 0411cc9e4e..f919264094 100644
--- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
+++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h
@@ -17,6 +17,4 @@ typedef struct ObjHsblock {
     /* 0x15C */ ObjHsblockActionFunc actionFunc;
 } ObjHsblock; // size = 0x160
 
-extern const ActorInit Obj_Hsblock_InitVars;
-
 #endif // Z_OBJ_HSBLOCK_H
diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h
index 67b428182f..932a61c3df 100644
--- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h
+++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.h
@@ -29,6 +29,4 @@ typedef struct ObjHugebombiwa {
     /* 0x4B4 */ ObjHugebombiwaActionFunc actionFunc;
 } ObjHugebombiwa; // size = 0x4B8
 
-extern const ActorInit Obj_Hugebombiwa_InitVars;
-
 #endif // Z_OBJ_HUGEBOMBIWA_H
diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h
index d84069ec06..9cf735d3c5 100644
--- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h
+++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h
@@ -54,6 +54,4 @@ typedef struct ObjHunsui {
     /* 0x1B4 */ BgDblueMovebg* unk_1B4;
 } ObjHunsui; // size = 0x1B8
 
-extern const ActorInit Obj_Hunsui_InitVars;
-
 #endif // Z_OBJ_HUNSUI_H
diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
index 601c5c9e78..b081a72507 100644
--- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
+++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
@@ -21,6 +21,4 @@ typedef struct ObjIcePoly {
     /* 0x1E4 */ ColliderCylinder colliders2[2];
 } ObjIcePoly; // size = 0x27C
 
-extern const ActorInit Obj_Ice_Poly_InitVars;
-
 #endif // Z_OBJ_ICE_POLY_H
diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h
index fa817781a9..e27145cf76 100644
--- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h
+++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.h
@@ -78,6 +78,4 @@ typedef struct ObjIceblock {
     /* 0x2B4 */ f32 unk_2B4;
 } ObjIceblock; // size = 0x2B8
 
-extern const ActorInit Obj_Iceblock_InitVars;
-
 #endif // Z_OBJ_ICEBLOCK_H
diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h
index a3e8ae8eb8..0da5151a42 100644
--- a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h
+++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.h
@@ -11,6 +11,4 @@ typedef struct ObjJgGakki {
     /* 0x188 */ ColliderCylinder collider;
 } ObjJgGakki; // size = 0x1D4
 
-extern const ActorInit Obj_Jg_Gakki_InitVars;
-
 #endif // Z_OBJ_JG_GAKKI_H
diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h
index a81bbf3cc0..0be39f7a68 100644
--- a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h
+++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h
@@ -27,6 +27,4 @@ typedef struct ObjJgameLight {
     /* 0x1B8 */ u8 prevHealth;
 } ObjJgameLight; // size = 0x1BC
 
-extern const ActorInit Obj_Jgame_Light_InitVars;
-
 #endif // Z_OBJ_JGAME_LIGHT_H
diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h
index 8526f49765..07a9590268 100644
--- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h
+++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.h
@@ -37,6 +37,4 @@ typedef struct ObjKendoKanban {
     /* 0x30C */ u8 unk_30C;
 } ObjKendoKanban; // size = 0x310
 
-extern const ActorInit Obj_Kendo_Kanban_InitVars;
-
 #endif // Z_OBJ_KENDO_KANBAN_H
diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h
index ce33c0112c..58b4f69a10 100644
--- a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h
+++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.h
@@ -10,6 +10,4 @@ typedef struct ObjKepnKoya {
     /* 0x15C */ UNK_TYPE1 unk15C[0x4];
 } ObjKepnKoya; // size = 0x160
 
-extern const ActorInit Obj_Kepn_Koya_InitVars;
-
 #endif // Z_OBJ_KEPN_KOYA_H
diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h
index b3ef71cca7..102dd1e1b5 100644
--- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h
+++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h
@@ -22,6 +22,4 @@ typedef struct ObjKibako {
     /* 0x199 */ s8 unk199; /* room? */
 } ObjKibako; // size = 0x19C
 
-extern const ActorInit Obj_Kibako_InitVars;
-
 #endif // Z_OBJ_KIBAKO_H
diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
index f1816ab4d9..47c8649d9f 100644
--- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
+++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h
@@ -25,6 +25,4 @@ typedef struct ObjKibako2 {
     /* 0x1AD */ s8 skulltulaNoiseTimer;
 } ObjKibako2; // size = 0x1B0
 
-extern const ActorInit Obj_Kibako2_InitVars;
-
 #endif // Z_OBJ_KIBAKO2_H
diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h
index 9073e3e14c..335f33a022 100644
--- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h
+++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.h
@@ -9,8 +9,6 @@ typedef struct ObjKinoko {
     /* 0x000 */ Actor actor;
 } ObjKinoko; // size = 0x144
 
-extern const ActorInit Obj_Kinoko_InitVars;
-
 #define OBJ_KINOKO_GET_FLAG(thisx) ((thisx)->params & 0x7F) 
 
 #endif // Z_OBJ_KINOKO_H
diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h
index c4a9298fa3..0a6f00187a 100644
--- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h
+++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.h
@@ -17,6 +17,4 @@ typedef struct ObjKzsaku {
     /* 0x168 */ s16 timer;
 } ObjKzsaku; // size = 0x16C
 
-extern const ActorInit Obj_Kzsaku_InitVars;
-
 #endif // Z_OBJ_KZSAKU_H
diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
index ea29a9cb9b..b7f2af0500 100644
--- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
+++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h
@@ -24,6 +24,4 @@ typedef struct ObjLift {
     /* 0x178 */ s16 unk_178;
 } ObjLift; // size = 0x17C
 
-extern const ActorInit Obj_Lift_InitVars;
-
 #endif // Z_OBJ_LIFT_H
diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h
index eb16a7a92c..63a106dac0 100644
--- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h
+++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h
@@ -19,6 +19,4 @@ typedef struct ObjLightblock {
     /* 0x1AE */ s8 collisionCounter;
 } ObjLightblock; // size = 0x1B0
 
-extern const ActorInit Obj_Lightblock_InitVars;
-
 #endif // Z_OBJ_LIGHTBLOCK_H
diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h
index 7a8e0043fb..627932f700 100644
--- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h
+++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h
@@ -29,8 +29,6 @@ typedef struct ObjLightswitch {
 
 } ObjLightswitch; // size = 0x1C0
 
-extern const ActorInit Obj_Lightswitch_InitVars;
-
 #define LIGHTSWITCH_FACE_ASLEEP 0
 #define LIGHTSWITCH_FACE_WAKING 1
 #define LIGHTSWITCH_FACE_FULLAWAKE 2
diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h
index e2abd8be53..e25f9cd6d1 100644
--- a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h
+++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.h
@@ -21,6 +21,4 @@ typedef struct ObjLupygamelift {
     /* 0x170 */ s16 timer;
 } ObjLupygamelift; /* size = 0x174 */
 
-extern const ActorInit Obj_Lupygamelift_InitVars;
-
 #endif // Z_OBJ_LUPYGAMELIFT_H
diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
index 57c855179d..2860d151b5 100644
--- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
+++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
@@ -10,6 +10,4 @@ typedef struct ObjMakekinsuta {
     /* 0x144 */ char unk_144[0x4];
 } ObjMakekinsuta; // size = 0x148
 
-extern const ActorInit Obj_Makekinsuta_InitVars;
-
 #endif // Z_OBJ_MAKEKINSUTA_H
diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h
index 708da99d64..0174134cf5 100644
--- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h
+++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h
@@ -15,6 +15,4 @@ typedef struct ObjMakeoshihiki {
     /* 0x148 */ s32 pathCount;
 } ObjMakeoshihiki; // size = 0x14C
 
-extern const ActorInit Obj_Makeoshihiki_InitVars;
-
 #endif // Z_OBJ_MAKEOSHIHIKI_H
diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h
index 6bba9c014e..f73f59797c 100644
--- a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h
+++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.h
@@ -13,8 +13,6 @@ typedef struct ObjMilkBin {
     /* 0x198 */ s32 type;
 } ObjMilkBin; // size = 0x19C
 
-extern const ActorInit Obj_Milk_Bin_InitVars;
-
 typedef enum {
     /* 0 */ OBJ_MILK_BIN_TYPE_DEFAULT,
     /* 1 */ OBJ_MILK_BIN_TYPE_1, // This actor will kill itself if the player has obtained the milk bottle and the current time is the night of the second day onwards.
diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h
index c2ce765f9b..257a6ff3a9 100644
--- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h
+++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.h
@@ -14,6 +14,4 @@ typedef struct ObjMine {
     /* 0x01A8 */ char unk_1A8[0x120C];
 } ObjMine; // size = 0x13B4
 
-extern const ActorInit Obj_Mine_InitVars;
-
 #endif // Z_OBJ_MINE_H
diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h
index fbdf402808..31c0c1e8d1 100644
--- a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h
+++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.h
@@ -14,6 +14,4 @@ typedef struct ObjMoonStone {
     /* 0x194 */ s16 unk194;
 } ObjMoonStone; // size = 0x198
 
-extern const ActorInit Obj_Moon_Stone_InitVars;
-
 #endif // Z_OBJ_MOON_STONE_H
diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h
index f5417d9dbc..98902bfb79 100644
--- a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h
+++ b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.h
@@ -17,6 +17,4 @@ typedef struct ObjMuPict {
     /* 0x14C */ u16 textId;
 } ObjMuPict; // size = 0x150
 
-extern const ActorInit Obj_Mu_Pict_InitVars;
-
 #endif // Z_OBJ_MU_PICT_H
diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
index 03ed6dc4e1..748a3e5bf9 100644
--- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
+++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h
@@ -29,8 +29,6 @@ typedef struct ObjMure {
     /* 0x1A0 */ s16 unk_1A0;
 } ObjMure; // size = 0x1A4
 
-extern const ActorInit Obj_Mure_InitVars;
-
 #define OBJ_MURE_GET_CHNUM(params) ((params >> 12) & 0xF)
 #define OBJ_MURE_GET_PTN(params) ((params >> 8) & 0x7)
 #define OBJ_MURE_GET_SVNUM(params) ((params >> 5) & 0x3)
diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
index bf13c3fbc3..f70d45f1e2 100644
--- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
+++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
@@ -13,6 +13,4 @@ typedef struct ObjMure2 {
     /* 0x148 */ char unk_148[0x38];
 } ObjMure2; // size = 0x180
 
-extern const ActorInit Obj_Mure2_InitVars;
-
 #endif // Z_OBJ_MURE2_H
diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
index d217511983..681193df8f 100644
--- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
+++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
@@ -13,6 +13,4 @@ typedef struct ObjMure3 {
     /* 0x148 */ char unk_148[0x20];
 } ObjMure3; // size = 0x168
 
-extern const ActorInit Obj_Mure3_InitVars;
-
 #endif // Z_OBJ_MURE3_H
diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h
index 7b4c3a5b86..4c4b74916f 100644
--- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h
+++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.h
@@ -24,6 +24,4 @@ typedef struct ObjNozoki {
     /* 0x160 */ ObjNozokiActionFunc actionFunc;
 } ObjNozoki; // size = 0x164
 
-extern const ActorInit Obj_Nozoki_InitVars;
-
 #endif // Z_OBJ_NOZOKI_H
diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h
index a542fb840b..3789383c2e 100644
--- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h
+++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.h
@@ -29,6 +29,4 @@ typedef enum ObjOcarinaliftParams {
     /* 0x1 */ OBJOCARINALIFT_PARAMSC_1
 } ObjOcarinaliftParams;
 
-extern const ActorInit Obj_Ocarinalift_InitVars;
-
 #endif // Z_OBJ_OCARINALIFT_H
diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
index ade27ca439..d2f61e2cf9 100644
--- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
+++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h
@@ -60,6 +60,4 @@ typedef struct ObjOshihiki {
     /* 0x1C8 */ AnimatedMaterial* texture;
 } ObjOshihiki; // size = 0x1CC
 
-extern const ActorInit Obj_Oshihiki_InitVars;
-
 #endif // Z_OBJ_OSHIHIKI_H
diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h
index 542938c807..2651bf0495 100644
--- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h
+++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.h
@@ -16,8 +16,6 @@ typedef struct ObjPurify {
     /* 0x168 */ f32 unk168[2];
 } ObjPurify; // size = 0x170
 
-extern const ActorInit Obj_Purify_InitVars;
-
 #define OBJPURIFY_GET_INFO_INDEX(thisx) ((thisx)->params & 0xF)
 #define OBJPURIFY_GET_UNK_FLAG(thisx) (((thisx)->params >> 0xC) & 1)
 
diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h
index c408004838..27a038860f 100644
--- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h
+++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.h
@@ -25,6 +25,4 @@ typedef struct ObjPzlblock {
     /* 0x17A */ s8 unk_17A;
 } ObjPzlblock; // size = 0x17C
 
-extern const ActorInit Obj_Pzlblock_InitVars;
-
 #endif // Z_OBJ_PZLBLOCK_H
diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h
index cd55d1fa6c..41b7a821e6 100644
--- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h
+++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.h
@@ -38,6 +38,4 @@ typedef struct ObjRaillift {
     /* 0x188 */ s16 cutsceneTimer;
 } ObjRaillift; // size = 0x18C
 
-extern const ActorInit Obj_Raillift_InitVars;
-
 #endif // Z_OBJ_RAILLIFT_H
diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
index be15ac11ac..5ce7d13d4d 100644
--- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
+++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.h
@@ -15,6 +15,4 @@ typedef struct ObjRoomtimer {
     /* 0x148 */ s32 switchFlag;
 } ObjRoomtimer; // size = 0x14C
 
-extern const ActorInit Obj_Roomtimer_InitVars;
-
 #endif // Z_OBJ_ROOMTIMER_H
diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h
index 46cbef0eed..df3fe1dee7 100644
--- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h
+++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h
@@ -20,6 +20,4 @@ typedef struct ObjRotlift {
     /* 0x15C */ ObjEtcetera* dekuFlowers[2];
 } ObjRotlift; // size = 0x164
 
-extern const ActorInit Obj_Rotlift_InitVars;
-
 #endif // Z_OBJ_ROTLIFT_H
diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h
index b777c64b33..3f23b3dfe0 100644
--- a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h
+++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.h
@@ -11,6 +11,4 @@ typedef struct ObjShutter {
     /* 0x148 */ f32 verticalOffset;
 } ObjShutter; // size = 0x14C
 
-extern const ActorInit Obj_Shutter_InitVars;
-
 #endif // Z_OBJ_SHUTTER_H
diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h
index 97a2e6ede2..ab4f372404 100644
--- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h
+++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.h
@@ -32,6 +32,4 @@ typedef struct ObjSkateblock {
     /* 0x1C1 */ u8 unk_1C1;
 } ObjSkateblock; // size = 0x1C4
 
-extern const ActorInit Obj_Skateblock_InitVars;
-
 #endif // Z_OBJ_SKATEBLOCK_H
diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h
index 5ab3e405c4..a1b21d4426 100644
--- a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h
+++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.h
@@ -16,6 +16,4 @@ typedef struct ObjSmork {
     /* 0x1C6 */ s16 unk_1C6;
 } ObjSmork; // size = 0x1C8
 
-extern const ActorInit Obj_Smork_InitVars;
-
 #endif // Z_OBJ_SMORK_H
diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h
index 0b2974d44b..804c2596cb 100644
--- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h
+++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.h
@@ -40,6 +40,4 @@ typedef struct ObjSnowball {
     /* 0x211 */ s8 unk_211;
 } ObjSnowball; // size = 0x214
 
-extern const ActorInit Obj_Snowball_InitVars;
-
 #endif // Z_OBJ_SNOWBALL_H
diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h
index b6990fc1c2..19bd173fb9 100644
--- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h
+++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h
@@ -24,6 +24,4 @@ typedef struct ObjSnowball2 {
     /* 0x1B0 */ UNK_TYPE1 unk1B0[4];
 } ObjSnowball2; // size = 0x1B4
 
-extern const ActorInit Obj_Snowball2_InitVars;
-
 #endif // Z_OBJ_SNOWBALL2_H
diff --git a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h
index 8f3c802576..a83aa840b8 100644
--- a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h
+++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.h
@@ -10,6 +10,4 @@ typedef struct ObjSound {
     /* 0x144 */ char unk_144[0x4];
 } ObjSound; // size = 0x148
 
-extern const ActorInit Obj_Sound_InitVars;
-
 #endif // Z_OBJ_SOUND_H
diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h
index 3fdb835976..881a816a7f 100644
--- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h
+++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.h
@@ -27,6 +27,4 @@ typedef struct ObjSpidertent {
     /* 0x3C8 */ ObjSpidertentActionFunc actionFunc;
 } ObjSpidertent; // size = 0x3CC
 
-extern const ActorInit Obj_Spidertent_InitVars;
-
 #endif // Z_OBJ_SPIDERTENT_H
diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h
index 741385264a..5bf2e5d5d8 100644
--- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h
+++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.h
@@ -56,6 +56,4 @@ typedef struct ObjSpinyroll {
     /* 0x4E2 */ s16 unk_4E2;
 } ObjSpinyroll; // size = 0x4E4
 
-extern const ActorInit Obj_Spinyroll_InitVars;
-
 #endif // Z_OBJ_SPINYROLL_H
diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
index f208a60cf5..764c724a07 100644
--- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
+++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
@@ -60,8 +60,6 @@ typedef struct ObjSwitch {
     /* 0x254 */ f32 floorSwitchDownScale;
 } ObjSwitch; // size = 0x258
 
-extern const ActorInit Obj_Switch_InitVars;
-
 #define OBJ_SWITCH_GET_TYPE(thisx) ((thisx)->params&7)
 #define OBJ_SWITCH_GET_SUBTYPE(thisx) ((thisx)->params >> 4 & 7)
 #define OBJ_SWITCH_GET_SWITCH_FLAG(thisx) ((thisx)->params >> 8 & 0x7F)
diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h
index 29654f9924..c3abf82f32 100644
--- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h
+++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.h
@@ -13,6 +13,4 @@ typedef struct ObjSwprize {
     /* 0x148 */ char unk_148[0x4];
 } ObjSwprize; // size = 0x14C
 
-extern const ActorInit Obj_Swprize_InitVars;
-
 #endif // Z_OBJ_SWPRIZE_H
diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h
index 618b86ed51..d2d329fe45 100644
--- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h
+++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h
@@ -16,8 +16,6 @@ typedef struct ObjSyokudai {
     /* 0x1E4 */ LightInfo lightInfo;
 } ObjSyokudai; // size = 0x1F4
 
-extern const ActorInit Obj_Syokudai_InitVars;
-
 typedef enum {
     /* 0 */ OBJ_SYOKUDAI_TYPE_SWITCH_CAUSES_FLAME,
     /* 1 */ OBJ_SYOKUDAI_TYPE_FLAME_CAUSES_SWITCH,
diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h
index 603041d9f3..225e265122 100644
--- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h
+++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.h
@@ -13,6 +13,4 @@ typedef struct ObjTakarayaWall {
     /* 0x148 */ char unk_148[0x98];
 } ObjTakarayaWall; // size = 0x1E0
 
-extern const ActorInit Obj_Takaraya_Wall_InitVars;
-
 #endif // Z_OBJ_TAKARAYA_WALL_H
diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h
index d1220bf339..b824d142c6 100644
--- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h
+++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.h
@@ -14,6 +14,4 @@ typedef struct ObjTaru {
     /* 0x1AC */ char unk_1AC[0x4];
 } ObjTaru; // size = 0x1B0
 
-extern const ActorInit Obj_Taru_InitVars;
-
 #endif // Z_OBJ_TARU_H
diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h
index 9a55a42194..8259e62c88 100644
--- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h
+++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h
@@ -29,6 +29,4 @@ typedef struct ObjToge {
     /* 0x1CC */ f32 unk_1CC;
 } ObjToge; // size = 0x1D0
 
-extern const ActorInit Obj_Toge_InitVars;
-
 #endif // Z_OBJ_TOGE_H
diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h
index 537e7ecc78..ddb1517ded 100644
--- a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h
+++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.h
@@ -23,6 +23,4 @@ typedef struct ObjTokeiStep {
     /* 0x160 */ ObjTokeiStepPanel panels[7];
 } ObjTokeiStep; // size = 0x1EC
 
-extern const ActorInit Obj_Tokei_Step_InitVars;
-
 #endif // Z_OBJ_TOKEI_STEP_H
diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h
index 49e47af199..8f9983995d 100644
--- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h
+++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.h
@@ -14,6 +14,4 @@ typedef struct ObjTokeiTobira {
     /* 0x160 */ char unk_160[0x10];
 } ObjTokeiTobira; // size = 0x170
 
-extern const ActorInit Obj_Tokei_Tobira_InitVars;
-
 #endif // Z_OBJ_TOKEI_TOBIRA_H
diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h
index 7a2db071e3..620228f535 100644
--- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h
+++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h
@@ -16,6 +16,4 @@ typedef struct ObjTokeiTurret {
     /* 0x000 */ DynaPolyActor dyna;
 } ObjTokeiTurret; // size = 0x15C
 
-extern const ActorInit Obj_Tokei_Turret_InitVars;
-
 #endif // Z_OBJ_TOKEI_TURRET_H
diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h
index 70ef31c797..e670d19e0a 100644
--- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h
+++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h
@@ -62,6 +62,4 @@ typedef struct ObjTokeidai {
     /* 0x174 */ ObjTokeidaiActionFunc actionFunc;
 } ObjTokeidai; // size = 0x178
 
-extern const ActorInit Obj_Tokeidai_InitVars;
-
 #endif // Z_OBJ_TOKEIDAI_H
diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h
index c1af4d7332..60f0b97960 100644
--- a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h
+++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.h
@@ -18,6 +18,4 @@ typedef struct ObjToudai {
     /* 0x23A */ UNK_TYPE1 pad23A[6];
 } ObjToudai;// size = 0x240
 
-extern const ActorInit Obj_Toudai_InitVars;
-
 #endif // Z_OBJ_TOUDAI_H
diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h
index 828530ab37..8d40c57f15 100644
--- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h
+++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.h
@@ -19,6 +19,4 @@ typedef struct ObjTree {
     /* 0x1B4 */ s16 timer;
 } ObjTree; // size = 0x1B8
 
-extern const ActorInit Obj_Tree_InitVars;
-
 #endif // Z_OBJ_TREE_H
diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
index 28233c911d..2b3d1537f7 100644
--- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
+++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h
@@ -31,8 +31,6 @@ typedef struct ObjTsubo {
     /* 0x19B */ u8 unk_19B;
 } ObjTsubo; // size = 0x19C
 
-extern const ActorInit Obj_Tsubo_InitVars;
-
 typedef enum {
     /* 0 */ OBJ_TSUBO_TYPE_0,
     /* 1 */ OBJ_TSUBO_TYPE_1,
diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.h b/src/overlays/actors/ovl_Obj_Um/z_obj_um.h
index 9d228eda85..a903e05b59 100644
--- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.h
+++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.h
@@ -62,8 +62,6 @@ typedef struct ObjUm {
     /* 0x4E0 */ s32 areAllPotsBroken; // true when all of the pots have been broken
 } ObjUm; // size = 0x4E4
 
-extern const ActorInit Obj_Um_InitVars;
-
 typedef enum {
     /* 0 */ OBJ_UM_TYPE_TERMINA_FIELD,
     /* 1 */ OBJ_UM_TYPE_RANCH,
diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h
index 7c4cdd8a5a..d215e5cd76 100644
--- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h
+++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.h
@@ -14,6 +14,4 @@ typedef struct ObjUsiyane {
     /* 0x160 */ char unk_160[0x5E8];
 } ObjUsiyane; // size = 0x748
 
-extern const ActorInit Obj_Usiyane_InitVars;
-
 #endif // Z_OBJ_USIYANE_H
diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h
index 946685a5cd..5fa08ab860 100644
--- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h
+++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.h
@@ -10,6 +10,4 @@ typedef struct ObjVisiblock {
     /* 0x15C */ UNK_TYPE1 unk15C[0x4];
 } ObjVisiblock; // size = 0x160
 
-extern const ActorInit Obj_Visiblock_InitVars;
-
 #endif // Z_OBJ_VISIBLOCK_H
diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h
index 38dee86fb2..09a91b4374 100644
--- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h
+++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.h
@@ -43,6 +43,4 @@ typedef struct ObjVspinyroll {
     /* 0x3C8 */ s16 unk_3C8;
 } ObjVspinyroll; // size = 0x3CC
 
-extern const ActorInit Obj_Vspinyroll_InitVars;
-
 #endif // Z_OBJ_VSPINYROLL_H
diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h
index 8d39deef0d..a2db609d6f 100644
--- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h
+++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.h
@@ -26,8 +26,6 @@ typedef struct ObjWarpstone {
     /* 0x1AC */ ObjWarpstoneActionFunc actionFunc;
 } ObjWarpstone; // size = 0x1B0
 
-extern const ActorInit Obj_Warpstone_InitVars;
-
 #define OBJ_WARPSTONE_GET_ID(thisx) ((u16)((thisx)->params & 0xF))
 #define OBJ_WARPSTONE_IS_ACTIVATED(owlId) (((void)0, gSaveContext.save.playerData.owlActivationFlags) & (u16)gBitFlags[(owlId)])
 
diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h
index 23296ff09a..08db8914ad 100644
--- a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h
+++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.h
@@ -10,6 +10,4 @@ typedef struct ObjWind {
     /* 0x144 */ char unk_144[0x4];
 } ObjWind; // size = 0x148
 
-extern const ActorInit Obj_Wind_InitVars;
-
 #endif // Z_OBJ_WIND_H
diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h
index 9b8674f599..2e2963d0e5 100644
--- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h
+++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.h
@@ -14,6 +14,4 @@ typedef struct ObjWturn {
     /* 0x14A */ s16 unk_14A;
 } ObjWturn; // size = 0x14C
 
-extern const ActorInit Obj_Wturn_InitVars;
-
 #endif // Z_OBJ_WTURN_H
diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h
index a26d305ae6..cacb0fa7bb 100644
--- a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h
+++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.h
@@ -13,6 +13,4 @@ typedef struct ObjY2lift {
     /* 0x15F */ u8 unk15F;
 } ObjY2lift; // size = 0x160
 
-extern const ActorInit Obj_Y2lift_InitVars;
-
 #endif // Z_OBJ_Y2LIFT_H
diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h
index 217bcee6ce..c2e80a0526 100644
--- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h
+++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.h
@@ -10,6 +10,4 @@ typedef struct ObjY2shutter {
     /* 0x144 */ char unk_144[0x1C];
 } ObjY2shutter; // size = 0x160
 
-extern const ActorInit Obj_Y2shutter_InitVars;
-
 #endif // Z_OBJ_Y2SHUTTER_H
diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h
index 28ffd63dc5..52ef8693e5 100644
--- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h
+++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.h
@@ -10,6 +10,4 @@ typedef struct ObjYado {
     /* 0x144 */ u8 isNight;
 } ObjYado; // size = 0x148
 
-extern const ActorInit Obj_Yado_InitVars;
-
 #endif // Z_OBJ_YADO_H
diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h
index d1fdc6aeda..fc2b777d82 100644
--- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h
+++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h
@@ -9,8 +9,6 @@ typedef struct ObjYasi {
     /* 0x000 */ DynaPolyActor dyna;
 } ObjYasi; // size = 0x15C
 
-extern const ActorInit Obj_Yasi_InitVars;
-
 #define PALM_TREE_IS_WIDE(thisx) ((thisx)->params & 1)
 
 #endif // Z_OBJ_YASI_H
diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
index c6e374da86..8dc8d4d85a 100644
--- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
+++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
@@ -28,6 +28,4 @@ typedef struct ObjectKankyo {
     /* 0x1150 */ ObjectKankyoActionFunc actionFunc;
 } ObjectKankyo; // size = 0x1154
 
-extern const ActorInit Object_Kankyo_InitVars;
-
 #endif // Z_OBJECT_KANKYO_H
diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
index 922b1f89b8..a896f80c84 100644
--- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
+++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h
@@ -13,6 +13,4 @@ typedef struct OceffSpot {
     /* 0x174 */ OceffSpotActionFunc actionFunc;
 } OceffSpot; // size = 0x178
 
-extern const ActorInit Oceff_Spot_InitVars;
-
 #endif // Z_OCEFF_SPOT_H
diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
index 460ede8447..1979995135 100644
--- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
+++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h
@@ -13,6 +13,4 @@ typedef struct OceffStorm {
     /* 0x14C */ OceffStormActionFunc actionFunc;
 } OceffStorm; // size = 0x150
 
-extern const ActorInit Oceff_Storm_InitVars;
-
 #endif // Z_OCEFF_STORM_H
diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h
index 5b7e348375..25eed638fa 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h
@@ -10,6 +10,4 @@ typedef struct OceffWipe {
     /* 0x144 */ char unk_144[0x4];
 } OceffWipe; // size = 0x148
 
-extern const ActorInit Oceff_Wipe_InitVars;
-
 #endif // Z_OCEFF_WIPE_H
diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h
index 79d3665253..b0427067ee 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h
@@ -10,6 +10,4 @@ typedef struct OceffWipe2 {
     /* 0x144 */ char unk_144[0x4];
 } OceffWipe2; // size = 0x148
 
-extern const ActorInit Oceff_Wipe2_InitVars;
-
 #endif // Z_OCEFF_WIPE2_H
diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h
index b9f41bb09c..151e4ba3c0 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h
@@ -10,6 +10,4 @@ typedef struct OceffWipe3 {
     /* 0x144 */ char unk_144[0x4];
 } OceffWipe3; // size = 0x148
 
-extern const ActorInit Oceff_Wipe3_InitVars;
-
 #endif // Z_OCEFF_WIPE3_H
diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h
index 76debbeed8..f03c0ffddf 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h
@@ -10,6 +10,4 @@ typedef struct OceffWipe4 {
     /* 0x144 */ char unk_144[0x4];
 } OceffWipe4; // size = 0x148
 
-extern const ActorInit Oceff_Wipe4_InitVars;
-
 #endif // Z_OCEFF_WIPE4_H
diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h
index 063d0386b8..ba8352a8e5 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.h
@@ -10,6 +10,4 @@ typedef struct OceffWipe5 {
     /* 0x144 */ char unk_144[0x4];
 } OceffWipe5; // size = 0x148
 
-extern const ActorInit Oceff_Wipe5_InitVars;
-
 #endif // Z_OCEFF_WIPE5_H
diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h
index c37e3f9d43..2afd8f24fc 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.h
@@ -10,6 +10,4 @@ typedef struct OceffWipe6 {
     /* 0x144 */ s16 counter;
 } OceffWipe6; // size = 0x148
 
-extern const ActorInit Oceff_Wipe6_InitVars;
-
 #endif // Z_OCEFF_WIPE6_H
diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h
index df517e1fec..ce6b58c3f4 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h
+++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.h
@@ -10,6 +10,4 @@ typedef struct OceffWipe7 {
     /* 0x144 */ char unk_144[0x4];
 } OceffWipe7; // size = 0x148
 
-extern const ActorInit Oceff_Wipe7_InitVars;
-
 #endif // Z_OCEFF_WIPE7_H
diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
index 49fd2ffb76..5e596c97fc 100644
--- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
+++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
@@ -20,6 +20,4 @@ typedef struct ShotSun {
     /* 0x19C */ s8 unk_19C; // leftover from OOT secret ocarina occurrence function.
 } ShotSun;                  // size = 0x1A0
 
-extern const ActorInit Shot_Sun_InitVars;
-
 #endif // Z_SHOT_SUN_H
diff --git a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.h b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.h
index 28bebb5d89..cbcb66431d 100644
--- a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.h
+++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.h
@@ -11,6 +11,4 @@ typedef struct TGSw {
     /* 0x144 */ TGSwActionFunc actionFunc;
 } TGSw; // size = 0x148
 
-extern const ActorInit TG_Sw_InitVars;
-
 #endif // Z_TG_SW_H