From 1cb00350d94b98a70574545ebb5d858fd8532fe6 Mon Sep 17 00:00:00 2001
From: Roman971 <32455037+Roman971@users.noreply.github.com>
Date: Tue, 4 Oct 2022 12:36:25 +0200
Subject: [PATCH] Skip compiling C-included files during the build (#1386)

* Update the makefile to skip .inc.c files when building

* Rename all C-included source files to .inc.c
---
 Makefile                                                       | 2 +-
 src/code/z_actor.c                                             | 2 +-
 src/code/z_camera.c                                            | 2 +-
 src/code/{z_camera_data.c => z_camera_data.inc.c}              | 0
 src/code/{z_cheap_proc.c => z_cheap_proc.inc.c}                | 0
 src/code/z_onepointdemo.c                                      | 2 +-
 src/code/{z_onepointdemo_data.c => z_onepointdemo_data.inc.c}  | 0
 src/libultra/gu/sins.c                                         | 3 ++-
 src/libultra/gu/{sintable.c => sintable.inc.c}                 | 0
 src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c          | 2 +-
 .../{z_boss_dodongo_data.c => z_boss_dodongo_data.inc.c}       | 0
 src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c                    | 2 +-
 .../ovl_Boss_Fd/{z_boss_fd_colchk.c => z_boss_fd_colchk.inc.c} | 0
 src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c                  | 2 +-
 .../{z_boss_fd2_colchk.c => z_boss_fd2_colchk.inc.c}           | 0
 src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c            | 2 +-
 .../{z_boss_ganon2_data.c => z_boss_ganon2_data.inc.c}         | 0
 src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c                    | 2 +-
 .../ovl_Boss_Mo/{z_boss_mo_colchk.c => z_boss_mo_colchk.inc.c} | 0
 src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c                  | 2 +-
 .../{z_boss_sst_colchk.c => z_boss_sst_colchk.inc.c}           | 0
 src/overlays/actors/ovl_Demo_Du/z_demo_du.c                    | 2 +-
 ...z_demo_du_cutscene_data.c => z_demo_du_cutscene_data.inc.c} | 0
 src/overlays/actors/ovl_Demo_Im/z_demo_im.c                    | 2 +-
 ...z_demo_im_cutscene_data.c => z_demo_im_cutscene_data.inc.c} | 0
 src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c                    | 2 +-
 ...z_demo_sa_cutscene_data.c => z_demo_sa_cutscene_data.inc.c} | 0
 src/overlays/actors/ovl_En_Jj/z_en_jj.c                        | 2 +-
 .../{z_en_jj_cutscene_data.c => z_en_jj_cutscene_data.inc.c}   | 0
 src/overlays/actors/ovl_En_Kanban/z_en_kanban.c                | 2 +-
 .../ovl_En_Kanban/{z_en_kanban_gfx.c => z_en_kanban_gfx.inc.c} | 0
 src/overlays/actors/ovl_En_Nb/z_en_nb.c                        | 2 +-
 .../{z_en_nb_cutscene_data.c => z_en_nb_cutscene_data.inc.c}   | 0
 src/overlays/actors/ovl_En_Ru1/z_en_ru1.c                      | 2 +-
 .../{z_en_ru1_cutscene_data.c => z_en_ru1_cutscene_data.inc.c} | 0
 src/overlays/actors/ovl_En_Ru2/z_en_ru2.c                      | 2 +-
 .../{z_en_ru2_cutscene_data.c => z_en_ru2_cutscene_data.inc.c} | 0
 src/overlays/actors/ovl_En_Zl1/z_en_zl1.c                      | 2 +-
 .../{z_en_zl1_camera_data.c => z_en_zl1_camera_data.inc.c}     | 0
 src/overlays/actors/ovl_En_Zl4/z_en_zl4.c                      | 2 +-
 .../{z_en_zl4_cutscene_data.c => z_en_zl4_cutscene_data.inc.c} | 0
 41 files changed, 22 insertions(+), 21 deletions(-)
 rename src/code/{z_camera_data.c => z_camera_data.inc.c} (100%)
 rename src/code/{z_cheap_proc.c => z_cheap_proc.inc.c} (100%)
 rename src/code/{z_onepointdemo_data.c => z_onepointdemo_data.inc.c} (100%)
 rename src/libultra/gu/{sintable.c => sintable.inc.c} (100%)
 rename src/overlays/actors/ovl_Boss_Dodongo/{z_boss_dodongo_data.c => z_boss_dodongo_data.inc.c} (100%)
 rename src/overlays/actors/ovl_Boss_Fd/{z_boss_fd_colchk.c => z_boss_fd_colchk.inc.c} (100%)
 rename src/overlays/actors/ovl_Boss_Fd2/{z_boss_fd2_colchk.c => z_boss_fd2_colchk.inc.c} (100%)
 rename src/overlays/actors/ovl_Boss_Ganon2/{z_boss_ganon2_data.c => z_boss_ganon2_data.inc.c} (100%)
 rename src/overlays/actors/ovl_Boss_Mo/{z_boss_mo_colchk.c => z_boss_mo_colchk.inc.c} (100%)
 rename src/overlays/actors/ovl_Boss_Sst/{z_boss_sst_colchk.c => z_boss_sst_colchk.inc.c} (100%)
 rename src/overlays/actors/ovl_Demo_Du/{z_demo_du_cutscene_data.c => z_demo_du_cutscene_data.inc.c} (100%)
 rename src/overlays/actors/ovl_Demo_Im/{z_demo_im_cutscene_data.c => z_demo_im_cutscene_data.inc.c} (100%)
 rename src/overlays/actors/ovl_Demo_Sa/{z_demo_sa_cutscene_data.c => z_demo_sa_cutscene_data.inc.c} (100%)
 rename src/overlays/actors/ovl_En_Jj/{z_en_jj_cutscene_data.c => z_en_jj_cutscene_data.inc.c} (100%)
 rename src/overlays/actors/ovl_En_Kanban/{z_en_kanban_gfx.c => z_en_kanban_gfx.inc.c} (100%)
 rename src/overlays/actors/ovl_En_Nb/{z_en_nb_cutscene_data.c => z_en_nb_cutscene_data.inc.c} (100%)
 rename src/overlays/actors/ovl_En_Ru1/{z_en_ru1_cutscene_data.c => z_en_ru1_cutscene_data.inc.c} (100%)
 rename src/overlays/actors/ovl_En_Ru2/{z_en_ru2_cutscene_data.c => z_en_ru2_cutscene_data.inc.c} (100%)
 rename src/overlays/actors/ovl_En_Zl1/{z_en_zl1_camera_data.c => z_en_zl1_camera_data.inc.c} (100%)
 rename src/overlays/actors/ovl_En_Zl4/{z_en_zl4_cutscene_data.c => z_en_zl4_cutscene_data.inc.c} (100%)

