delete variables.h

include/JSystem/JKernel/JKRAramHeap/JKRAramHeap.h

@@ -1,6 +1,7 @@
 #ifndef JKRARAMHEAP_H_
 #define JKRARAMHEAP_H_
 
+#include "JSystem/JKernel/JKRAramBlock/JKRAramBlock.h"
 #include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
 #include "dolphin/types.h"
 #include "global.h"

include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h

@@ -4,6 +4,7 @@
 #include "JSystem/JAudio2/JAISe/JAISe.h"
 #include "JSystem/JAudio2/JAISound/JAISound.h"
 #include "global.h"
+#include "mtx_vec.h"
 
 class Z2SoundObjBase;
 

include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h

@@ -6,6 +6,7 @@
 #include "Z2AudioLib/Z2Param/Z2Param.h"
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "global.h"
+#include "mtx_vec.h"
 
 struct Z2MultiSeObj {
     Z2MultiSeObj();

include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h

@@ -5,6 +5,7 @@
 #include "Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h"
 #include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
 #include "global.h"
+#include "mtx_vec.h"
 
 /* struct Z2SoundObjBase_vtable {
     void* field_0x0;

include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h

@@ -2,6 +2,7 @@
 #define Z2STATUSMGR_H_
 
 #include "global.h"
+#include "mtx_vec.h"
 
 struct Z2StatusMgr {
     Z2StatusMgr(void);

include/f/f_op/f_op_scene_iter.h

@@ -3,7 +3,7 @@
 
 #include "dolphin/types.h"
 
-typedef void* (*fop_ScnItFunc)(void*,void*);
+typedef void* (*fop_ScnItFunc)(void*, void*);
 
 void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pFunc2);
 

include/global.h

@@ -19,6 +19,9 @@
 #define FLOAT_LABEL(x) (*(f32*)&x)
 #define DOUBLE_LABEL(x) (*(f64*)&x)
 
+#define _SDA_BASE_(dummy) 0
+#define _SDA2_BASE_(dummy) 0
+
 struct JUTWarn {
     JUTWarn& operator<<(const char*) { return *this; }
     JUTWarn& operator<<(long) { return *this; }
@@ -30,7 +33,6 @@ struct JUTWarn {
 #include "ar/ARQ.h"
 #include "mwcc.h"
 #include "os/OS.h"
-#include "variables.h"
 
 // hack to make functions that return comparisons as int match
 extern int __cntlzw(unsigned int);

include/m_Do/m_Do_graphic/m_Do_graphic.h

@@ -3,6 +3,7 @@
 
 #include "JSystem/JUtility/JUTTexture.h"
 #include "global.h"
+#include "gx/GX.h"
 #include "mtx_vec.h"
 
 class view_class {};