diff --git a/Makefile b/Makefile
index 3bdab7052f..8112c03c10 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ $(BUILD_DIR)/$(TARGET).elf: $(O_FILES) $(LD_SCRIPT)
 $(BUILD_DIR)/%.o: %.s
 	$(AS) $(ASFLAGS) -o $@ $<
 
-$(BUILD_DIR)/%.o: %.c $(H_FILES)
+$(BUILD_DIR)/%.o: %.c %.h $(H_FILES)
 	cpp $(CPPFLAGS) $< | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) - -o $@
 
 $(BUILD_DIR)/%.o: %.bin
diff --git a/src/code_11a50_len_7a0.c b/src/code_11a50_len_7a0.c
index 961b0b898f..85ae72db81 100644
--- a/src/code_11a50_len_7a0.c
+++ b/src/code_11a50_len_7a0.c
@@ -1,9 +1,4 @@
-#include "common.h"
-
-void set_curtain_scale_goal(f32 arg0);
-void set_curtain_fade_goal(f32 arg0);
-void intro_logos_set_fade_alpha(s16 new_alpha);
-void intro_logos_set_fade_color(s16 arg0);
+#include "code_11a50_len_7a0.h"
 
 #ifdef NON_MATCHING
 void begin_state_intro(void) {
diff --git a/src/code_11a50_len_7a0.h b/src/code_11a50_len_7a0.h
new file mode 100644
index 0000000000..77ffa27ad4
--- /dev/null
+++ b/src/code_11a50_len_7a0.h
@@ -0,0 +1,8 @@
+#ifndef _CODE_11A50_LEN_7A0_H_
+#define _CODE_11A50_LEN_7A0_H_
+
+#include "common.h"
+#include "code_ebd0_len_6a0.h"
+#include "code_6e40_len_500.h"
+
+#endif
diff --git a/src/code_6e40_len_500.c b/src/code_6e40_len_500.c
index 5aa122e62e..ce35674ad4 100644
--- a/src/code_6e40_len_500.c
+++ b/src/code_6e40_len_500.c
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "code_6e40_len_500.h"
 
 void initialize_curtains(void) {
     D_8009BAA0 = 0;
diff --git a/src/code_6e40_len_500.h b/src/code_6e40_len_500.h
new file mode 100644
index 0000000000..d75f341df9
--- /dev/null
+++ b/src/code_6e40_len_500.h
@@ -0,0 +1,15 @@
+#ifndef _CODE_6E40_LEN_500_H_
+#define _CODE_6E40_LEN_500_H_
+
+#include "common.h"
+
+void initialize_curtains(void);
+void update_curtains(void);
+// render_curtains
+void set_curtain_scale_goal(f32 arg0);
+void set_curtain_scale(f32 arg0);
+void set_curtain_draw_callback(s32 arg0);
+void set_curtain_fade_goal(f32 arg0);
+void set_curtain_fade(f32 arg0);
+
+#endif
diff --git a/src/code_ebd0_len_6a0.c b/src/code_ebd0_len_6a0.c
index 0d491e9182..e1f40e50e7 100644
--- a/src/code_ebd0_len_6a0.c
+++ b/src/code_ebd0_len_6a0.c
@@ -1,24 +1,24 @@
-#include "common.h"
+#include "code_ebd0_len_6a0.h"
 
-void intro_logos_set_fade_alpha(s16 new_alpha) {
+void intro_logos_set_fade_alpha(s16 alpha) {
     GameStatus* gameStatus = GAME_STATUS;
 
-    gameStatus->bootAlpha = new_alpha;
+    gameStatus->bootAlpha = alpha;
 }
 
-void intro_logos_set_fade_color(s16 arg0) {
+void intro_logos_set_fade_color(s16 color) {
     GameStatus* gameStatus = GAME_STATUS;
 
-    gameStatus->bootRed = arg0;
-    gameStatus->bootGreen = arg0;
-    gameStatus->bootBlue = arg0;
+    gameStatus->bootRed = color;
+    gameStatus->bootGreen = color;
+    gameStatus->bootBlue = color;
 }
 
-s16 intro_logos_fade_in(subtract_val) {
+s16 intro_logos_fade_in(s16 subtractAlpha) {
     GameStatus* gameStatus = GAME_STATUS;
 
     if (gameStatus->bootAlpha != 0) {
-        gameStatus->bootAlpha -= subtract_val;
+        gameStatus->bootAlpha -= subtractAlpha;
         if (gameStatus->bootAlpha << 16 < 0) {
             gameStatus->bootAlpha = 0;
         }
@@ -28,11 +28,11 @@ s16 intro_logos_fade_in(subtract_val) {
     return 0;
 }
 
-s16 intro_logos_fade_out(add_val) {
+s16 intro_logos_fade_out(s16 addAlpha) {
     GameStatus* gameStatus = GAME_STATUS;
 
     if (gameStatus->bootAlpha != 0xFF) {
-        gameStatus->bootAlpha += add_val;
+        gameStatus->bootAlpha += addAlpha;
         if ((gameStatus->bootAlpha > 0xFF)) {
             gameStatus->bootAlpha = 0xFF;
         }
diff --git a/src/code_ebd0_len_6a0.h b/src/code_ebd0_len_6a0.h
new file mode 100644
index 0000000000..cde379c7fc
--- /dev/null
+++ b/src/code_ebd0_len_6a0.h
@@ -0,0 +1,12 @@
+#ifndef _CODE_EBD0_LEN_6A0_H_
+#define _CODE_EBD0_LEN_6A0_H_
+
+#include "common.h"
+
+void intro_logos_set_fade_alpha(s16 alpha);
+void intro_logos_set_fade_color(s16 color);
+s16 intro_logos_fade_in(s16 subtractAlpha);
+s16 intro_logos_fade_out(s16 addAlpha);
+void intro_logos_update_fade(void);
+
+#endif