diff --git a/Makefile b/Makefile
index 8b1e7f4b8e..7cdb1e35ec 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,7 @@ ASSET_FILES_OUT := $(foreach f,$(ASSET_FILES_XML:.xml=.c),$f) \
 UNDECOMPILED_DATA_DIRS := $(shell find data -type d)
 
 # source files
-C_FILES       := $(foreach dir,$(SRC_DIRS) $(ASSET_BIN_DIRS),$(wildcard $(dir)/*.c))
+C_FILES       := $(filter-out %.inc.c,$(foreach dir,$(SRC_DIRS) $(ASSET_BIN_DIRS),$(wildcard $(dir)/*.c)))
 S_FILES       := $(foreach dir,$(SRC_DIRS) $(UNDECOMPILED_DATA_DIRS),$(wildcard $(dir)/*.s))
 O_FILES       := $(foreach f,$(S_FILES:.s=.o),build/$f) \
                  $(foreach f,$(C_FILES:.c=.o),build/$f) \
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index bd73ab8d70..738fff1fb2 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -3963,7 +3963,7 @@ s32 func_80035124(Actor* actor, PlayState* play) {
     return ret;
 }
 
-#include "z_cheap_proc.c"
+#include "z_cheap_proc.inc.c"
 
 u8 func_800353E8(PlayState* play) {
     Player* player = GET_PLAYER(play);
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 0607a1c5cd..c9477d147b 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -33,7 +33,7 @@ s32 Camera_UpdateWater(Camera* camera);
 #define DISTORTION_UNDERWATER_STRONG (1 << 3)
 #define DISTORTION_UNDERWATER_FISHING (1 << 4)
 
-#include "z_camera_data.c"
+#include "z_camera_data.inc.c"
 
 /*===============================================================*/
 
diff --git a/src/code/z_camera_data.c b/src/code/z_camera_data.inc.c
similarity index 100%
rename from src/code/z_camera_data.c
rename to src/code/z_camera_data.inc.c
diff --git a/src/code/z_cheap_proc.c b/src/code/z_cheap_proc.inc.c
similarity index 100%
rename from src/code/z_cheap_proc.c
rename to src/code/z_cheap_proc.inc.c
diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c
index 9750aa21e6..e28448f3b3 100644
--- a/src/code/z_onepointdemo.c
+++ b/src/code/z_onepointdemo.c
@@ -6,7 +6,7 @@ static s16 sDisableAttention = false;
 static s16 sUnused = -1;
 static s32 sPrevFrameCs1100 = -4096;
 
-#include "z_onepointdemo_data.c"
+#include "z_onepointdemo_data.inc.c"
 
 void OnePointCutscene_AddVecSphToVec3f(Vec3f* dst, Vec3f* src, VecSph* vecSph) {
     Vec3f out;
diff --git a/src/code/z_onepointdemo_data.c b/src/code/z_onepointdemo_data.inc.c
similarity index 100%
rename from src/code/z_onepointdemo_data.c
rename to src/code/z_onepointdemo_data.inc.c
diff --git a/src/libultra/gu/sins.c b/src/libultra/gu/sins.c
index 4b538f67dc..b6c2d229a9 100644
--- a/src/libultra/gu/sins.c
+++ b/src/libultra/gu/sins.c
@@ -1,5 +1,6 @@
 #include "ultra64.h"
-#include "sintable.c"
+
+#include "sintable.inc.c"
 
 s16 sins(u16 x) {
     s16 value;
diff --git a/src/libultra/gu/sintable.c b/src/libultra/gu/sintable.inc.c
similarity index 100%
rename from src/libultra/gu/sintable.c
rename to src/libultra/gu/sintable.inc.c
diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
index d071e3a325..aef29c7aee 100644
--- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
+++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
@@ -45,7 +45,7 @@ const ActorInit Boss_Dodongo_InitVars = {
     (ActorFunc)BossDodongo_Draw,
 };
 
-#include "z_boss_dodongo_data.c"
+#include "z_boss_dodongo_data.inc.c"
 
 static InitChainEntry sInitChain[] = {
     ICHAIN_U8(targetMode, 5, ICHAIN_CONTINUE),
diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.c
rename to src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c
diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
index d7d3f2b136..fd16437c74 100644
--- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
+++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
@@ -56,7 +56,7 @@ const ActorInit Boss_Fd_InitVars = {
     (ActorFunc)BossFd_Draw,
 };
 
-#include "z_boss_fd_colchk.c"
+#include "z_boss_fd_colchk.inc.c"
 
 static InitChainEntry sInitChain[] = {
     ICHAIN_U8(targetMode, 5, ICHAIN_CONTINUE),
diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.c
rename to src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c
diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
index bd0faab46c..8642c77c04 100644
--- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
+++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
@@ -58,7 +58,7 @@ const ActorInit Boss_Fd2_InitVars = {
     (ActorFunc)BossFd2_Draw,
 };
 
-#include "z_boss_fd2_colchk.c"
+#include "z_boss_fd2_colchk.inc.c"
 
 static Vec3f sHoleLocations[] = {
     { 0.0f, 90.0f, -243.0f },    { 0.0f, 90.0f, 0.0f },    { 0.0f, 90.0f, 243.0f },
diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.c
rename to src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c
diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
index eab578f87d..49e1748028 100644
--- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
+++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
@@ -44,7 +44,7 @@ const ActorInit Boss_Ganon2_InitVars = {
     (ActorFunc)BossGanon2_Draw,
 };
 
-#include "z_boss_ganon2_data.c"
+#include "z_boss_ganon2_data.inc.c"
 
 void BossGanon2_InitRand(s32 seedInit0, s32 seedInit1, s32 seedInit2) {
     sSeed1 = seedInit0;
diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c
rename to src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c
diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
index a2184614d4..09e7e8ca1b 100644
--- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
@@ -140,7 +140,7 @@ static f32 sFlatWidth[41] = {
     8.6f,  8.3f,  8.2f, 8.1f, 7.2f, 6.7f, 5.9f, 4.9f, 2.7f, 0.0f, 0.0f, 0.0f, 0.0f,
 };
 
-#include "z_boss_mo_colchk.c"
+#include "z_boss_mo_colchk.inc.c"
 
 static BossMoEffect sEffects[BOSS_MO_EFFECT_COUNT];
 static s32 sSeed1;
diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.c
rename to src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c
diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
index cfb3b95ea2..76e6d39204 100644
--- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
+++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
@@ -246,7 +246,7 @@ const ActorInit Boss_Sst_InitVars = {
     (ActorFunc)BossSst_DrawHand,
 };
 
-#include "z_boss_sst_colchk.c"
+#include "z_boss_sst_colchk.inc.c"
 
 static AnimationHeader* sHandIdleAnims[] = { &gBongoLeftHandIdleAnim, &gBongoRightHandIdleAnim };
 static AnimationHeader* sHandFlatPoses[] = { &gBongoLeftHandFlatPoseAnim, &gBongoRightHandFlatPoseAnim };
diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.c
rename to src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c
diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
index 925c62b133..f5bd25517d 100644
--- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
+++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
@@ -17,7 +17,7 @@ void DemoDu_Draw(Actor* thisx, PlayState* play);
 static s32 sUnused = 0;
 
 #pragma asmproc recurse
-#include "z_demo_du_cutscene_data.c"
+#include "z_demo_du_cutscene_data.inc.c"
 
 static void* sEyeTextures[] = { gDaruniaEyeOpenTex, gDaruniaEyeOpeningTex, gDaruniaEyeShutTex, gDaruniaEyeClosingTex };
 static void* sMouthTextures[] = { gDaruniaMouthSeriousTex, gDaruniaMouthGrinningTex, gDaruniaMouthOpenTex,
diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.c
rename to src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c
diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
index 2fc91ab891..070dba0823 100644
--- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
+++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
@@ -73,7 +73,7 @@ static ColliderCylinderInitType1 sCylinderInit = {
 };
 
 #pragma asmproc recurse
-#include "z_demo_im_cutscene_data.c"
+#include "z_demo_im_cutscene_data.inc.c"
 
 static DemoImActionFunc sActionFuncs[] = {
     func_809856F8, func_80985718, func_80985738, func_80985770, func_809857B0, func_809857F0, func_80985830,
diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.c
rename to src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c
diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
index 67f28d8a92..c8fb0bdb03 100644
--- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
+++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
@@ -72,7 +72,7 @@ static void* sMouthTextures[] = {
 static u32 D_80990108 = 0;
 
 #pragma asmproc recurse
-#include "z_demo_sa_cutscene_data.c"
+#include "z_demo_sa_cutscene_data.inc.c"
 
 static DemoSaActionFunc sActionFuncs[] = {
     func_8098EBB8, func_8098EBD8, func_8098EBF8, func_8098EC28, func_8098EC60, func_8098EC94, func_8098ECCC,
diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.c
rename to src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c
diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c
index 25c1b80a31..87a2162d74 100644
--- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c
+++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c
@@ -43,7 +43,7 @@ const ActorInit En_Jj_InitVars = {
 static s32 sUnused = 0;
 
 #pragma asmproc recurse
-#include "z_en_jj_cutscene_data.c"
+#include "z_en_jj_cutscene_data.inc.c"
 
 static s32 sUnused2[] = { 0, 0 };
 
diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.c b/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.c
rename to src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c
diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
index 0376bed38c..cef1f0b0a6 100644
--- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
+++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
@@ -784,7 +784,7 @@ static Gfx* sDisplayLists[] = {
     object_kanban_DL_0013D0, object_kanban_DL_001488, object_kanban_DL_001540,
 };
 
-#include "z_en_kanban_gfx.c"
+#include "z_en_kanban_gfx.inc.c"
 
 static f32 sCutAngles[] = {
     /* CUT_POST   */ 0.50f * M_PI,
diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban_gfx.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban_gfx.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_En_Kanban/z_en_kanban_gfx.c
rename to src/overlays/actors/ovl_En_Kanban/z_en_kanban_gfx.inc.c
diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c
index 50dfd2b3e1..6e1b116221 100644
--- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c
+++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c
@@ -86,7 +86,7 @@ static void* sEyeTextures[] = {
 static s32 D_80AB4318 = 0;
 
 #pragma asmproc recurse
-#include "z_en_nb_cutscene_data.c"
+#include "z_en_nb_cutscene_data.inc.c"
 
 s32 EnNb_GetPath(EnNb* this) {
     s32 path = this->actor.params >> 8;
diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.c b/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.c
rename to src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c
diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
index 84382d49e3..66d8ed14cb 100644
--- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
+++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
@@ -106,7 +106,7 @@ static void* sMouthTextures[] = {
 static s32 sUnused = 0;
 
 #pragma asmproc recurse
-#include "z_en_ru1_cutscene_data.c"
+#include "z_en_ru1_cutscene_data.inc.c"
 
 static u32 D_80AF1938 = 0;
 
diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.c
rename to src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c
diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
index 1af1f3bbc3..93f096c708 100644
--- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
+++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
@@ -64,7 +64,7 @@ static void* sEyeTextures[] = {
 static UNK_TYPE D_80AF4118 = 0;
 
 #pragma asmproc recurse
-#include "z_en_ru2_cutscene_data.c"
+#include "z_en_ru2_cutscene_data.inc.c"
 
 static EnRu2ActionFunc sActionFuncs[] = {
     func_80AF2CB4, func_80AF2CD4, func_80AF2CF4, func_80AF2D2C, func_80AF2D6C, func_80AF2DAC, func_80AF2DEC,
diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c
rename to src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
index f27c48a462..4ccd0cf114 100644
--- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
+++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
@@ -25,7 +25,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play);
 
 extern CutsceneData D_80B4C5D0[];
 
-#include "z_en_zl1_camera_data.c"
+#include "z_en_zl1_camera_data.inc.c"
 
 const ActorInit En_Zl1_InitVars = {
     ACTOR_EN_ZL1,
diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.c
rename to src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c
diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
index 3b925d3615..c5ff07adee 100644
--- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@@ -176,7 +176,7 @@ static AnimationInfo sAnimationInfo[] = {
     /* 33 */ /* transition to standing */ { &gChildZeldaAnim_000654, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
 };
 
-#include "z_en_zl4_cutscene_data.c"
+#include "z_en_zl4_cutscene_data.inc.c"
 
 void EnZl4_SetActiveCamDir(PlayState* play, s16 index) {
     Camera* activeCam = GET_ACTIVE_CAM(play);
diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c
similarity index 100%
rename from src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.c
rename to src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c