diff --git a/include/translation.h b/include/translation.h
index d88c0a5bbf..2de7e73592 100644
--- a/include/translation.h
+++ b/include/translation.h
@@ -2,10 +2,12 @@
 #define TRANSLATION_H
 
 /**
- * The T macro holds translations in English for original debug strings written in Japanese.
- * The translated strings match the original debug strings, they are only direct translations.
- * For example, any original name is left as is rather than being replaced with the name in the codebase.
+ * The "T" macro holds translations in English for original debug strings written in Japanese.
+ * The translated strings are only direct translations. Certain names or terms may not reflect
+ * their in-game localized counterparts.
+ * 
+ * To use translated English strings in the build, change the definition below from "jp" to "en".
  */
 #define T(jp, en) jp
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/boot/idle.c b/src/boot/idle.c
index eaae7e1b9c..28b42bd1eb 100644
--- a/src/boot/idle.c
+++ b/src/boot/idle.c
@@ -2,6 +2,7 @@
 #include "build.h"
 #include "idle.h"
 #include "main.h"
+#include "printf.h"
 #include "segment_symbols.h"
 #include "stack.h"
 #include "stackcheck.h"
diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c
index 5bb525aa3c..1340e850b4 100644
--- a/src/boot/viconfig.c
+++ b/src/boot/viconfig.c
@@ -1,3 +1,4 @@
+#include "printf.h"
 #include "terminal.h"
 #include "idle.h"
 
diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c
index fcf5443885..e2bc014546 100644
--- a/src/boot/z_locale.c
+++ b/src/boot/z_locale.c
@@ -3,6 +3,7 @@
 #include "carthandle.h"
 #include "line_numbers.h"
 #include "padmgr.h"
+#include "printf.h"
 #include "region.h"
 #include "terminal.h"
 #include "versions.h"
diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index db9559dcdc..3beb2f4b3a 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -32,6 +32,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "segment_symbols.h"
 #include "stack.h"
 #include "stackcheck.h"
diff --git a/src/code/PreRender.c b/src/code/PreRender.c
index 9dcb28f3a4..c6cf72c59c 100644
--- a/src/code/PreRender.c
+++ b/src/code/PreRender.c
@@ -10,6 +10,7 @@
 #include "color.h"
 #include "gfx.h"
 #include "prerender.h"
+#include "printf.h"
 #include "regs.h"
 
 #include "macros.h"
diff --git a/src/code/audio_thread_manager.c b/src/code/audio_thread_manager.c
index 8837601f8f..30bcacc011 100644
--- a/src/code/audio_thread_manager.c
+++ b/src/code/audio_thread_manager.c
@@ -6,6 +6,7 @@
  */
 
 #include "audiomgr.h"
+#include "printf.h"
 #include "regs.h"
 #include "speed_meter.h"
 #include "z64dma.h"
diff --git a/src/code/db_camera.c b/src/code/db_camera.c
index f316505872..7276008491 100644
--- a/src/code/db_camera.c
+++ b/src/code/db_camera.c
@@ -5,6 +5,7 @@
 #include "debug_arena.h"
 #include "letterbox.h"
 #include "mempak.h"
+#include "printf.h"
 #include "regs.h"
 #include "sfx.h"
 #include "z_lib.h"
diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c
index acfca47ca5..9aaef1b0bc 100644
--- a/src/code/debug_malloc.c
+++ b/src/code/debug_malloc.c
@@ -1,5 +1,6 @@
 #include "libc64/os_malloc.h"
 #include "debug_arena.h"
+#include "printf.h"
 
 #include "macros.h"
 
diff --git a/src/code/game.c b/src/code/game.c
index 933de55c18..0a4c6b81c4 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -15,6 +15,7 @@
 #include "n64dd.h"
 #endif
 #include "padmgr.h"
+#include "printf.h"
 #include "regs.h"
 #include "rumble.h"
 #include "speed_meter.h"
