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

src/d/meter/d_meter2.cpp

@@ -15,9 +15,7 @@
 #include "d/meter/d_meter_HIO.h"
 #include "d/meter/d_meter_map.h"
 #include "dol2asm.h"
-#include "f_op/f_op_msg.h"
 #include "f_op/f_op_msg_mng.h"
-#include "m_Do/m_Do_audio.h"
 #include "rel/d/a/d_a_horse/d_a_horse.h"
 
 struct dMeterHakusha_c : public dMeterSub_c {

src/d/meter/d_meter2_draw.cpp

@@ -8,9 +8,7 @@
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "d/a/d_a_alink.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/d_kantera_icon_meter.h"
-#include "d/meter/d_meter2_info.h"
 #include "d/meter/d_meter_HIO.h"
 #include "d/msg/d_msg_object.h"
 #include "d/pane/d_pane_class.h"

src/d/meter/d_meter2_info.cpp

@@ -5,12 +5,8 @@
 
 #include "d/meter/d_meter2_info.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "d/a/d_a_player.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter2.h"
 #include "d/meter/d_meter_map.h"
-#include "d/msg/d_msg_object.h"
-#include "d/save/d_save.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
 #include "dolphin/types.h"

src/d/meter/d_meter_HIO.cpp

@@ -6,7 +6,6 @@
 #include "d/meter/d_meter_HIO.h"
 #include "d/save/d_save.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "global.h"
 
 //

src/d/meter/d_meter_button.cpp

@@ -5,7 +5,6 @@
 
 #include "d/meter/d_meter_button.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/meter/d_meter_haihai.cpp

@@ -5,7 +5,6 @@
 
 #include "d/meter/d_meter_haihai.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/meter/d_meter_hakusha.cpp

@@ -5,7 +5,6 @@
 
 #include "d/meter/d_meter_hakusha.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/meter/d_meter_map.cpp

@@ -5,9 +5,6 @@
 
 #include "d/meter/d_meter_map.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"
-#include "Z2AudioLib/Z2AudioMgr.h"
-#include "d/com/d_com_inf_game.h"
-#include "d/menu/d_menu_window.h"
 #include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"

src/d/meter/d_meter_string.cpp

@@ -5,7 +5,6 @@
 
 #include "d/meter/d_meter_string.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types: