diff --git a/src/world/area_isk/isk_04.c b/src/world/area_isk/isk_04.c
index dc553b1dae..362235e903 100644
--- a/src/world/area_isk/isk_04.c
+++ b/src/world/area_isk/isk_04.c
@@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_04", func_802403D4);
 
 INCLUDE_ASM(s32, "world/area_isk/isk_04", func_80240814);
 
-#include "world/common/AwaitPlayerNearNPC.c"
+#include "world/common/AwaitPlayerNearNPC.inc.c"
 
 INCLUDE_ASM(s32, "world/area_isk/isk_04", func_802408B4_97B630);
 
diff --git a/src/world/area_isk/isk_08.c b/src/world/area_isk/isk_08.c
index 8c9ab80e0e..a00e293d4c 100644
--- a/src/world/area_isk/isk_08.c
+++ b/src/world/area_isk/isk_08.c
@@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_isk/isk_08", func_80240394);
 
 INCLUDE_ASM(s32, "world/area_isk/isk_08", func_802407D4);
 
-#include "world/common/AwaitPlayerNearNPC.c"
+#include "world/common/AwaitPlayerNearNPC.inc.c"
 
 INCLUDE_ASM(s32, "world/area_isk/isk_08", func_80240874);
diff --git a/src/world/area_isk/isk_18.c b/src/world/area_isk/isk_18.c
index 5dfb964b02..3b11631b67 100644
--- a/src/world/area_isk/isk_18.c
+++ b/src/world/area_isk/isk_18.c
@@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_isk/isk_18", func_80240394_997F70);
 
 INCLUDE_ASM(s32, "world/area_isk/isk_18", func_802407D4_997F70);
 
-#include "world/common/AwaitPlayerNearNPC.c"
+#include "world/common/AwaitPlayerNearNPC.inc.c"
 
 INCLUDE_ASM(s32, "world/area_isk/isk_18", func_80240874_997F70);
diff --git a/src/world/area_kpa/kpa_01.c b/src/world/area_kpa/kpa_01.c
index b24bba69f8..40aba582c4 100644
--- a/src/world/area_kpa/kpa_01.c
+++ b/src/world/area_kpa/kpa_01.c
@@ -14,6 +14,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_01", func_802404F4);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_01", func_80240934);
 
-#include "world/common/AwaitPlayerNearNPC.c"
+#include "world/common/AwaitPlayerNearNPC.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_01", func_802409D4_A46F60);
diff --git a/src/world/area_kpa/kpa_03.c b/src/world/area_kpa/kpa_03.c
index 304233ec54..470a42d6fb 100644
--- a/src/world/area_kpa/kpa_03.c
+++ b/src/world/area_kpa/kpa_03.c
@@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_03", func_802404F4_A485C0);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_03", func_80240934_A485C0);
 
-#include "world/common/AwaitPlayerNearNPC.c"
+#include "world/common/AwaitPlayerNearNPC.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_03", func_802409D4_A485C0);
 
diff --git a/src/world/area_kpa/kpa_113.c b/src/world/area_kpa/kpa_113.c
index af60942984..11b87a9665 100644
--- a/src/world/area_kpa/kpa_113.c
+++ b/src/world/area_kpa/kpa_113.c
@@ -18,6 +18,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_113", func_80240544_A9CC30);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_113", func_80240984_A9CC30);
 
-#include "world/common/AwaitPlayerNearNPC.c"
+#include "world/common/AwaitPlayerNearNPC.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_113", func_80240A24_A9CC30);
diff --git a/src/world/area_kzn/kzn_03.c b/src/world/area_kzn/kzn_03.c
index d534884004..819f83beb4 100644
--- a/src/world/area_kzn/kzn_03.c
+++ b/src/world/area_kzn/kzn_03.c
@@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03", func_802406A4_C60D10);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_03", func_80240AE4_C60D10);
 
-#include "world/common/AwaitPlayerNearNPC.c"
+#include "world/common/AwaitPlayerNearNPC.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_03", func_80240B84_C60D10);
 
diff --git a/src/world/area_kzn/kzn_09.c b/src/world/area_kzn/kzn_09.c
index e99387c7ff..e97796e530 100644
--- a/src/world/area_kzn/kzn_09.c
+++ b/src/world/area_kzn/kzn_09.c
@@ -86,7 +86,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09", func_80242D58);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_09", func_80243198_C76CE0);
 
-#include "world/common/AwaitPlayerNearNPC.c"
+#include "world/common/AwaitPlayerNearNPC.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_09", func_80243238_C76CE0);
 
diff --git a/src/world/area_kzn/kzn_17.c b/src/world/area_kzn/kzn_17.c
index 1902349856..bb4de9e3c0 100644
--- a/src/world/area_kzn/kzn_17.c
+++ b/src/world/area_kzn/kzn_17.c
@@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17", func_80242048);
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_17", func_80242488_C85AB0);
 
-#include "world/common/AwaitPlayerNearNPC.c"
+#include "world/common/AwaitPlayerNearNPC.inc.c"
 
 INCLUDE_ASM(s32, "world/area_kzn/kzn_17", func_80242528_C85AB0);
 
diff --git a/src/world/area_sbk/sbk_00/sbk_00.c b/src/world/area_sbk/sbk_00/sbk_00.c
index 2163ccc91e..ca19debc30 100644
--- a/src/world/area_sbk/sbk_00/sbk_00.c
+++ b/src/world/area_sbk/sbk_00/sbk_00.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-#include "world/common/SpawnSunEffect.c"
+#include "world/common/SpawnSunEffect.inc.c"
diff --git a/src/world/area_sbk/sbk_00/sbk_00_2.c b/src/world/area_sbk/sbk_00/sbk_00_2.c
index efbbd5527f..53c04bf80c 100644
--- a/src/world/area_sbk/sbk_00/sbk_00_2.c
+++ b/src/world/area_sbk/sbk_00/sbk_00_2.c
@@ -1,6 +1,5 @@
 #include "common.h"
 
-//INCLUDE_ASM(s32, "world/area_sbk/sbk_00", func_80240040_929270);
 ApiStatus func_80240040_929270(ScriptInstance* script, s32 isInitialCall) {
     script->ownerActorID->unk_B5 = 3;
     return ApiStatus_DONE2;
diff --git a/src/world/area_tik/tik_12.c b/src/world/area_tik/tik_12.c
index 00546c5213..3ec6b4a396 100644
--- a/src/world/area_tik/tik_12.c
+++ b/src/world/area_tik/tik_12.c
@@ -74,6 +74,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12", func_80241CF4);
 
 INCLUDE_ASM(s32, "world/area_tik/tik_12", func_80242134);
 
-#include "world/common/AwaitPlayerNearNPC.c"
+#include "world/common/AwaitPlayerNearNPC.inc.c"
 
 INCLUDE_ASM(s32, "world/area_tik/tik_12", func_802421D4);
diff --git a/src/world/common/AwaitPlayerNearNPC.c b/src/world/common/AwaitPlayerNearNPC.inc.c
similarity index 100%
rename from src/world/common/AwaitPlayerNearNPC.c
rename to src/world/common/AwaitPlayerNearNPC.inc.c
diff --git a/src/world/common/SpawnSunEffect.c b/src/world/common/SpawnSunEffect.inc.c
similarity index 100%
rename from src/world/common/SpawnSunEffect.c
rename to src/world/common/SpawnSunEffect.inc.c