diff --git a/src/code/gamealloc.c b/src/code/gamealloc.c
index 47591fd00b..33ad848a17 100644
--- a/src/code/gamealloc.c
+++ b/src/code/gamealloc.c
@@ -1,6 +1,7 @@
 #include "libc64/malloc.h"
 #include "libu64/debug.h"
 #include "gamealloc.h"
+#include "printf.h"
 
 #include "macros.h"
 
diff --git a/src/code/graph.c b/src/code/graph.c
index e2a35cd5e8..9b80fbe982 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -12,6 +12,7 @@
 #include "map_select_state.h"
 #include "prenmi_buff.h"
 #include "prenmi_state.h"
+#include "printf.h"
 #include "regs.h"
 #include "setup_state.h"
 #include "speed_meter.h"
diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c
index d741612e28..57b6358e13 100644
--- a/src/code/irqmgr.c
+++ b/src/code/irqmgr.c
@@ -34,6 +34,7 @@
  */
 #include "libu64/debug.h"
 #include "irqmgr.h"
+#include "printf.h"
 #include "stackcheck.h"
 #include "terminal.h"
 #include "versions.h"
diff --git a/src/code/main.c b/src/code/main.c
index 8a1fc820a0..af9cdab0f2 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -26,6 +26,7 @@ extern struct IrqMgr gIrqMgr;
 #include "idle.h"
 #include "padmgr.h"
 #include "prenmi_buff.h"
+#include "printf.h"
 #include "regs.h"
 #include "segment_symbols.h"
 #include "segmented_address.h"
diff --git a/src/code/mempak.c b/src/code/mempak.c
index f316f0ea31..19c11b31d2 100644
--- a/src/code/mempak.c
+++ b/src/code/mempak.c
@@ -9,6 +9,7 @@
  */
 #include "mempak.h"
 #include "padmgr.h"
+#include "printf.h"
 
 #include "macros.h"
 
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index 9e6d1ae14a..e04edfefd3 100644
--- a/src/code/padmgr.c
+++ b/src/code/padmgr.c
@@ -32,6 +32,7 @@
 #include "libu64/padsetup.h"
 #include "macros.h"
 #include "padmgr.h"
+#include "printf.h"
 #include "fault.h"
 #include "terminal.h"
 #include "line_numbers.h"
diff --git a/src/code/shrink_window.c b/src/code/shrink_window.c
index e952a0c3fd..a485d81684 100644
--- a/src/code/shrink_window.c
+++ b/src/code/shrink_window.c
@@ -1,4 +1,5 @@
 #include "letterbox.h"
+#include "printf.h"
 #include "regs.h"
 
 #include "macros.h"
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c
index 4fa17abfdb..15336fa093 100644
--- a/src/code/sys_cfb.c
+++ b/src/code/sys_cfb.c
@@ -3,6 +3,7 @@
 #include "libu64/debug.h"
 #include "attributes.h"
 #include "line_numbers.h"
+#include "printf.h"
 #include "global.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
diff --git a/src/code/sys_freeze.c b/src/code/sys_freeze.c
index ea50a89491..427fca3895 100644
--- a/src/code/sys_freeze.c
+++ b/src/code/sys_freeze.c
@@ -1,5 +1,6 @@
 #include "libc64/sleep.h"
 #include "attributes.h"
+#include "printf.h"
 #include "sys_freeze.h"
 #include "terminal.h"
 
diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c
index 3ade95d822..39b4bc05e3 100644
--- a/src/code/sys_math3d.c
+++ b/src/code/sys_math3d.c
@@ -1,9 +1,12 @@
+#include "sys_math3d.h"
+
+#include "printf.h"
+#include "terminal.h"
 #include "ultra64.h"
 #include "z_lib.h"
 #include "z64math.h"
-#include "terminal.h"
+
 #include "macros.h"
