variables.h cleaning: migrate libultra variables (#2503)

* variables.h cleaning: migrate libultra variables

* another increment_block_number

* fix bss

src/code/fault_gc.c

@@ -40,10 +40,10 @@
  * DPad-Up may be pressed to enable sending fault pages over osSyncPrintf as well as displaying them on-screen.
  * DPad-Down disables sending fault pages over osSyncPrintf.
  */
+
 #pragma increment_block_number "gc-eu:96 gc-eu-mq:96 gc-eu-mq-dbg:96 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96" \
                                "gc-us-mq:96 ique-cn:96"
 
-#include "global.h"
 #include "libc64/sleep.h"
 #include "libc64/sprintf.h"
 #include "alloca.h"
@@ -55,7 +55,7 @@
 #include "terminal.h"
 #include "z64thread.h"
 
-#include "macros.h"
+#include "global.h"
 
 void Fault_Init(void);
 void Fault_SetOsSyncPrintfEnabled(u32 enabled);