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

12 files changed, 0 insertions, 15 deletions

diff --git a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
index 7f179e151e..714de468dd 100644
--- a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
+++ b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
@@ -2,7 +2,6 @@
 #define J3DDRAWBUFFER_H
 
 #include "JSystem/J3DGraphBase/J3DSys.h"
-#include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"
 
 // matches debug
diff --git a/include/JSystem/J3DGraphBase/J3DGD.h b/include/JSystem/J3DGraphBase/J3DGD.h
index 87ab8b94a6..6047a41020 100644
--- a/include/JSystem/J3DGraphBase/J3DGD.h
+++ b/include/JSystem/J3DGraphBase/J3DGD.h
@@ -1,7 +1,6 @@
 #ifndef J3DGD_H
 #define J3DGD_H
 
-#include "dolphin/types.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/gd/GDBase.h"
 
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h
index b1cd53886e..4aafcb8de9 100644
--- a/include/JSystem/J3DGraphBase/J3DMatBlock.h
+++ b/include/JSystem/J3DGraphBase/J3DMatBlock.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"
 
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index 2dfc8decd1..1c5853f761 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.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"
 
diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h
index 06eaa771bd..00827b8969 100644
--- a/include/JSystem/J3DGraphBase/J3DPacket.h
+++ b/include/JSystem/J3DGraphBase/J3DPacket.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;
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 102fb430da..457724a868 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -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 {
diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
index 97010b8527..5f23e39db1 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
@@ -2,7 +2,6 @@
 #define J3DSHAPEMTX_H
 
 #include "dolphin/mtx/mtxvec.h"
-#include "dolphin/types.h"
 
 class J3DTexMtx;
 class J3DTexGenBlock;
diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h
index 236504cd4c..6657139811 100644
--- a/include/JSystem/J3DGraphBase/J3DStruct.h
+++ b/include/JSystem/J3DGraphBase/J3DStruct.h
@@ -3,7 +3,6 @@
 
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/gx/GXStruct.h"
-#include "dolphin/types.h"
 
 class J3DLightInfo {
 public:
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index 3d97babee0..7836813a03 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -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?
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 27e7349dee..bafaf098f1 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.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 {
diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h
index 884506ce42..327774c750 100644
--- a/include/JSystem/J3DGraphBase/J3DTransform.h
+++ b/include/JSystem/J3DGraphBase/J3DTransform.h
@@ -3,7 +3,6 @@
 
 #include "JSystem/JGeometry.h"
 #include "dolphin/mtx/mtxvec.h"
-#include "dolphin/types.h"
 
 struct J3DTransformInfo {
     /* 0x00 */ JGeometry::TVec3<f32> mScale;
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index 2803c7838a..9c43cfcfdc 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -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"