-#include "sys_math3d.h"
 
 #pragma increment_block_number "gc-eu:77 gc-eu-mq:77 gc-jp:77 gc-jp-ce:77 gc-jp-mq:77 gc-us:77 gc-us-mq:77 ique-cn:67" \
                                "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c
index 081a292765..3dc86d25de 100644
--- a/src/code/sys_matrix.c
+++ b/src/code/sys_matrix.c
@@ -4,6 +4,7 @@
 #include "fault.h"
 #endif
 #include "macros.h"
+#include "printf.h"
 #include "sys_matrix.h"
 #include "ultra64.h"
 #include "z_lib.h"
diff --git a/src/code/title_setup.c b/src/code/title_setup.c
index cf736cf8ef..983db00327 100644
--- a/src/code/title_setup.c
+++ b/src/code/title_setup.c
@@ -1,6 +1,6 @@
 #include "console_logo_state.h"
 #include "setup_state.h"
-
+#include "printf.h"
 #include "z64save.h"
 
 #include "global.h"
diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c
index 0684dcd5dc..a5ca45a58f 100644
--- a/src/code/ucode_disas.c
+++ b/src/code/ucode_disas.c
@@ -2,6 +2,7 @@
 #include "ultra64.h"
 #include "ultra64/gs2dex.h"
 #include "libu64/mtxuty-cvt.h"
+#include "printf.h"
 #include "segmented_address.h"
 
 #include "macros.h"
diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c
index 501fed21a6..f5ff6a09e6 100644
--- a/src/code/z_DLF.c
+++ b/src/code/z_DLF.c
@@ -1,5 +1,6 @@
 #include "libc64/malloc.h"
 #include "libu64/overlay.h"
+#include "printf.h"
 #include "terminal.h"
 #include "ultra64.h"
 #include "z_game_dlftbls.h"
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 28a98ef319..bdd847a8c0 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -3,6 +3,7 @@
 #include "fault.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "printf.h"
 #include "quake.h"
 #include "rand.h"
 #include "regs.h"
diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c
index accce471cb..f489e614c3 100644
--- a/src/code/z_actor_dlftbls.c
+++ b/src/code/z_actor_dlftbls.c
@@ -1,4 +1,5 @@
 #include "fault.h"
+#include "printf.h"
 #include "segment_symbols.h"
 #include "z_actor_dlftbls.h"
 
diff --git a/src/code/z_bg_collect.c b/src/code/z_bg_collect.c
index c74adbc122..3351045091 100644
--- a/src/code/z_bg_collect.c
+++ b/src/code/z_bg_collect.c
@@ -1,3 +1,4 @@
+#include "printf.h"
 #include "terminal.h"
 #include "ultra64.h"
 #include "z64actor.h"
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index 469840de99..0bd4980ea3 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -1,6 +1,7 @@
 #include "libu64/debug.h"
 #include "attributes.h"
 #include "line_numbers.h"
+#include "printf.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "sys_math3d.h"
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 8e835e1fd7..6acf531f18 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -8,6 +8,7 @@
 #include "letterbox.h"
 #include "one_point_cutscene.h"
 #include "quake.h"
+#include "printf.h"
 #include "regs.h"
 #include "sfx.h"
 #include "sys_math3d.h"
diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c
index a80182eb74..2339cc7a50 100644
--- a/src/code/z_collision_btltbls.c
+++ b/src/code/z_collision_btltbls.c
@@ -1,3 +1,4 @@
+#include "printf.h"
 #include "z64collision_check.h"
 #include "macros.h"
 
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index 15eec283a0..a0915c03dd 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -1,5 +1,6 @@
 #include "gfx.h"
 #include "macros.h"
+#include "printf.h"
 #include "regs.h"
 #include "sfx.h"
 #include "sys_math3d.h"
diff --git a/src/code/z_construct.c b/src/code/z_construct.c
index 4696cb76e4..3bd490dc83 100644
--- a/src/code/z_construct.c
+++ b/src/code/z_construct.c
@@ -1,4 +1,5 @@
 #include "map.h"
+#include "printf.h"
 #include "regs.h"
 #include "segment_symbols.h"
 #include "versions.h"
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index dc95fd5752..98d5faa58e 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -10,6 +10,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "regs.h"
 #include "rumble.h"
 #include "quake.h"
diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c
index 7b40b261fe..0f3dc9f298 100644
--- a/src/code/z_eff_blure.c
+++ b/src/code/z_eff_blure.c
@@ -1,6 +1,7 @@
 #include "libc64/math64.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "printf.h"
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c
index e4e331964e..43d2a26e6c 100644
--- a/src/code/z_eff_shield_particle.c
+++ b/src/code/z_eff_shield_particle.c
@@ -1,6 +1,7 @@
 #include "libc64/qrand.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "printf.h"
 #include "terminal.h"
 #include "z64effect.h"
 #include "z64light.h"
diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c
index f14c8160fe..104e579211 100644
--- a/src/code/z_eff_spark.c
+++ b/src/code/z_eff_spark.c
@@ -1,6 +1,7 @@
 #include "libc64/qrand.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
+#include "printf.h"
 #include "sys_matrix.h"
 #include "z64effect.h"
 #include "z64play.h"
diff --git a/src/code/z_effect.c b/src/code/z_effect.c
index 02ba00a8dd..3a4ecb744c 100644
--- a/src/code/z_effect.c
+++ b/src/code/z_effect.c
@@ -1,4 +1,5 @@
 #include "gfx.h"
+#include "printf.h"
 #include "z64effect.h"
 #include "z64frame_advance.h"
 #include "z64play.h"
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index 2acddc4bf0..b4bba6ba7c 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -1,4 +1,5 @@
 #include "libu64/overlay.h"
+#include "printf.h"
 #include "sfx.h"
 #include "terminal.h"
 #include "zelda_arena.h"
diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c
index 46cfa0573b..482fa99d6d 100644
--- a/src/code/z_fbdemo.c
+++ b/src/code/z_fbdemo.c
@@ -15,6 +15,7 @@
 #include "libc64/sleep.h"
 #include "libu64/debug.h"
 #include "gfx.h"
+#include "printf.h"
 #include "z64math.h"
 #include "z64transition_instances.h"
 
diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c
index cbd9f6813b..28b60b4489 100644
--- a/src/code/z_fbdemo_fade.c
+++ b/src/code/z_fbdemo_fade.c
@@ -1,6 +1,7 @@
 #include "transition_fade.h"
 
 #include "main.h"
+#include "printf.h"
 #include "regs.h"
 #include "terminal.h"
 #include "z_lib.h"
diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c
index 93826fa366..c120290353 100644
--- a/src/code/z_fbdemo_triforce.c
+++ b/src/code/z_fbdemo_triforce.c
@@ -1,6 +1,7 @@
 #include "transition_triforce.h"
 
 #include "global.h"
+#include "printf.h"
 
 #include "assets/code/fbdemo_triforce/z_fbdemo_triforce.c"
 
diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c
index 3797449312..044c75dcf0 100644
--- a/src/code/z_fcurve_data_skelanime.c
+++ b/src/code/z_fcurve_data_skelanime.c
@@ -26,6 +26,7 @@
  */
 
 #include "gfx.h"
+#include "printf.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
diff --git a/src/code/z_horse.c b/src/code/z_horse.c
index 800f72c738..0994278314 100644
--- a/src/code/z_horse.c
+++ b/src/code/z_horse.c
@@ -1,5 +1,6 @@
 #include "terminal.h"
 #include "z_lib.h"
+#include "printf.h"
 #include "regs.h"
 #include "z64horse.h"
 #include "z64play.h"
diff --git a/src/code/z_inventory.c b/src/code/z_inventory.c
index bb4bb5f850..37b8a3f83b 100644
--- a/src/code/z_inventory.c
+++ b/src/code/z_inventory.c
@@ -1,4 +1,5 @@
 #include "ultra64.h"
+#include "printf.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c
index 81e2999462..60c6a6315c 100644
--- a/src/code/z_jpeg.c
+++ b/src/code/z_jpeg.c
@@ -2,6 +2,7 @@
 #include "ultra64.h"
 #include "attributes.h"
 #include "jpeg.h"
+#include "printf.h"
 #include "sys_ucode.h"
 #include "terminal.h"
 
diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c
index 9fa8f5ebc3..d4d231a63c 100644
--- a/src/code/z_kaleido_manager.c
+++ b/src/code/z_kaleido_manager.c
@@ -1,6 +1,7 @@
 #include "libu64/debug.h"
 #include "libu64/overlay.h"
 #include "kaleido_manager.h"
+#include "printf.h"
 #include "segment_symbols.h"
 #include "terminal.h"
 #include "z64play.h"
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c
index e6ff49f505..26fd2df1e3 100644
--- a/src/code/z_kaleido_scope_call.c
+++ b/src/code/z_kaleido_scope_call.c
@@ -4,6 +4,7 @@
 #include "libu64/debug.h"
 #include "kaleido_manager.h"
 #include "letterbox.h"
+#include "printf.h"
 #include "regs.h"
 #include "terminal.h"
 #include "z64play.h"
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index cc1621947d..3b88de28c3 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -3,6 +3,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "regs.h"
 #include "z64audio.h"
 #include "z64play.h"
diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c
index 21ba416b35..ff627d10bc 100644
--- a/src/code/z_kanfont.c
+++ b/src/code/z_kanfont.c
@@ -1,5 +1,6 @@
 #include "kanread.h"
 #include "message_data_static.h"
+#include "printf.h"
 #include "segment_symbols.h"
 #include "versions.h"
 #include "z64dma.h"
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index a4bb1295b8..d2de066546 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -8,6 +8,7 @@
 #include "gfx_setupdl.h"
 #include "gfxalloc.h"
 #include "ultra64.h"
+#include "printf.h"
 #include "regs.h"
 #include "rumble.h"
 #include "segment_symbols.h"
diff --git a/src/code/z_lib.c b/src/code/z_lib.c
index d5f59a2a86..741c982e06 100644
--- a/src/code/z_lib.c
+++ b/src/code/z_lib.c
@@ -1,6 +1,7 @@
 #include "ultra64.h"
 #include "z_lib.h"
 #include "ichain.h"
+#include "printf.h"
 #include "regs.h"
 #include "macros.h"
 #include "sys_math.h"
diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c
index eaa1408bf4..18c795ff88 100644
--- a/src/code/z_malloc.c
+++ b/src/code/z_malloc.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "libc64/os_malloc.h"
+#include "printf.h"
 
 #define LOG_SEVERITY_NOLOG 0
 #define LOG_SEVERITY_ERROR 2
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index bac9ed222e..24cf9ff6c6 100644
--- a/src/code/z_map_exp.c
+++ b/src/code/z_map_exp.c
@@ -5,6 +5,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "regs.h"
 #include "segment_symbols.h"
 #include "sfx.h"
diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c
index 600aa2189c..2cac08b69a 100644
--- a/src/code/z_map_mark.c
+++ b/src/code/z_map_mark.c
@@ -1,6 +1,7 @@
 #include "libu64/debug.h"
 #include "libu64/overlay.h"
 #include "map.h"
+#include "printf.h"
 #include "regs.h"
 #include "romfile.h"
 #include "segment_symbols.h"
diff --git a/src/code/z_message.c b/src/code/z_message.c
index f544ccefab..7f8531d1cc 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -9,6 +9,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "segment_symbols.h"
 #include "sequence.h"
 #include "regs.h"
diff --git a/src/code/z_moji.c b/src/code/z_moji.c
index 33abd83f7f..2114996cb5 100644
--- a/src/code/z_moji.c
+++ b/src/code/z_moji.c
@@ -5,6 +5,7 @@
 #include "gfx.h"
 
 #include "macros.h"
+#include "printf.h"
 #include "global.h"
 
 // how big to draw the characters on screen
diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c
index 6a4c896ac7..700353cb8e 100644
--- a/src/code/z_onepointdemo.c
+++ b/src/code/z_onepointdemo.c
@@ -1,6 +1,7 @@
 #include "libc64/math64.h"
 #include "libc64/qrand.h"
 #include "one_point_cutscene.h"
+#include "printf.h"
 #include "quake.h"
 #include "sfx.h"
 #include "terminal.h"
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 4dd6662d56..a73263c9a4 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -5,6 +5,7 @@
 #include "gfx_setupdl.h"
 #include "main.h"
 #include "map.h"
+#include "printf.h"
 #include "regs.h"
 #include "segment_symbols.h"
 #include "segmented_address.h"
diff --git a/src/code/z_play.c b/src/code/z_play.c
index e5c3c3c4ab..bd1764cacd 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -14,6 +14,7 @@
 #include "n64dd.h"
 #endif
 #include "one_point_cutscene.h"
+#include "printf.h"
 #include "quake.h"
 #include "regs.h"
 #include "rumble.h"
diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c
index f232fca10f..6d50f41066 100644
--- a/src/code/z_prenmi.c
+++ b/src/code/z_prenmi.c
@@ -1,6 +1,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "prenmi_state.h"
+#include "printf.h"
 #include "regs.h"
 #include "terminal.h"
 #include "versions.h"
diff --git a/src/code/z_quake.c b/src/code/z_quake.c
index 2e83a7c10e..690dbc81d6 100644
--- a/src/code/z_quake.c
+++ b/src/code/z_quake.c
@@ -1,5 +1,6 @@
 #include "libc64/qrand.h"
 #include "macros.h"
+#include "printf.h"
 #include "quake.h"
 #include "terminal.h"
 #include "z_lib.h"
diff --git a/src/code/z_room.c b/src/code/z_room.c
index a9daab2047..d4ba028e63 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -10,6 +10,7 @@
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "printf.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index 77206ce6f8..e00e3f42c3 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -1,3 +1,4 @@
+#include "printf.h"
 #include "regs.h"
 #include "romfile.h"
 #include "seqcmd.h"
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index be5f275647..35e2eaa2b6 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -1,5 +1,6 @@
 #include "libu64/debug.h"
 #include "gfx.h"
+#include "printf.h"
 #include "regs.h"
 #include "segmented_address.h"
 #include "segment_symbols.h"
diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c
index f83cb8295d..9460395b14 100644
--- a/src/code/z_skin_matrix.c
+++ b/src/code/z_skin_matrix.c
@@ -1,4 +1,5 @@
 #include "gfx.h"
+#include "printf.h"
 #include "terminal.h"
 #include "z_lib.h"
 #include "z64skin_matrix.h"
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index 2fb3124a7e..305620b55b 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -1,6 +1,7 @@
 #include "file_select_state.h"
 #include "controller.h"
 #include "memory_utils.h"
+#include "printf.h"
 #include "terminal.h"
 #include "versions.h"
 #include "z64audio.h"
diff --git a/src/code/z_ss_sram.c b/src/code/z_ss_sram.c
index 330f5ca4ac..809786245f 100644
--- a/src/code/z_ss_sram.c
+++ b/src/code/z_ss_sram.c
@@ -1,4 +1,5 @@
 #include "ultra64.h"
+#include "printf.h"
 #include "z64ss_sram.h"
 
 #include "macros.h"
diff --git a/src/code/z_view.c b/src/code/z_view.c
index dd4608cde3..986587f431 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -3,6 +3,7 @@
 #include "gfx.h"
 #include "letterbox.h"
 #include "main.h"
