diff --git a/assets/scenes/example/example_scene.h b/assets/scenes/example/example_scene.h
index 5f0297ff2..84159cc92 100644
--- a/assets/scenes/example/example_scene.h
+++ b/assets/scenes/example/example_scene.h
@@ -3,13 +3,13 @@
 
 #include "ultra64.h"
 #include "config.h"
-#include "z64scene.h"
-#include "z64cutscene.h"
-#include "z64room.h"
-#include "z64player.h"
-#include "z64camera.h"
-#include "z64object.h"
-#include "z64ocarina.h"
+#include "scene.h"
+#include "cutscene.h"
+#include "room.h"
+#include "player.h"
+#include "camera.h"
+#include "object.h"
+#include "ocarina.h"
 #include "sfx.h"
 #include "sequence.h"
 #include "animated_materials.h"
diff --git a/assets/scenes/example/example_scene_cs_0.c b/assets/scenes/example/example_scene_cs_0.c
index 9ddaf16d1..8c7b27969 100644
--- a/assets/scenes/example/example_scene_cs_0.c
+++ b/assets/scenes/example/example_scene_cs_0.c
@@ -1,6 +1,6 @@
 #include "example_scene.h"
-#include "z64cutscene.h"
-#include "z64cutscene_commands.h"
+#include "cutscene.h"
+#include "cutscene_commands.h"
 
 
 CutsceneData gExampleCS[] = {
diff --git a/assets/scenes/example/example_scene_main.c b/assets/scenes/example/example_scene_main.c
index 45d59d0e5..dd746cb0d 100644
--- a/assets/scenes/example/example_scene_main.c
+++ b/assets/scenes/example/example_scene_main.c
@@ -1,6 +1,6 @@
 #include "example_scene.h"
-#include "z64cutscene.h"
-#include "z64cutscene_commands.h"
+#include "cutscene.h"
+#include "cutscene_commands.h"
 
 
 /**
diff --git a/include/compression.h b/include/compression.h
index 69df4d035..935ddda6a 100644
--- a/include/compression.h
+++ b/include/compression.h
@@ -2,7 +2,7 @@
 #define COMPRESSION_H
 
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.h"
 #include "config.h"
 
 #if COMPRESS_YAZ
diff --git a/include/debug.h b/include/debug.h
index fab45e3c7..a0c56a0cc 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -8,6 +8,7 @@
 #include "debug/collision_view.h"
 #include "debug/menu.h"
 #include "debug/profiler.h"
+#include "z_math.h"
 
 #define DEBUG_PRINT_VAR(var) PRINTF("%s: %d\n", #var, var)
 
diff --git a/include/debug/print.h b/include/debug/print.h
index b6e67c690..954392419 100644
--- a/include/debug/print.h
+++ b/include/debug/print.h
@@ -5,7 +5,7 @@
 #include "ultra64.h"
 #include "libu64/gfxprint.h"
 #include "libu64/pad.h"
-#include "z64math.h"
+#include "math.h"
 #include "color.h"
 
 struct GraphicsContext;
diff --git a/include/debug_opening_state.h b/include/debug_opening_state.h
index 936bf1179..c1704f2ff 100644
--- a/include/debug_opening_state.h
+++ b/include/debug_opening_state.h
@@ -2,10 +2,10 @@
 #define DEBUG_OPENING_H
 
 #include "config.h"
-#include "z64game.h"
-#include "z64view.h"
-#include "z64skybox.h"
-#include "z64environment.h"
+#include "game.h"
+#include "view.h"
+#include "skybox.h"
+#include "environment.h"
 #include "color.h"
 
 #if IS_DEBUG_BOOT_ENABLED
diff --git a/include/helpers.h b/include/helpers.h
index 8f8797863..641c1d437 100644
--- a/include/helpers.h
+++ b/include/helpers.h
@@ -3,10 +3,10 @@
 
 #include "ultra64/ultratypes.h"
 #include "config.h"
-#include "z64game.h"
-#include "z64environment.h"
-#include "z64skybox.h"
-#include "z64view.h"
+#include "game.h"
+#include "environment.h"
+#include "skybox.h"
+#include "view.h"
 
 void Helpers_LoadDefinedScene(GameState* gameState);
 void Helpers_LoadTitleScreen(GameState* gameState);
diff --git a/include/widescreen.h b/include/widescreen.h
index ede0a107b..2c3ee58e6 100644
--- a/include/widescreen.h
+++ b/include/widescreen.h
@@ -2,7 +2,7 @@
 #define WIDESCREEN_H
 
 #include "ultra64/ultratypes.h"
-#include "z64save.h"
+#include "save.h"
 
 // This file provides macros to handle switching between 4:3 and 16:9 and fixing issues.
 // It is not meant to be something the users can edit.
diff --git a/src/code/animated_materials.c b/src/code/animated_materials.c
index f83d13573..186ff15fd 100644
--- a/src/code/animated_materials.c
+++ b/src/code/animated_materials.c
@@ -3,7 +3,7 @@
 #include "config.h"
 #include "gfx.h"
 #include "segmented_address.h"
-#include "z64play.h"
+#include "play_state.h"
 
 #if ENABLE_ANIMATED_MATERIALS
 
diff --git a/src/code/cutscene_camera.c b/src/code/cutscene_camera.c
index 751feee32..f57221e64 100644
--- a/src/code/cutscene_camera.c
+++ b/src/code/cutscene_camera.c
@@ -1,13 +1,13 @@
 #include "string.h"
-#include "z64olib.h"
+#include "olib.h"
 #include "config.h"
-#include "z64save.h"
+#include "save.h"
 #include "libc64/math64.h"
-#include "z64cutscene.h"
-#include "z64camera.h"
-#include "z64actor.h"
-#include "z64player.h"
-#include "z64play.h"
+#include "cutscene.h"
+#include "camera.h"
+#include "actor.h"
+#include "player.h"
+#include "play_state.h"
 
 #if ENABLE_CUTSCENE_IMPROVEMENTS
 
diff --git a/src/code/cutscene_manager.c b/src/code/cutscene_manager.c
index 07e5e1819..0fafd2b1a 100644
--- a/src/code/cutscene_manager.c
+++ b/src/code/cutscene_manager.c
@@ -4,18 +4,18 @@
  * Manages all cutscenes except for manual
  */
 
-#include "z64cutscene.h"
+#include "cutscene.h"
 
 #include "string.h"
 #include "attributes.h"
 
-#include "z64olib.h"
+#include "olib.h"
 #include "letterbox.h"
 #include "config.h"
-#include "z64camera.h"
-#include "z64save.h"
-#include "z64play.h"
-#include "z64player.h"
+#include "camera.h"
+#include "save.h"
+#include "play_state.h"
+#include "player.h"
 #include "sfx.h"
 #include "z_lib.h"
 #include "array_count.h"
diff --git a/src/code/helpers.c b/src/code/helpers.c
index 559c32348..5d49122b2 100644
--- a/src/code/helpers.c
+++ b/src/code/helpers.c
@@ -2,9 +2,9 @@
 #include "file_select_state.h"
 #include "title_setup_state.h"
 #include "map_select_state.h"
-#include "z64save.h"
-#include "z64scene.h"
-#include "z64play.h"
+#include "save.h"
+#include "scene.h"
+#include "play_state.h"
 #include "sequence.h"
 #include "z_lib.h"
 
diff --git a/src/code/occlusionplanes.c b/src/code/occlusionplanes.c
index 0c37d7c56..0922fa98e 100644
--- a/src/code/occlusionplanes.c
+++ b/src/code/occlusionplanes.c
@@ -3,8 +3,8 @@
 #include "occlusionplanes.h"
 #include "gfx.h"
 #include "sys_math3d.h"
-#include "z64play.h"
-#include "z64skin_matrix.h"
+#include "play_state.h"
+#include "skin_matrix.h"
 
 #if ENABLE_F3DEX3
 
diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c
index 6226af0a7..bf51bccae 100644
--- a/src/code/sys_ucode.c
+++ b/src/code/sys_ucode.c
@@ -3,7 +3,7 @@
 #include "sys_ucode.h"
 #include "segment_symbols.h"
 #include "occlusionplanes.h"
-#include "z64dma.h"
+#include "dma.h"
 
 #if !ENABLE_F3DEX3
 u64* sDefaultGSPUCodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart;
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index ca2edc63e..3219fadd2 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -72,7 +72,7 @@ s32 Camera_QRegInit(void);
  * runtime. If a small f32 is being stored as an s16, it is common to store that value 100 times larger than the
  * original value. This is then scaled back down during runtime with the CAM_DATA_SCALED macro.
  */
-#define CAM_DATA_SCALED(x) ((x) * 0.01f)
+#define CAM_DATA_SCALED(x) ((x)*0.01f)
 
 // Load the next value from camera read-only data stored in CameraModeValue
 #define GET_NEXT_RO_DATA(values) ((values++)->val)
@@ -3755,23 +3755,23 @@ s32 Camera_KeepOn4(Camera* camera) {
                     if (LINK_IS_ADULT) {
                         roData->yOffset = playerHeight * -0.1f * yNormal; // Height
                         roData->eyeDist = playerHeight * 0.7f * yNormal;  // Focal Point
-                        roData->pitchTarget = 35.0f;                          // Cam Rotation
-                        roData->yawTarget = 0.0f;                           // ???
+                        roData->pitchTarget = 35.0f;                      // Cam Rotation
+                        roData->yawTarget = 0.0f;                         // ???
                         // roData->unk_1C = 0x3540; Rotates cam on Y axis. Not in MM
                         break;
                     } else {
                         roData->yOffset = playerHeight * 0.06f * yNormal; // Height
                         roData->eyeDist = playerHeight * 0.51f * yNormal; // Focal Point
-                        roData->pitchTarget = 30.0f;                          // Cam Rotation
-                        roData->yawTarget = 0.0f;                           // ???
+                        roData->pitchTarget = 30.0f;                      // Cam Rotation
+                        roData->yawTarget = 0.0f;                         // ???
                         // roData->unk_1C = 0x3540; Rotates cam on Y axis. Not in MM
                         break;
                     }
                 } else {
                     roData->yOffset = playerHeight * 0.1f * yNormal; // Height
                     roData->eyeDist = playerHeight * 0.5f * yNormal; // Focal Point
-                    roData->pitchTarget = -20.0f;                        // Cam Rotation
-                    roData->yawTarget = 0.0f;                          // ???
+                    roData->pitchTarget = -20.0f;                    // Cam Rotation
+                    roData->yawTarget = 0.0f;                        // ???
                     roData->interfaceField = CAM_INTERFACE_FIELD(
                         CAM_LETTERBOX_MEDIUM, CAM_HUD_VISIBILITY_A_HEARTS_MAGIC_FORCE, KEEPON4_FLAG_6);
                     break;
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index e5369f094..8166f329b 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -1436,7 +1436,7 @@ void Environment_DrawSunAndMoon(PlayState* play) {
                          G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_PRIM_A | G_RM_XLU_SURF2),
         gsDPLoadTextureBlock(gMoonTex, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP,
                              G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),
-        gsSPVertex(gMoonDL_04039410_Vtx, 4, 0),
+        gsSPVertex(&gMoonVtx[0], 4, 0),
         gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
         gsSPEndDisplayList(),
     };
diff --git a/src/code/z_olib.c b/src/code/z_olib.c
index 94147b105..e83666014 100644
--- a/src/code/z_olib.c
+++ b/src/code/z_olib.c
@@ -2,7 +2,7 @@
 #include "libc64/math64.h"
 #include "olib.h"
 #include "z_lib.h"
-#include "z64olib.h"
+#include "olib.h"
 
 /**
  * Calculates the distances between `a` and `b`
diff --git a/src/code/z_view.c b/src/code/z_view.c
index f07ba348c..68ba51e18 100644
--- a/src/code/z_view.c
+++ b/src/code/z_view.c
@@ -10,7 +10,7 @@
 #include "regs.h"
 #include "sys_matrix.h"
 #include "terminal.h"
-#include "z64view.h"
+#include "view.h"
 #include "widescreen.h"
 #include "idle.h"
 #include "translation.h"
diff --git a/src/debug/collider_view.c b/src/debug/collider_view.c
index af3f327f2..1ab53adff 100644
--- a/src/debug/collider_view.c
+++ b/src/debug/collider_view.c
@@ -1,6 +1,6 @@
 #include "debug.h"
-#include "z64collision_check.h"
-#include "z64play.h"
+#include "collision_check.h"
+#include "play_state.h"
 
 #if ENABLE_HACKER_DEBUG
 
diff --git a/src/debug/collision_view.c b/src/debug/collision_view.c
index 0ac96e923..ca11ec7e3 100644
--- a/src/debug/collision_view.c
+++ b/src/debug/collision_view.c
@@ -1,7 +1,7 @@
 #include "debug.h"
 #include "fault.h"
-#include "z64camera.h"
-#include "z64play.h"
+#include "camera.h"
+#include "play_state.h"
 #include "gfx.h"
 #include "sys_matrix.h"
 
diff --git a/src/debug/menu.c b/src/debug/menu.c
index a84c61712..99c231305 100644
--- a/src/debug/menu.c
+++ b/src/debug/menu.c
@@ -1,7 +1,7 @@
 #include "debug.h"
 #include "controller.h"
-#include "z64save.h"
-#include "z64play.h"
+#include "save.h"
+#include "play_state.h"
 #include "occlusionplanes.h"
 #include "libc64/sprintf.h"
 #include "f3dex3.h"
diff --git a/src/debug/profiler.c b/src/debug/profiler.c
index 75aadb503..d85d46c55 100644
--- a/src/debug/profiler.c
+++ b/src/debug/profiler.c
@@ -1,5 +1,5 @@
 #include "debug/profiler.h"
-#include "z64thread.h"
+#include "thread.h"
 #include "libu64/gfxprint.h"
 #include "gfxalloc.h"
 #include "gfx.h"
diff --git a/src/debug/utility.c b/src/debug/utility.c
index 9b25ee5d1..8cc708ebb 100644
--- a/src/debug/utility.c
+++ b/src/debug/utility.c
@@ -1,7 +1,7 @@
 #include "debug.h"
 #include "config.h"
 #include "controller.h"
-#include "z64math.h"
+#include "math.h"
 #include "gfx.h"
 
 #if ENABLE_HACKER_DEBUG
diff --git a/src/libultra/io/pimgr.c b/src/libultra/io/pimgr.c
index c46b4419d..bbb98a3c3 100644
--- a/src/libultra/io/pimgr.c
+++ b/src/libultra/io/pimgr.c
@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "stack.h"
 #include "ultra64/internal.h"
-#include "z64thread.h"
+#include "thread.h"
 
 OSDevMgr __osPiDevMgr = { 0 };
 
diff --git a/src/libultra/io/vimgr.c b/src/libultra/io/vimgr.c
index 7423aa054..973cefd04 100644
--- a/src/libultra/io/vimgr.c
+++ b/src/libultra/io/vimgr.c
@@ -1,5 +1,5 @@
 #include "ultra64/internal.h"
-#include "z64thread.h"
+#include "thread.h"
 #include "array_count.h"
 #include "stack.h"
 #include "ultra64.h"
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index 6e2027c44..e8f22c795 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -50,6 +50,7 @@
 #include "play_state.h"
 #include "save.h"
 #include "skin_matrix.h"
+#include "z_debug.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_link_child/object_link_child.h"
diff --git a/src/overlays/gamestates/ovl_debug_opening/debug_opening.c b/src/overlays/gamestates/ovl_debug_opening/debug_opening.c
index fbd1b9d64..0a1e61fb0 100644
--- a/src/overlays/gamestates/ovl_debug_opening/debug_opening.c
+++ b/src/overlays/gamestates/ovl_debug_opening/debug_opening.c
@@ -15,7 +15,7 @@
 #include "regs.h"
 #include "controller.h"
 #include "gfxalloc.h"
-#include "z64save.h"
+#include "save.h"
 #include "sfx.h"
 #include "debug.h"
 #include "gfx.h"
diff --git a/src/overlays/gamestates/ovl_select/z_select.h b/src/overlays/gamestates/ovl_select/z_select.h
index 9462267a9..9f2f1349b 100644
--- a/src/overlays/gamestates/ovl_select/z_select.h
+++ b/src/overlays/gamestates/ovl_select/z_select.h
@@ -10,13 +10,13 @@
 #include "seqcmd.h"
 #include "sequence.h"
 #include "terminal.h"
-#include "z64save.h"
-#include "z64sram.h"
+#include "save.h"
+#include "sram.h"
 #include "map_select_state.h"
 
 #include "color.h"
-#include "z64scene.h"
-#include "z64play.h"
+#include "scene.h"
+#include "play_state.h"
 #include "sfx.h"
 
 #if PLATFORM_N64