Merge branch 'master' into various3

include/f_op/f_op_actor.h

@@ -6,6 +6,7 @@
 #include "d/kankyo/d_kankyo.h"
 #include "dolphin/mtx/mtx.h"
 #include "f_pc/f_pc_leaf.h"
+#include "global.h"
 
 struct actor_method_class {
     /* 0x00 */ leafdraw_method_class base;

include/f_op/f_op_actor_mng.h

@@ -1,21 +1,17 @@
 #ifndef F_OP_ACTOR_MNG_H_
 #define F_OP_ACTOR_MNG_H_
 
-#include "JSystem/J3DGraphAnimator/J3DModelData.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "SSystem/SComponent/c_m3d_g_pla.h"
 #include "SSystem/SComponent/c_sxyz.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_iter.h"
-#include "f_pc/f_pc_executor.h"
-#include "f_pc/f_pc_fstcreate_req.h"
 #include "f_pc/f_pc_manager.h"
 #include "f_pc/f_pc_searcher.h"
-#include "f_pc/f_pc_stdcreate_req.h"
 
 class J3DModelData;  // placeholder
+class JKRHeap;
+class cM3dGPla;
 
 struct fopAcM_prmBase_class {
     /* 0x00 */ u32 field_0x00;

include/f_op/f_op_camera.h

@@ -1,7 +1,9 @@
 #ifndef F_F_OP_CAMERA_H_
 #define F_F_OP_CAMERA_H_
 
-#include "f_op/f_op_camera_mng.h"
+#include "f_op/f_op_view.h"
+
+class camera_class;
 
 struct camera_process_profile_definition {
     /* 0x00 */ view_process_profile_definition mBase;

include/f_op/f_op_camera_mng.h

@@ -4,11 +4,11 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "SSystem/SComponent/c_sxyz.h"
 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/types.h"
-#include "f_op/f_op_draw_tag.h"
-#include "f_op/f_op_view.h"
-#include "f_pc/f_pc_leaf.h"
 #include "d/d_camera.h"
+#include "dolphin/types.h"
+#include "f_op/f_op_view.h"
+
+typedef struct leafdraw_method_class leafdraw_method_class;
 
 class camera_process_class : public view_class {
 public:

include/f_op/f_op_draw_iter.h

@@ -1,7 +1,7 @@
 #ifndef F_F_OP_DRAW_ITER_H_
 #define F_F_OP_DRAW_ITER_H_
 
-#include "SSystem/SComponent/c_tag.h"
+typedef struct create_tag_class create_tag_class;
 
 static create_tag_class* fopDwIt_GetTag(void);
 create_tag_class* fopDwIt_Begin(void);

include/f_op/f_op_draw_tag.h

@@ -1,7 +1,9 @@
 #ifndef F_F_OP_DRAW_TAG
 #define F_F_OP_DRAW_TAG
 
-#include "SSystem/SComponent/c_tag.h"
+#include "SSystem/SComponent/c_tree.h"
+
+typedef struct create_tag_class create_tag_class;
 
 extern node_lists_tree_class g_fopDwTg_Queue;
 

include/f_op/f_op_kankyo.h

@@ -1,9 +1,9 @@
 #ifndef F_OP_F_OP_KANKYO_H
 #define F_OP_F_OP_KANKYO_H
 
+#include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
-#include "f_pc/f_pc_manager.h"
-#include "f_op/f_op_kankyo_mng.h"
+#include "f_pc/f_pc_leaf.h"
 
 class kankyo_class : public leafdraw_class {
 public:

include/f_op/f_op_msg.h

@@ -1,8 +1,10 @@
 #ifndef F_OP_F_OP_MSG_H
 #define F_OP_F_OP_MSG_H
 
+#include "SSystem/SComponent/c_xyz.h"
 #include "f_pc/f_pc_leaf.h"
-#include "f_op/f_op_actor.h"
+
+class fopAc_ac_c;
 
 class msg_class : public leafdraw_class {
 public:

include/f_op/f_op_msg_mng.h

@@ -1,7 +1,13 @@
 #ifndef F_F_OP_MSG_MNG_H_
 #define F_F_OP_MSG_MNG_H_
 
-#include "f_op/f_op_msg.h"
+#include "SSystem/SComponent/c_xyz.h"
+#include "f_pc/f_pc_leaf.h"
+
+class JKRExpHeap;
+class JKRHeap;
+class fopAc_ac_c;
+class msg_class;
 
 struct msg_process_profile_definition {
     /* 0x00 */ leaf_process_profile_definition mBase;

include/f_op/f_op_overlap_mng.h

@@ -1,9 +1,10 @@
 #ifndef F_F_OP_OVERLAP_MNG_H_
 #define F_F_OP_OVERLAP_MNG_H_
 
-#include "SSystem/SComponent/c_request.h"
 #include "f_pc/f_pc_leaf.h"
 
+struct request_base_class;
+
 class overlap_task_class : public leafdraw_class {
 public:
     /* 0xC0 */ leafdraw_method_class* field_0xc0;

include/f_op/f_op_overlap_req.h

@@ -2,9 +2,10 @@
 #define F_F_OP_OVERLAP_REQ_H_
 
 #include "SSystem/SComponent/c_phase.h"
-#include "SSystem/SComponent/c_request.h"
 #include "dolphin/types.h"
-#include "f_pc/f_pc_layer.h"
+
+typedef struct layer_class layer_class;
+struct request_base_class;
 
 class overlap_request_class {
 public:

include/f_op/f_op_scene.h

@@ -1,12 +1,9 @@
 #ifndef F_F_OP_SCENE_H_
 #define F_F_OP_SCENE_H_
 
-#include "SSystem/SComponent/c_phase.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_scene_tag.h"
-#include "f_pc/f_pc_base.h"
 #include "f_pc/f_pc_node.h"
-#include "m_Do/m_Do_dvd_thread.h"
 
 struct request_of_phase_process_class;
 class mDoDvdThd_command_c;

include/f_op/f_op_scene_iter.h

@@ -1,9 +1,6 @@
 #ifndef F_F_OP_SCENE_ITER_H_
 #define F_F_OP_SCENE_ITER_H_
 
-#include "dolphin/types.h"
-#include "f_pc/f_pc_base.h"
-
 typedef void* (*fop_ScnItFunc)(void* pProc, void* pUserData);
 void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pUserData);
 

include/f_op/f_op_scene_mng.h

@@ -2,7 +2,9 @@
 #define F_F_OP_SCENE_MNG_H_
 
 #include "f_pc/f_pc_manager.h"
-#include "f_op/f_op_scene_pause.h"
+#include "f_op/f_op_scene.h"
+
+typedef struct base_process_class base_process_class;
 
 scene_class* fopScnM_SearchByID(unsigned int id);
 int fopScnM_ChangeReq(scene_class*, s16, s16, u16);

include/f_op/f_op_scene_pause.h

@@ -1,8 +1,7 @@
 #ifndef F_F_OP_SCENE_PAUSE_H_
 #define F_F_OP_SCENE_PAUSE_H_
 
-#include "dolphin/types.h"
-#include "f_op/f_op_scene.h"
+class scene_class;
 
 int fopScnPause_Enable(scene_class* pScene);
 int fopScnPause_Disable(scene_class* pScene);

include/f_op/f_op_scene_req.h

@@ -3,9 +3,10 @@
 
 #include "SSystem/SComponent/c_phase.h"
 #include "dolphin/types.h"
-#include "f_op/f_op_scene_pause.h"
 #include "f_pc/f_pc_node_req.h"
 
+class scene_class;
+
 extern "C" {
 void fopScnRq_Handler__Fv(void);
 void fopScnRq_ReRequest(void);

include/f_op/f_op_scene_tag.h

@@ -1,8 +1,8 @@
 #ifndef F_F_OP_SCENE_TAG_H_
 #define F_F_OP_SCENE_TAG_H_
 
+#include "SSystem/SComponent/c_list.h"
 #include "dolphin/types.h"
-#include "f_pc/f_pc_node.h"
 
 class scene_tag_class {
     u8 _0[0x14];