+#include "printf.h"
 #include "regs.h"
 #include "sys_matrix.h"
 #include "terminal.h"
diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c
index d1f472057e..e28e9c4ae2 100644
--- a/src/code/z_vimode.c
+++ b/src/code/z_vimode.c
@@ -4,6 +4,7 @@
 #include "ultra64/viint.h"
 #include "controller.h"
 #include "main.h"
+#include "printf.h"
 #include "regs.h"
 #include "versions.h"
 
diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c
index a8c9bb587d..ab39d3ca63 100644
--- a/src/code/z_vr_box.c
+++ b/src/code/z_vr_box.c
@@ -1,5 +1,6 @@
 #include "z64skybox.h"
 
+#include "printf.h"
 #include "segment_symbols.h"
 #include "terminal.h"
 #include "ultra64.h"
diff --git a/src/libc64/__osMalloc_gc.c b/src/libc64/__osMalloc_gc.c
index aa62d6b2c1..76940a8c09 100644
--- a/src/libc64/__osMalloc_gc.c
+++ b/src/libc64/__osMalloc_gc.c
@@ -1,6 +1,7 @@
 #include "libc64/os_malloc.h"
 #include "alignment.h"
 #include "fault.h"
+#include "printf.h"
 #include "terminal.h"
 
 #include "global.h"
diff --git a/src/libc64/malloc.c b/src/libc64/malloc.c
index f7a642ce9d..7e90589778 100644
--- a/src/libc64/malloc.c
+++ b/src/libc64/malloc.c
@@ -1,6 +1,7 @@
 #include "libc64/malloc.h"
 #include "ultra64.h"
 #include "macros.h"
+#include "printf.h"
 #include "libc64/os_malloc.h"
 
 #define LOG_SEVERITY_NOLOG 0
diff --git a/src/libu64/debug.c b/src/libu64/debug.c
index 5bd77baa87..5c611a8464 100644
--- a/src/libu64/debug.c
+++ b/src/libu64/debug.c
@@ -1,4 +1,5 @@
 #include "fault.h"
+#include "printf.h"
 #include "terminal.h"
 
 #include "global.h"
diff --git a/src/libu64/load_gc.c b/src/libu64/load_gc.c
index 6211d119b2..4fc88c30df 100644
--- a/src/libu64/load_gc.c
+++ b/src/libu64/load_gc.c
@@ -1,5 +1,6 @@
 #include "libu64/overlay.h"
 #include "ultra64.h"
+#include "printf.h"
 #include "z64dma.h"
 
 #include "macros.h"
diff --git a/src/libu64/loadfragment2_gc.c b/src/libu64/loadfragment2_gc.c
index 191b2ee076..e20fcefffa 100644
--- a/src/libu64/loadfragment2_gc.c
+++ b/src/libu64/loadfragment2_gc.c
@@ -1,5 +1,6 @@
 #include "libc64/malloc.h"
 #include "libu64/overlay.h"
+#include "printf.h"
 
 #include "macros.h"
 
diff --git a/src/libu64/relocation_gc.c b/src/libu64/relocation_gc.c
index 9307d67cc6..049c961fd1 100644
--- a/src/libu64/relocation_gc.c
+++ b/src/libu64/relocation_gc.c
@@ -8,6 +8,7 @@
  */
 #include "libu64/overlay.h"
 #include "attributes.h"
+#include "printf.h"
 #include "ultra64.h"
 
 #include "macros.h"
diff --git a/src/libu64/stackcheck.c b/src/libu64/stackcheck.c
index f98e828eae..c51b5b3824 100644
--- a/src/libu64/stackcheck.c
+++ b/src/libu64/stackcheck.c
@@ -1,5 +1,6 @@
 #include "libu64/debug.h"
 #include "attributes.h"
+#include "printf.h"
 #include "stackcheck.h"
 #include "terminal.h"