Merge branch 'master' into various3

5 files changed, 26 insertions, 20 deletions

diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h
index 087143a594..e705ccdfee 100644
--- a/include/d/meter/d_meter2.h
+++ b/include/d/meter/d_meter2.h
@@ -1,13 +1,17 @@
 #ifndef D_METER_D_METER2_H
 #define D_METER_D_METER2_H
 
-#include "JSystem/JKernel/JKRExpHeap.h"
-#include "d/com/d_com_inf_game.h"
-#include "d/meter/d_meter2_draw.h"
-#include "d/meter/d_meter_map.h"
+#include "d/d_drawlist.h"
 #include "f_op/f_op_msg.h"
 #include "dolphin/types.h"
 
+class CPaneMgr;
+class J2DAnmColor;
+class J2DAnmTextureSRTKey;
+class J2DAnmTransformKey;
+class JKRExpHeap;
+class JKRHeap;
+class dMeter2Draw_c;
 class dMeterMap_c;
 
 class dMeterSub_c : public dDlst_base_c {
diff --git a/include/d/meter/d_meter2_draw.h b/include/d/meter/d_meter2_draw.h
index 30676db42a..c1bc990ed5 100644
--- a/include/d/meter/d_meter2_draw.h
+++ b/include/d/meter/d_meter2_draw.h
@@ -1,14 +1,17 @@
 #ifndef D_METER_D_METER2_DRAW_H
 #define D_METER_D_METER2_DRAW_H
 
-#include "JSystem/J2DGraph/J2DAnimation.h"
-#include "JSystem/J2DGraph/J2DPicture.h"
-#include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JUtility/TColor.h"
 #include "d/d_drawlist.h"
-#include "d/pane/d_pane_class.h"
 #include "dolphin/types.h"
 
+class CPaneMgr;
+class CPaneMgrAlpha;
+class J2DAnmColorKey;
+class J2DAnmTransformKey;
+class JKRExpHeap;
+class JKRHeap;
+
 enum dMeter2Draw_actionFlag {
     /* 0x0 */ ACTION_FLG_DEFAULT,
     /* 0x2 */ ACTION_FLG_EMPHASIS = 2,
diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h
index e840817d0f..78ad8a4cc1 100644
--- a/include/d/meter/d_meter2_info.h
+++ b/include/d/meter/d_meter2_info.h
@@ -1,14 +1,12 @@
 #ifndef D_METER_D_METER2_INFO_H
 #define D_METER_D_METER2_INFO_H
 
-#include "JSystem/JUtility/JUTTexture.h"
-#include "d/d_resorce.h"
-#include "d/menu/d_menu_window.h"
-#include "d/meter/d_meter2.h"
-#include "d/msg/d_msg_class.h"
-#include "d/msg/d_msg_flow.h"
-#include "d/pane/d_pane_class.h"
-#include "f_op/f_op_actor.h"
+#include "SSystem/SComponent/c_xyz.h"
+
+class CPaneMgr;
+class J2DTextBox;
+class JMSMesgEntry_c;
+class JUTFont;
 
 struct dMenu_LetterData {
     u16 mSubject;
diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h
index d58a06ecf4..01b77684e7 100644
--- a/include/d/meter/d_meter_HIO.h
+++ b/include/d/meter/d_meter_HIO.h
@@ -1,12 +1,13 @@
 #ifndef D_METER_D_METER_HIO_H
 #define D_METER_D_METER_HIO_H
 
-#include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JUtility/TColor.h"
 #include "SSystem/SComponent/c_sxyz.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
-#include "m_Do/m_Do_ext.h"
+#include "global.h"
+
+class JKRArchive;
 
 class dMeter_menuHIO_c {
 public:
diff --git a/include/d/meter/d_meter_map.h b/include/d/meter/d_meter_map.h
index 33b0e506b1..dfdfea6e71 100644
--- a/include/d/meter/d_meter_map.h
+++ b/include/d/meter/d_meter_map.h
@@ -1,11 +1,11 @@
 #ifndef D_METER_D_METER_MAP_H
 #define D_METER_D_METER_MAP_H
 
-#include "JSystem/J2DGraph/J2DPicture.h"
-#include "JSystem/J2DGraph/J2DScreen.h"
 #include "d/map/d_map_path_dmap.h"
 #include "dolphin/types.h"
 
+class J2DPicture;
+
 // move renderingAmap_c + dMap_c later
 class renderingAmap_c : public renderingPlusDoorAndCursor_c {
 public: