fix build issues

include/debug.h

@@ -28,4 +28,6 @@ typedef struct Debug {
 void Debug_DrawColorRectangle(Vec2s rectLeft, Vec2s rectRight, Color_RGBA8 rgba);
 void Debug_ConfigureNewRectangle(Input* controller);
 
+extern Debug gDebug;
+
 #endif

include/debug/profiler.h

@@ -1,6 +1,10 @@
 #ifndef PROFILER_H
 #define PROFILER_H
 
+#include "config.h"
+#include "ultra64/ultratypes.h"
+#include "ultra64/time.h"
+
 #define PROFILER_EVENT_COUNT 384
 
 // These can't be an enum because they're used by asm.

include/gfx.h

@@ -111,12 +111,12 @@ void Graph_CloseDisps(Gfx** dispRefs, GraphicsContext* gfxCtx, const char* file,
 
 #else
 
-#define OPEN_DISPS(gfxCtx, file, line)      \
+#define OPEN_DISPS(gfxCtx, ...)      \
     {                                       \
         GraphicsContext* __gfxCtx = gfxCtx; \
         s32 __dispPad
 
-#define CLOSE_DISPS(gfxCtx, file, line) \
+#define CLOSE_DISPS(gfxCtx, ...) \
         do {} while (0);                \
     }                                   \
     (void)0

include/macros.h

@@ -28,6 +28,7 @@
 #define VIRTUAL_TO_PHYSICAL(addr) (uintptr_t)((u8*)(addr) - 0x80000000)
 
 #define ABS(x) ((x) >= 0 ? (x) : -(x))
+#define ABS_ALT(x) ((x) < 0 ? -(x) : (x))
 #define DECR(x) ((x) == 0 ? 0 : --(x))
 #define CLAMP(x, min, max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x))
 #define CLAMP_MAX(x, max) ((x) > (max) ? (max) : (x))

include/variables.h

@@ -8,8 +8,6 @@
 
 #if ENABLE_HACKER_DEBUG
 #include "debug.h"
-
-extern Debug gDebug;
 #endif
 
 struct MapData;

src/audio/general.c

@@ -6,11 +6,10 @@
 #include "seqcmd.h"
 #include "sequence.h"
 #include "versions.h"
+#include "macros.h"
 
 #include "global.h"
 
-#define ABS_ALT(x) ((x) < 0 ? -(x) : (x))
-
 #if !PLATFORM_N64
 #define AUDIO_PRINTF osSyncPrintf
 #elif IDO_PRINTF_WORKAROUND

src/code/PreRender.c

@@ -12,6 +12,7 @@
 #include "gfx.h"
 #include "prerender.h"
 #include "regs.h"
+#include "gfxalloc.h"
 
 #include "macros.h"
 #include "global.h"

src/code/animated_materials.c

@@ -3,6 +3,9 @@
 #include "z64.h"
 #include "helpers.h"
 #include "config.h"
+#include "gfx.h"
+#include "segmented_address.h"
+#include "macros.h"
 
 #if ENABLE_ANIMATED_MATERIALS
 

src/code/audio_thread_manager.c

@@ -7,7 +7,6 @@
 
 #include "audiomgr.h"
 #include "regs.h"
-#include "speed_meter.h"
 #include "z64dma.h"
 
 #include "macros.h"

src/code/cutscene_camera.c

@@ -2,6 +2,8 @@
 #include "string.h"
 #include "z64olib.h"
 #include "config.h"
+#include "z64save.h"
+#include "libc64/math64.h"
 
 #if ENABLE_CUTSCENE_IMPROVEMENTS
 

src/code/cutscene_manager.c

@@ -14,6 +14,8 @@
 #include "letterbox.h"
 #include "config.h"
 #include "z64camera.h"
+#include "z64save.h"
+#include "z_lib.h"
 
 #if ENABLE_CUTSCENE_IMPROVEMENTS
 

src/code/graph.c

@@ -14,7 +14,6 @@
 #include "prenmi_state.h"
 #include "regs.h"
 #include "setup_state.h"
-#include "speed_meter.h"
 #include "sys_debug_controller.h"
 #include "sys_ucode.h"
 #include "terminal.h"

src/code/helpers.c

@@ -2,6 +2,8 @@
 #include "file_select_state.h"
 #include "title_setup_state.h"
 #include "map_select_state.h"
+#include "z64save.h"
+#include "z_lib.h"
 
 void Helpers_LoadDefinedScene(GameState* gameState) {
     if (gSaveContext.fileNum == 0xff) {

src/code/main.c

@@ -30,6 +30,7 @@ extern struct IrqMgr gIrqMgr;
 #endif
 #include "z64debug.h"
 #include "z64thread.h"
+#include "rainbow.h"
 
 #include "global.h"
 

src/code/occlusionplanes.c

@@ -1,6 +1,9 @@
 #include "z64.h"
 #include "functions.h"
 #include "variables.h"
+#include "occlusionplanes.h"
+#include "gfx.h"
+#include "sys_math3d.h"
 
 #if ENABLE_F3DEX3
 

src/code/sched.c

@@ -45,7 +45,6 @@
 #include "main.h"
 #include "regs.h"
 #include "sched.h"
-#include "speed_meter.h"
 #include "versions.h"
 #include "z64thread.h"
 

src/code/z_play.c

@@ -38,6 +38,8 @@
 #include "z64player.h"
 #include "z64save.h"
 #include "z64vis.h"
+#include "occlusionplanes.h"
+#include "libu64/gfxprint.h"
 
 #if CAN_INCLUDE_EXAMPLE_SCENE
 #include "assets/scenes/example/example_scene.h"

src/code/z_vr_box_draw.c

@@ -2,6 +2,7 @@
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
 #include "z64skybox.h"
+#include "z64light.h"
 
 Mtx* sSkyboxDrawMatrix;
 

src/debug/menu.c

@@ -1,5 +1,9 @@
 #include "global.h"
 #include "debug.h"
+#include "controller.h"
+#include "z64save.h"
+#include "occlusionplanes.h"
+#include "libc64/sprintf.h"
 
 #if ENABLE_HACKER_DEBUG
 

src/debug/print.c

@@ -1,6 +1,9 @@
 #include "config.h"
 #include "global.h"
 #include "debug.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfxalloc.h"
 
 #if ENABLE_HACKER_DEBUG