d_a_obj_carry work, SETUP_ACTOR macro, header cleanup (#1885)

* d_a_obj_carry work, SETUP_ACTOR macro * rm headers, add script * progress * macro rename, consistent spacing
2026-06-05 18:57:14 -04:00 · 2023-08-16 13:07:52 -06:00
parent c372915a50
commit f9380b3e05
4558 changed files with 741 additions and 6064 deletions
@@ -2,8 +2,6 @@
 #define J2DANIMATION_H

 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
-#include "JSystem/JUtility/JUTNameTab.h"
-#include "dolphin/types.h"
 #include "global.h"

 typedef struct _GXColor GXColor;
@@ -2,7 +2,6 @@
 #define J2DANMLOADER_H

 #include "JSystem/J2DGraph/J2DAnimation.h"
-#include "dolphin/types.h"

 struct J2DAnmLoaderDataBase {
    /* 80308A6C */ static J2DAnmBase* load(void const*);
@@ -1,7 +1,6 @@
 #ifndef J2DGRAFCONTEXT_H
 #define J2DGRAFCONTEXT_H

-#include "JSystem/J2DGraph/J2DMatBlock.h"
 #include "JSystem/JGeometry.h"
 #include "JSystem/JUtility/TColor.h"
 #include "dolphin/mtx/mtx.h"
@@ -3,7 +3,6 @@

 #include "JSystem/J2DGraph/J2DTevs.h"
 #include "JSystem/JUtility/TColor.h"
-#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"

 class JUTFont;
@@ -3,7 +3,6 @@

 #include "JSystem/J2DGraph/J2DAnimation.h"
 #include "JSystem/J2DGraph/J2DMatBlock.h"
-#include "dolphin/types.h"

 class J2DMaterial {
 public:
@@ -3,7 +3,6 @@

 #include "JSystem/J2DGraph/J2DManage.h"
 #include "JSystem/J2DGraph/J2DMatBlock.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"

 struct J2DMaterialBlock {
@@ -2,7 +2,6 @@
 #define J2DORTHOGRAPH_H

 #include "JSystem/J2DGraph/J2DGrafContext.h"
-#include "dolphin/types.h"

 class J2DOrthoGraph : public J2DGrafContext {
 public:
@@ -5,7 +5,6 @@
 #include "JSystem/JSupport/JSUList.h"
 #include "dolphin/gx/GXEnum.h"
 #include "dolphin/mtx/mtx.h"
-#include "dolphin/types.h"

 class J2DAnmBase;
 class J2DAnmColor;
@@ -3,7 +3,6 @@

 #include "JSystem/J2DGraph/J2DPane.h"
 #include "JSystem/JUtility/TColor.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"

 class J2DMaterial;
@@ -3,7 +3,6 @@

 #include "JSystem/J2DGraph/J2DPicture.h"
 #include "JSystem/J2DGraph/J2DTevs.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"

 class J2DMaterial;
@@ -2,7 +2,6 @@
 #define J2DPRINT_H

 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/JUtility/TColor.h"
 #include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dolphin/types.h"

@@ -4,7 +4,6 @@
 #include "JSystem/J2DGraph/J2DManage.h"
 #include "JSystem/J2DGraph/J2DPane.h"
 #include "JSystem/JUtility/TColor.h"
-#include "dolphin/types.h"

 class J2DMaterial;
 class JUTNameTab;
@@ -3,7 +3,6 @@

 #include "dolphin/gx/GXEnum.h"
 #include "dolphin/mtx/mtxvec.h"
-#include "dolphin/types.h"

 struct J2DTextureSRTInfo {
    /* 0x00 */ f32 field_0x0;
@@ -3,7 +3,6 @@

 #include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DPane.h"
-#include "dolphin/types.h"

 class J2DMaterial;
 class JUTFont;
@@ -2,7 +2,6 @@
 #define J2DTEXTBOXEX_H

 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"

 class J2DMaterial;
@@ -3,7 +3,6 @@

 #include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DPane.h"
-#include "dolphin/types.h"

 class JSURandomInputStream;
 class JUTTexture;
@@ -1,9 +1,7 @@
 #ifndef J2DWINDOWEX_H
 #define J2DWINDOWEX_H

-#include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DWindow.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"

 class J2DWindowEx : public J2DWindow {
@@ -1,10 +1,8 @@
 #ifndef J3DANIMATION_H
 #define J3DANIMATION_H

-#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h"
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
 #include "JSystem/JUtility/JUTNameTab.h"
-#include "dolphin/types.h"
 #include "global.h"

 typedef struct _GXColor GXColor;
@@ -2,7 +2,6 @@
 #define J3DJOINT_H

 #include "JSystem/J3DGraphBase/J3DTransform.h"
-#include "dolphin/types.h"

 class J3DAnmTransform;
 class J3DJoint;
@@ -2,7 +2,6 @@
 #define J3DJOINTTREE_H

 #include "JSystem/J3DGraphAnimator/J3DJoint.h"
-#include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"

 class JUTNameTab;
@@ -2,7 +2,6 @@
 #define J3DMATERIALANM_H

 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
-#include "dolphin/types.h"

 typedef struct _GXColor GXColor;
 typedef struct _GXColorS10 GXColorS10;
@@ -1,11 +1,8 @@
 #ifndef J3DMODEL_H
 #define J3DMODEL_H

-#include "JSystem/J3DGraphAnimator/J3DModelData.h"
-#include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h"
 #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
 #include "JSystem/J3DGraphBase/J3DPacket.h"
-#include "JSystem/J3DGraphBase/J3DShape.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
 #include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"
@@ -6,7 +6,6 @@
 #include "JSystem/J3DGraphAnimator/J3DShapeTable.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
-#include "dolphin/types.h"

 typedef struct _GXColor GXColor;
 class JUTNameTab;
@@ -1,9 +1,7 @@
 #ifndef J3DMTXBUFFER_H
 #define J3DMTXBUFFER_H

-#include "JSystem/J3DGraphAnimator/J3DJointTree.h"
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
-#include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"

 class J3DModelData;
@@ -2,7 +2,6 @@
 #define J3DSHAPETABLE_H

 #include "JSystem/J3DGraphBase/J3DShape.h"
-#include "JSystem/J3DGraphBase/J3DVertex.h"
 #include "dolphin/types.h"

 class JUTNameTab;
@@ -2,9 +2,7 @@
 #define J3DSKINDEFORM_H

 #include "JSystem/J3DGraphAnimator/J3DCluster.h"
-#include "JSystem/J3DGraphAnimator/J3DModelData.h"
 #include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h"
-#include "JSystem/J3DGraphBase/J3DVertex.h"
 #include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "dolphin/types.h"

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

 #include "JSystem/J3DGraphBase/J3DSys.h"
-#include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"

 // matches debug
@@ -1,7 +1,6 @@
 #ifndef J3DGD_H
 #define J3DGD_H

-#include "dolphin/types.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/gd/GDBase.h"

@@ -4,8 +4,6 @@
 #include "JSystem/J3DGraphBase/J3DStruct.h"
 #include "JSystem/J3DGraphBase/J3DTevs.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
-#include "dolphin/gx/GXStruct.h"
-#include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_lib.h"

@@ -4,8 +4,6 @@
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DShape.h"
-#include "JSystem/J3DGraphBase/J3DStruct.h"
-#include "JSystem/J3DGraphBase/J3DTevs.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
 #include "dolphin/types.h"

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

 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "dolphin/gd/GDBase.h"
-#include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"

 class J3DMatPacket;
@@ -4,7 +4,6 @@
 #include "JSystem/J3DGraphBase/J3DShapeDraw.h"
 #include "JSystem/J3DGraphBase/J3DShapeMtx.h"
 #include "dolphin/gx/GX.h"
-#include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"

 class J3DCurrentMtxInfo {
@@ -2,7 +2,6 @@
 #define J3DSHAPEMTX_H

 #include "dolphin/mtx/mtxvec.h"
-#include "dolphin/types.h"

 class J3DTexMtx;
 class J3DTexGenBlock;
@@ -3,7 +3,6 @@

 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/gx/GXStruct.h"
-#include "dolphin/types.h"

 class J3DLightInfo {
 public:
@@ -2,7 +2,6 @@
 #define J3DSYS_H

 #include "dolphin/gx/GX.h"
-#include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"

 // Perhaps move to a new J3DEnum.h?
@@ -2,9 +2,7 @@
 #define J3DTEXTURE_H

 #include "JSystem/JUtility/JUTTexture.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/mtx/mtx.h"
-#include "dolphin/mtx/mtx44.h"
 #include "dolphin/types.h"

 class J3DTexture {
@@ -3,7 +3,6 @@

 #include "JSystem/JGeometry.h"
 #include "dolphin/mtx/mtxvec.h"
-#include "dolphin/types.h"

 struct J3DTransformInfo {
    /* 0x00 */ JGeometry::TVec3<f32> mScale;
@@ -2,7 +2,6 @@
 #define J3DVERTEX_H

 #include "dolphin/gx/GXAttr.h"
-#include "dolphin/gx/GXEnum.h"
 #include "dolphin/mtx/vec.h"
 #include "dolphin/types.h"

@@ -1,7 +1,6 @@
 #ifndef J3DCLUSTERLOADER_H
 #define J3DCLUSTERLOADER_H

-#include "dolphin/types.h"

 struct J3DClusterLoaderDataBase {
    /* 80334130 */ static void* load(void const*);
@@ -2,7 +2,6 @@
 #define J3DJOINTFACTORY_H

 #include "JSystem/J3DGraphBase/J3DTransform.h"
-#include "JSystem/JGeometry.h"
 #include "dolphin/types.h"

 struct J3DJoint;
@@ -3,7 +3,6 @@

 #include "dolphin/gx/GXAttr.h"
 #include "dolphin/mtx/vec.h"
-#include "dolphin/types.h"

 struct J3DShape;
 struct J3DShapeMtx;
@@ -1,7 +1,6 @@
 #ifndef J3DUCLIPPER_H
 #define J3DUCLIPPER_H

-#include "dolphin/mtx/vec.h"
 #include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"

@@ -1,6 +1,5 @@
 #ifndef J3DUDL_H
 #define J3DUDL_H

-#include "dolphin/types.h"

 #endif /* J3DUDL_H */
@@ -2,7 +2,6 @@
 #define JAIAUDIBLE_H

 #include "JSystem/JGeometry.h"
-#include "dolphin/types.h"

 struct JASSoundParams;

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

 #include "JSystem/JGeometry.h"
-#include "dolphin/types.h"

 struct JAIAudible;
 class JAISoundID;
@@ -2,7 +2,6 @@
 #define JAISE_H

 #include "JSystem/JAudio2/JAISeqDataMgr.h"
-#include "JSystem/JAudio2/JAISound.h"
 #include "JSystem/JAudio2/JASTrack.h"
 #include "JSystem/JSupport/JSUList.h"

@@ -2,10 +2,6 @@
 #define JAISEMGR_H

 #include "JSystem/JAudio2/JAISe.h"
-#include "JSystem/JAudio2/JAISeqDataMgr.h"
-#include "JSystem/JAudio2/JAISound.h"
-#include "JSystem/JAudio2/JAISoundParams.h"
-#include "JSystem/JAudio2/JASGadget.h"
 #include "JSystem/JAudio2/JASHeapCtrl.h"
 #include "JSystem/JSupport/JSUList.h"
 #include "global.h"
@@ -2,7 +2,6 @@
 #define JAISEQ_H

 #include "JSystem/JAudio2/JAISeqDataMgr.h"
-#include "JSystem/JAudio2/JAISound.h"
 #include "JSystem/JAudio2/JASHeapCtrl.h"
 #include "JSystem/JAudio2/JASTrack.h"
 #include "JSystem/JSupport/JSUList.h"
@@ -2,7 +2,6 @@
 #define JAISEQDATAMGR_H

 #include "JSystem/JAudio2/JAISound.h"
-#include "dolphin/types.h"

 struct JAISeqData {
    JAISeqData(void* param_0, u32 param_1) {
@@ -2,8 +2,6 @@
 #define JAISEQMGR_H

 #include "JSystem/JAudio2/JAISeqDataMgr.h"
-#include "JSystem/JAudio2/JAISound.h"
-#include "JSystem/JAudio2/JAISoundParams.h"
 #include "JSystem/JAudio2/JASGadget.h"
 #include "JSystem/JSupport/JSUList.h"

@@ -3,8 +3,6 @@

 #include "JSystem/JAudio2/JAISoundParams.h"
 #include "JSystem/JAudio2/JAIAudible.h"
-#include "JSystem/JGeometry.h"
-#include "dolphin/types.h"
 #include "global.h"

 class JAISoundID {
@@ -2,7 +2,6 @@
 #define JAISOUNDCHILD_H

 #include "JSystem/JAudio2/JAISoundParams.h"
-#include "dolphin/types.h"

 struct JASTrack;

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

 #include "JSystem/JAudio2/JAISound.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "dolphin/types.h"

 class JAISound;
 class JAISoundID;
@@ -1,7 +1,6 @@
 #ifndef JAISOUNDINFO_H
 #define JAISOUNDINFO_H

-#include "dolphin/types.h"
 #include "JSystem/JAudio2/JAISound.h"
 #include "JSystem/JAudio2/JASGadget.h"

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

 #include "JSystem/JAudio2/JASSoundParams.h"
-#include "dolphin/types.h"

 struct JAISoundParamsProperty {
    void init() {
@@ -2,6 +2,5 @@
 #define JAISTREAM_H

 #include "JSystem/JAudio2/JAISound.h"
-#include "JSystem/JSupport/JSUList.h"

 #endif /* JAISTREAM_H */
@@ -2,7 +2,6 @@
 #define JAISTREAMDATAMGR_H

 #include "JSystem/JAudio2/JAISound.h"
-#include "dolphin/types.h"

 struct JAIStreamDataMgr {
    virtual void getStreamFileEntry(JAISoundID) = 0;
@@ -1,7 +1,6 @@
 #ifndef JASAUDIORESETER_H
 #define JASAUDIORESETER_H

-#include "dolphin/types.h"
 #include "dolphin/os/OSInterrupt.h"

 struct JASCriticalSection {
@@ -1,7 +1,6 @@
 #ifndef JASBASICINST_H
 #define JASBASICINST_H

-#include "dolphin/types.h"
 #include "JSystem/JAudio2/JASOscillator.h"
 #include "JSystem/JAudio2/JASSoundParams.h"

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

 #include "dolphin/types.h"
-#include "MSL_C/MSL_Common/Src/limits"

 struct JASCalc {
    /* 8028F2E8 */ static void imixcopy(s16 const*, s16 const*, s16*, u32);
@@ -1,6 +1,5 @@
 #ifndef JASDSPCHANNEL_H
 #define JASDSPCHANNEL_H

-#include "dolphin/types.h"

 #endif /* JASDSPCHANNEL_H */
@@ -1,7 +1,6 @@
 #ifndef JASDRUMSET_H
 #define JASDRUMSET_H

-#include "dolphin/types.h"
 #include "JSystem/JAudio2/JASBasicInst.h"

 struct JKRHeap;
@@ -2,7 +2,6 @@
 #define JASHEAPCTRL_H

 #include "JSystem/JSupport/JSUList.h"
-#include "dolphin/os/OSInterrupt.h"
 #include "dolphin/os/OSMutex.h"

 class JASDisposer;
@@ -1,7 +1,6 @@
 #ifndef JASREPORT_H
 #define JASREPORT_H

-#include "dolphin/types.h"

 void JASReport(const char* message, ...);

@@ -1,6 +1,5 @@
 #ifndef JASSEQCTRL_H
 #define JASSEQCTRL_H

-#include "dolphin/types.h"

 #endif /* JASSEQCTRL_H */
@@ -2,7 +2,6 @@
 #define JASTASKTHREAD_H

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

 class JASTaskThread : public JKRThread {
 public:
@@ -1,6 +1,5 @@
 #ifndef JASTRACKPORT_H
 #define JASTRACKPORT_H

-#include "dolphin/types.h"

 #endif /* JASTRACKPORT_H */
@@ -1,6 +1,5 @@
 #ifndef JASWSPARSER_H
 #define JASWSPARSER_H

-#include "dolphin/types.h"

 #endif /* JASWSPARSER_H */
@@ -3,7 +3,6 @@

 #include "JSystem/JSupport/JSUList.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "dolphin/os/OSMutex.h"

 class JKRHeap;
@@ -1,6 +1,5 @@
 #ifndef JAUAUDIOMGR_H
 #define JAUAUDIOMGR_H

-#include "dolphin/types.h"

 #endif /* JAUAUDIOMGR_H */
@@ -2,7 +2,6 @@
 #define JAUBANKTABLE_H

 #include "JSystem/JSupport/JSUList.h"
-#include "dolphin/types.h"

 template <typename T>
 struct JASPtrTable {
@@ -1,6 +1,5 @@
 #ifndef JAUCLUSTERSOUND_H
 #define JAUCLUSTERSOUND_H

-#include "dolphin/types.h"

 #endif /* JAUCLUSTERSOUND_H */
@@ -1,6 +1,5 @@
 #ifndef JAUSEQDATABLOCKMGR_H
 #define JAUSEQDATABLOCKMGR_H

-#include "dolphin/types.h"

 #endif /* JAUSEQDATABLOCKMGR_H */
@@ -1,6 +1,5 @@
 #ifndef JAUSOUNDANIMATOR_H
 #define JAUSOUNDANIMATOR_H

-#include "dolphin/types.h"

 #endif /* JAUSOUNDANIMATOR_H */
@@ -2,7 +2,6 @@
 #define JAUSTREAMFILETABLE_H

 #include "JSystem/JAudio2/JAISound.h"
-#include "dolphin/types.h"

 struct BinaryStreamFileTable {
    /* 0x0 */ char mIdentifier[4];
@@ -1,7 +1,6 @@
 #ifndef DSPPROC_H
 #define DSPPROC_H

-#include "dolphin/types.h"
 #include "dolphin/dsp/dsp.h"

 void DsyncFrame2ch(u32 param_0, u32 param_1, u32 param_2);
@@ -1,6 +1,5 @@
 #ifndef DSPTASK_H
 #define DSPTASK_H

-#include "dolphin/types.h"

 #endif /* DSPTASK_H */
@@ -1,7 +1,6 @@
 #ifndef OSDSP_H
 #define OSDSP_H

-#include "dolphin/types.h"

 struct DSPTaskInfo;
 struct STRUCT_DSP_TASK;
@@ -1,7 +1,6 @@
 #ifndef OSDSP_TASK_H
 #define OSDSP_TASK_H

-#include "dolphin/types.h"
 #include "dolphin/os/OSInterrupt.h"

 struct DSPTaskInfo;
@@ -5,7 +5,6 @@
 #include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTFader.h"
 #include "JSystem/JUtility/JUTXfb.h"
-#include "JSystem/JUtility/TColor.h"
 #include "dolphin/os/OSAlarm.h"
 #include "dolphin/types.h"

@@ -1,7 +1,6 @@
 #ifndef SEARCH_H
 #define SEARCH_H

-#include "dolphin/types.h"
 #include "global.h"

 namespace JGadget {
@@ -1,6 +1,5 @@
 #ifndef STD_VECTOR_H
 #define STD_VECTOR_H

-#include "dolphin/types.h"

 #endif /* STD_VECTOR_H */
@@ -1,7 +1,6 @@
 #ifndef VECTOR_H
 #define VECTOR_H

-#include "dolphin/types.h"

 extern u8 data_804511E0;
 extern u8 lit_569[];
@@ -2,7 +2,6 @@
 #define JGEOMETRY_H

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

@@ -4,7 +4,6 @@
 #include "JSystem/JKernel/JKRAramHeap.h"
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRThread.h"
-#include "dolphin/types.h"

 class JKRHeap;
 class JKRAMCommand;
@@ -1,7 +1,6 @@
 #ifndef JKRARAMARCHIVE_H
 #define JKRARAMARCHIVE_H

-#include "JSystem/JKernel/JKRAramBlock.h"
 #include "JSystem/JKernel/JKRArchive.h"
 #include "dolphin/types.h"

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

 #include "JSystem/JSupport/JSUList.h"
-#include "dolphin/types.h"

 class JKRAramHeap;
 class JKRAramBlock {
@@ -4,7 +4,6 @@
 #include "JSystem/JKernel/JKRAramBlock.h"
 #include "JSystem/JKernel/JKRDisposer.h"
 #include "dolphin/os/OSMutex.h"
-#include "dolphin/types.h"

 class JKRAramHeap : public JKRDisposer {
 public:
@@ -5,7 +5,6 @@
 #include "dolphin/ar/arq.h"
 #include "dolphin/os/OSMessage.h"
 #include "dolphin/os/OSMutex.h"
-#include "dolphin/types.h"

 class JKRAramBlock;
 class JKRDecompCommand;
@@ -2,7 +2,6 @@
 #define JKRARAMSTREAM_H

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

 class JSUFileInputStream;

@@ -1,6 +1,5 @@
 #ifndef JKRARCHIVEPRI_H
 #define JKRARCHIVEPRI_H

-#include "dolphin/types.h"

 #endif /* JKRARCHIVEPRI_H */
@@ -1,6 +1,5 @@
 #ifndef JKRARCHIVEPUB_H
 #define JKRARCHIVEPUB_H

-#include "dolphin/types.h"

 #endif /* JKRARCHIVEPUB_H */
@@ -2,7 +2,6 @@
 #define JKRASSERTHEAP_H

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

 class JKRAssertHeap : public JKRHeap {
 protected:
@@ -2,7 +2,6 @@
 #define JKRCOMPARCHIVE_H

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

 class JKRAramBlock;
 class JKRDvdFile;
@@ -3,7 +3,6 @@

 #include "JSystem/JKernel/JKRCompression.h"
 #include "JSystem/JKernel/JKRThread.h"
-#include "dolphin/types.h"

 class JKRAMCommand;
 class JKRDecompCommand {
@@ -2,7 +2,6 @@
 #define JKRDISPOSER_H

 #include "JSystem/JSupport/JSUList.h"
-#include "dolphin/types.h"

 class JKRHeap;
 class JKRDisposer {
@@ -2,7 +2,6 @@
 #define JKRDVDARAMRIPPER_H

 #include "JSystem/JKernel/JKRDvdRipper.h"
-#include "JSystem/JSupport/JSUList.h"
 #include "dolphin/types.h"

 class JKRAramBlock;
@@ -2,7 +2,6 @@
 #define JKRDVDARCHIVE_H

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

 class JKRDvdFile;
 class JKRDvdArchive : public JKRArchive {
@@ -5,7 +5,6 @@
 #include "dolphin/dvd/dvd.h"
 #include "dolphin/os/OSMessage.h"
 #include "dolphin/os/OSMutex.h"
-#include "dolphin/types.h"

 struct OSThread;

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

 #include "JSystem/JKernel/JKRCompression.h"
 #include "JSystem/JSupport/JSUList.h"
-#include "dolphin/types.h"

 enum JKRExpandSwitch {
    EXPAND_SWITCH_UNKNOWN0 = 0,
--- a/Show More
+++ b/Show More