Remove #includes from headers (#334)

* add "global.h" to files that use it * add MSL_C includes to files that use them * remove dolphin includes from headers that don't need them * remove JSupport includes from headers that don't need them * remove JKernel includes from headers that don't need them * remove JUtility includes from headers that don't need them * remove J3D includes from headers that don't need them * remove J2D includes from headers that don't need them * remove JAudio2 includes from headers that don't need them * remove Z2AudioLib includes from headers that don't need them * remove JMessage includes from headers that don't need them * remove JParticle includes from headers that don't need them * remove SComponent includes from headers that don't need them * remove dol includes from headers that don't need them * sort includes
2026-07-11 15:28:38 -04:00 · 2023-05-12 12:10:14 -07:00
parent 8c7cda8589
commit 221f40e609
640 changed files with 1703 additions and 560 deletions
@@ -3,11 +3,11 @@

 #include "SSystem/SComponent/c_bg_s_chk.h"
 #include "SSystem/SComponent/c_m3d_g_aab.h"
-#include "SSystem/SComponent/c_m3d_g_pla.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"

 struct cBgD_Vtx_t;
+class cM3dGPla;

 typedef int (*cBgS_ShdwDraw_Callback)(class cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, cM3dGPla*);

@@ -1,16 +1,16 @@
 #ifndef C_CC_D_H
 #define C_CC_D_H

-#include "SSystem/SComponent/c_m3d.h"
 #include "SSystem/SComponent/c_m3d_g_aab.h"
 #include "SSystem/SComponent/c_m3d_g_cps.h"
 #include "SSystem/SComponent/c_m3d_g_cyl.h"
 #include "SSystem/SComponent/c_m3d_g_sph.h"
 #include "SSystem/SComponent/c_m3d_g_tri.h"
-#include "dolphin/gx/GX.h"
-#include "f_op/f_op_actor.h"
 #include "global.h"

+typedef struct _GXColor GXColor;
+class fopAc_ac_c;
+
 enum CcG_Tg_HitMark {
    CcG_Tg_UNK_MARK_6 = 6,
    CcG_Tg_UNK_MARK_8 = 8,
@@ -3,6 +3,7 @@

 #include "SSystem/SComponent/c_cc_d.h"
 #include "dolphin/types.h"
+#include "global.h"

 enum WeightType {
    WeightType_0 = 0,
@@ -1,9 +1,10 @@
 #ifndef C_LIST_H
 #define C_LIST_H

-#include "SSystem/SComponent/c_node.h"
 #include "dolphin/types.h"

+typedef struct node_class node_class;
+
 typedef struct node_list_class {
    node_class* mpHead;
    node_class* mpTail;
@@ -1,10 +1,11 @@
 #ifndef C_LIST_ITER_H
 #define C_LIST_ITER_H

-#include "SSystem/SComponent/c_list.h"
 #include "SSystem/SComponent/c_node_iter.h"
 #include "dolphin/types.h"

+typedef struct node_list_class node_list_class;
+
 int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData);
 void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserData);

@@ -3,6 +3,7 @@

 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
+#include "global.h"

 // Axis aligned bounding box
 class cM3dGAab {
@@ -5,6 +5,7 @@
 #include "SSystem/SComponent/c_m3d_g_lin.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
+#include "global.h"

 struct cM3dGCpsS {
    /* 0x00 */ Vec mStart;
@@ -4,6 +4,7 @@
 #include "SSystem/SComponent/c_m3d.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
+#include "global.h"

 // Cylinder
 struct cM3dGCylS {
@@ -2,9 +2,11 @@
 #define C_M3D_G_SPH_H_

 #include "SSystem/SComponent/c_m3d.h"
-#include "SSystem/SComponent/c_m3d_g_cyl.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
+#include "global.h"
+
+class cM3dGCyl;

 struct cM3dGSphS {
    /* 0x0 */ Vec mCenter;
@@ -2,11 +2,12 @@
 #define C_M3D_G_TRI_H_

 #include "SSystem/SComponent/c_m3d.h"
-#include "SSystem/SComponent/c_m3d_g_cyl.h"
 #include "SSystem/SComponent/c_m3d_g_pla.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"

+class cM3dGCyl;
+
 class cM3dGTri : public cM3dGPla {
    // private:
 public:
@@ -1,9 +1,10 @@
 #ifndef C_MALLOC_H
 #define C_MALLOC_H

-#include "JSystem/JKernel/JKRHeap.h"
 #include "dolphin/types.h"

+class JKRHeap;
+
 struct cMl {
    static JKRHeap* Heap;
    /* 80263220 */ static void init(JKRHeap*);
@@ -1,9 +1,10 @@
 #ifndef C_NODE_ITER_H
 #define C_NODE_ITER_H

-#include "SSystem/SComponent/c_node.h"
 #include "dolphin/types.h"

+typedef struct node_class node_class;
+
 typedef int (*cNdIt_MethodFunc)(node_class* pNode, void* pUserData);
 int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData);

@@ -2,7 +2,6 @@
 #define C_REQUEST_H

 #include "dolphin/types.h"
-#include "f_pc/f_pc_base.h"

 struct request_base_class {
    u8 field_0x0;
@@ -1,11 +1,12 @@
 #ifndef C_TAG_H
 #define C_TAG_H

-#include "SSystem/SComponent/c_list.h"
 #include "SSystem/SComponent/c_node.h"
-#include "SSystem/SComponent/c_tree.h"
 #include "dolphin/types.h"

+typedef struct node_list_class node_list_class;
+typedef struct node_lists_tree_class node_lists_tree_class;
+
 typedef struct create_tag_class {
    node_class mpNode;
    void* mpTagData;
@@ -2,9 +2,10 @@
 #define C_TAG_ITER_H

 #include "SSystem/SComponent/c_node_iter.h"
-#include "SSystem/SComponent/c_tag.h"
 #include "dolphin/types.h"

+typedef struct create_tag_class create_tag_class;
+
 typedef struct method_filter {
    cNdIt_MethodFunc mpMethodFunc;
    void* mpUserData;
@@ -1,10 +1,11 @@
 #ifndef C_TREE_H
 #define C_TREE_H

-#include "SSystem/SComponent/c_list.h"
-#include "SSystem/SComponent/c_node.h"
 #include "dolphin/types.h"

+typedef struct node_class node_class;
+typedef struct node_list_class node_list_class;
+
 typedef struct node_lists_tree_class {
    node_list_class* mpLists;
    int mNumLists;
@@ -2,9 +2,10 @@
 #define C_TREE_ITER_H

 #include "SSystem/SComponent/c_node_iter.h"
-#include "SSystem/SComponent/c_tree.h"
 #include "dolphin/types.h"

+typedef struct node_lists_tree_class node_lists_tree_class;
+
 int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pJudgeFunc, void* pUserData);
 void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudgeFunc, void* pUserData);

@@ -3,7 +3,6 @@

 #include "MSL_C/math.h"
 #include "dolphin/mtx/vec.h"
-#include "global.h"

 struct cXyz : Vec {
    static const cXyz Zero;