fix build issues

include/debug/profiler_inline.h

@@ -2,7 +2,8 @@
 #define PROFILER_INLINE_H
 
 #include "profiler.h"
-#include "../variables.h"
+#include "variables.h"
+#include "buffers.h"
 
 extern void Profiler_RecordEventWithTime(u8 type, OSTime time);
 extern void Profiler_RecordEvent(u8 type);

include/debug_opening_state.h

@@ -1,8 +1,11 @@
 #ifndef DEBUG_OPENING_H
 #define DEBUG_OPENING_H
 
-#include "global.h"
 #include "config.h"
+#include "z64game.h"
+#include "z64view.h"
+#include "z64skybox.h"
+#include "z64environment.h"
 
 #if IS_DEBUG_BOOT_ENABLED
 

include/functions.h

@@ -128,11 +128,6 @@ f32 absf(f32);
 
 void Regs_InitData(PlayState* play);
 
-#if ENABLE_F3DEX3
-void OcclusionPlane_Draw_Phase(PlayState* play, OcclusionPlanePhase phase);
-void OcclusionPlane_Draw_PostCamUpdate(PlayState* play);
-#endif
-
 #if ENABLE_PROFILER
 #include "debug/profiler_inline.h"
 #endif

include/helpers.h

@@ -1,9 +1,12 @@
 #ifndef HELPERS_H
 #define HELPERS_H
 
-#include "z64.h"
+#include "ultra64/ultratypes.h"
 #include "functions.h"
 #include "config.h"
+#include "z64game.h"
+#include "z64environment.h"
+#include "z64skybox.h"
 
 void Helpers_LoadDefinedScene(GameState* gameState);
 void Helpers_LoadTitleScreen(GameState* gameState);

include/map_select_state.h

@@ -6,6 +6,7 @@
 #include "z64view.h"
 
 struct MapSelectState;
+struct GfxPrint;
 
 typedef struct MapSelectEntry {
     /* 0x00 */ char* name;
@@ -45,10 +46,10 @@ void MapSelect_DrawLoadingScreen(MapSelectState* this);
 void MapSelect_LoadTitle(MapSelectState* this);
 void MapSelect_LoadDebugOpening(MapSelectState* this);
 void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex);
-void MapSelect_PrintMenu(MapSelectState* this, GfxPrint* printer);
-void MapSelect_PrintLoadingMessage(MapSelectState* this, GfxPrint* printer, u8 yPos);
-void MapSelect_PrintAgeSetting(MapSelectState* this, GfxPrint* printer, s32 age);
-void MapSelect_PrintSceneLayerSetting(MapSelectState* this, GfxPrint* printer);
-void MapSelect_PrintControls(MapSelectState* this, GfxPrint* printer);
+void MapSelect_PrintMenu(MapSelectState* this, struct GfxPrint* printer);
+void MapSelect_PrintLoadingMessage(MapSelectState* this, struct GfxPrint* printer, u8 yPos);
+void MapSelect_PrintAgeSetting(MapSelectState* this, struct GfxPrint* printer, s32 age);
+void MapSelect_PrintSceneLayerSetting(MapSelectState* this, struct GfxPrint* printer);
+void MapSelect_PrintControls(MapSelectState* this, struct GfxPrint* printer);
 
 #endif

include/occlusionplanes.h

@@ -3,6 +3,9 @@
 
 #include "ultra64/gbi.h"
 #include "ultra64/ultratypes.h"
+#include "config.h"
+
+struct PlayState;
 
 typedef enum F3DEX3OccMode {
     F3DEX3_OCC_MODE_AUTO,
@@ -25,4 +28,7 @@ typedef enum OcclusionPlaneStoredCmdType {
     OCCLUSION_PLANE_STORED_CMD_COUNT
 } OcclusionPlaneStoredCmdType;
 
+void OcclusionPlane_Draw_Phase(struct PlayState* play, OcclusionPlanePhase phase);
+void OcclusionPlane_Draw_PostCamUpdate(struct PlayState* play);
+
 #endif // OCCLUSIONPLANES_H

include/widescreen.h

@@ -1,6 +1,9 @@
 #ifndef WIDESCREEN_H
 #define WIDESCREEN_H
 
+#include "ultra64/ultratypes.h"
+#include "z64save.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.
 

src/code/PreRender.c

@@ -7,6 +7,7 @@
  */
 #include "global.h"
 #include "alloca.h"
+#include "sys_ucode.h"
 
 void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg) {
     this->widthSave = width;

src/code/game.c

@@ -15,7 +15,6 @@
 #include "padmgr.h"
 #include "regs.h"
 #include "rumble.h"
-#include "speed_meter.h"
 #include "terminal.h"
 #include "versions.h"
 #include "vi_mode.h"

src/code/graph.c

@@ -20,6 +20,7 @@
 #include "versions.h"
 #include "z64save.h"
 #include "z64play.h"
+#include "debug_opening_state.h"
 
 #include "macros.h"
 #include "global.h"

src/code/helpers.c

@@ -1,4 +1,7 @@
 #include "helpers.h"
+#include "file_select_state.h"
+#include "title_setup_state.h"
+#include "map_select_state.h"
 
 void Helpers_LoadDefinedScene(GameState* gameState) {
     if (gSaveContext.fileNum == 0xff) {

src/code/sched.c

@@ -72,6 +72,8 @@ vs32 sSchedDebugPrintfEnabled = false;
 #define SCHED_DEBUG_PRINTF(format, ...) (void)0
 #endif
 
+void SysUcode_LoadNewUcodeIfChanged();
+
 /**
  * Set the current framebuffer to the swapbuffer pointed to by the provided cfb
  */

src/code/sys_math3d_draw.c

@@ -2,6 +2,8 @@
 #include "z64play.h"
 #include "gfx.h"
 #include "sys_matrix.h"
+#include "libc64/math64.h"
+#include "z_lib.h"
 
 #if DEBUG_FEATURES
 void Math3D_VtxF2L(Vtx* r, Vec3f* v) {

src/code/sys_ucode.c

@@ -1,6 +1,9 @@
 #include "fault.h"
 #include "ultra64.h"
 #include "segment_symbols.h"
+#include "occlusionplanes.h"
+#include "z64dma.h"
+#include "macros.h"
 
 #if !ENABLE_F3DEX3
 u64* sDefaultGSPUCodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart;

src/code/z_actor.c

@@ -22,6 +22,7 @@
 #include "z64save.h"
 #include "z64skin_matrix.h"
 #include "config.h"
+#include "widescreen.h"
 
 #include "global.h"
 

src/code/z_fbdemo_circle.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "widescreen.h"
 
 typedef enum TransitionCircleDirection {
     /* 0 */ TRANS_CIRCLE_DIR_IN,

src/code/z_fbdemo_wipe1.c

@@ -1,6 +1,7 @@
 #include "gfx.h"
 #include "z64save.h"
 #include "z64transition_instances.h"
+#include "widescreen.h"
 
 typedef enum TransitionWipeDirection {
     /* 0 */ TRANS_WIPE_DIR_IN,

src/code/z_game_dlftbls.c

@@ -4,6 +4,7 @@
 #include "z64play.h"
 #include "title_setup_state.h"
 #include "file_select_state.h"
+#include "debug_opening_state.h"
 
 #include "global.h"
 

src/code/z_kanfont.c

@@ -5,6 +5,7 @@
 #include "z64dma.h"
 #include "z64font.h"
 #include "z64message.h"
+#include "widescreen.h"
 
 #include "macros.h"
 

src/code/z_lifemeter.c

@@ -7,6 +7,7 @@
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"
+#include "widescreen.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"