Cleanup includes in header files (#2540)

* Cleanup includes in header files

* include libc headers without libc/ prefix

* fix

* fix2

* fix3

* fix4

* some bss lol

* bss

* fix

include/attributes.h

@@ -1,8 +1,6 @@
 #ifndef ATTRIBUTES_H
 #define ATTRIBUTES_H
 
-#include "versions.h"
-
 #if !defined(__GNUC__) && !defined(__attribute__)
 #define __attribute__(x)
 #endif

include/audio/soundfont_file.h

@@ -1,7 +1,7 @@
 #ifndef SOUNDFONT_FILE_H
 #define SOUNDFONT_FILE_H
 
-#include "libc/stdbool.h"
+#include "stdbool.h"
 #include "alignment.h"
 #include "attributes.h"
 #include "z64audio.h"

include/face_change.h

@@ -1,6 +1,8 @@
 #ifndef FACE_CHANGE_H
 #define FACE_CHANGE_H
 
+#include "ultra64.h"
+
 typedef struct FaceChange {
     /* 0x00 */ s16 face;
     /* 0x02 */ s16 timer;

include/gfx.h

@@ -3,6 +3,7 @@
 
 #include "ultra64.h"
 #include "ultra64/gbi.h"
+#include "alignment.h"
 #include "sched.h"
 #include "thga.h"
 #include "versions.h"

include/inflate.h

@@ -1,8 +1,8 @@
 #ifndef INFLATE_H
 #define INFLATE_H
 
-#include "libc/stddef.h"
-#include "libc/stdint.h"
+#include "stddef.h"
+#include "stdint.h"
 #include "ultra64.h"
 
 void gzip_decompress(uintptr_t romStart, u8* dst, size_t size);

include/is_debug.h

@@ -1,7 +1,7 @@
 #ifndef IS_DEBUG_H
 #define IS_DEBUG_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 #include "attributes.h"
 
 #if DEBUG_FEATURES

include/libc64/sprintf.h

@@ -1,8 +1,6 @@
 #ifndef LIBC64_SPRINTF_H
 #define LIBC64_SPRINTF_H
 
-#include "ultra64.h"
-
 #include "stdarg.h"
 
 int vsprintf(char* dst, const char* fmt, va_list args);

include/padmgr.h

@@ -4,7 +4,6 @@
 #include "ultra64.h"
 #include "libu64/pad.h"
 #include "irqmgr.h"
-#include "versions.h"
 
 typedef enum ControllerPakType {
     CONT_PAK_NONE,

include/romfile.h

@@ -1,7 +1,7 @@
 #ifndef ROMFILE_H
 #define ROMFILE_H
 
-#include "ultra64.h"
+#include "stdint.h"
 
 typedef struct RomFile {
     /* 0x00 */ uintptr_t vromStart;

include/sfx.h

@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "versions.h"
 #include "z64math.h"
-#include "libc/assert.h"
+#include "assert.h"
 
 #define MAX_CHANNELS_PER_BANK 3
 

include/tha.h

@@ -2,7 +2,6 @@
 #define THA_H
 
 #include "ultra64.h"
-#include "alignment.h"
 
 typedef struct TwoHeadArena {
     /* 0x00 */ size_t size;

include/ultra64.h

@@ -1,14 +1,14 @@
 #ifndef ULTRA64_H
 #define ULTRA64_H
 
-#include "libc/assert.h"
-#include "libc/math.h"
-#include "libc/stdarg.h"
-#include "libc/stdbool.h"
-#include "libc/stddef.h"
-#include "libc/stdint.h"
-#include "libc/stdlib.h"
-#include "libc/string.h"
+#include "assert.h"
+#include "math.h"
+#include "stdarg.h"
+#include "stdbool.h"
+#include "stddef.h"
+#include "stdint.h"
+#include "stdlib.h"
+#include "string.h"
 
 #include "ultra64/ultratypes.h"
 #include "unk.h"

include/yaz0.h

@@ -1,8 +1,8 @@
 #ifndef YAZ0_H
 #define YAZ0_H
 
-#include "libc/stddef.h"
-#include "libc/stdint.h"
+#include "stddef.h"
+#include "stdint.h"
 #include "ultra64.h"
 
 void Yaz0_Decompress(uintptr_t romStart, u8* dst, size_t size);

include/z64actor.h

@@ -2,7 +2,6 @@
 #define Z64ACTOR_H
 
 #include "color.h"
-#include "romfile.h"
 #include "z64actor_profile.h"
 #include "z64animation.h"
 #include "z64math.h"

include/z64curve.h

@@ -1,8 +1,7 @@
 #ifndef Z64_CURVE_H
 #define Z64_CURVE_H
 
-#include "ultra64/ultratypes.h"
-#include "z64math.h"
+#include "ultra64.h"
 
 struct PlayState;
 struct Actor;

include/z64game.h

@@ -5,7 +5,6 @@
 #include "ultra64/ultratypes.h"
 #include "libu64/pad.h"
 #include "gamealloc.h"
-#include "romfile.h"
 #include "tha.h"
 
 struct GraphicsContext;

include/z64light.h

@@ -4,7 +4,6 @@
 #include "ultra64.h"
 #include "ultra64/gbi.h"
 #include "z64math.h"
-#include "color.h"
 
 struct GraphicsContext;
 struct PlayState;

include/z64skybox.h

@@ -4,8 +4,8 @@
 #include "ultra64/ultratypes.h"
 #include "ultra64/gbi.h"
 
+#include "romfile.h"
 #include "z64math.h"
-#include "z64dma.h" // for RomFile
 
 struct GameState;
 struct GraphicsContext;

include/z64ss_sram.h

@@ -1,7 +1,7 @@
 #ifndef Z64SS_SRAM_H
 #define Z64SS_SRAM_H
 
-#include "libc/stddef.h"
+#include "stddef.h"
 #include "ultra64/ultratypes.h"
 
 void SsSram_Init(s32 addr, u8 handleType, u8 handleDomain, u8 handleLatency, u8 handlePageSize, u8 handleRelDuration,

include/z64transition.h

@@ -2,7 +2,7 @@
 #define Z64TRANSITION_H
 
 #include "ultra64/ultratypes.h"
-#include "ultra64/gbi.h" // for Gfx
+#include "ultra64/gbi.h"
 #include "transition_circle.h"
 #include "transition_fade.h"
 #include "transition_triforce.h"