diff --git a/include/d/actor/d_a_obj_warpt.h b/include/d/actor/d_a_obj_warpt.h
index fc0fbf687..161ea945e 100644
--- a/include/d/actor/d_a_obj_warpt.h
+++ b/include/d/actor/d_a_obj_warpt.h
@@ -5,7 +5,6 @@
 #include "d/d_particle.h"
 #include "d/d_cc_d.h"
 #include "d/d_bg_s_acch.h"
-#include "d/d_com_inf_game.h"
 
 class dBgW;
 
diff --git a/include/d/actor/d_a_sie_flag.h b/include/d/actor/d_a_sie_flag.h
index 2ed25e152..a6365f621 100644
--- a/include/d/actor/d_a_sie_flag.h
+++ b/include/d/actor/d_a_sie_flag.h
@@ -38,7 +38,7 @@ public:
 
 public:
     /* 0x00 */ //vtable
-    /* 0x04 */ s8 m04;
+    /* 0x04 */ s8 mNo;
     /* 0x08 */ f32 m08;
     /* 0x0C */ s16 m0c;
 };
diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp
index 7a3f87bc8..2a52ba64d 100644
--- a/src/d/actor/d_a_dr2.cpp
+++ b/src/d/actor/d_a_dr2.cpp
@@ -25,7 +25,7 @@ public:
     void genMessage(JORMContext* ctx);
 
 public:
-    /* 0x04 */ s8 m04;
+    /* 0x04 */ s8 mNo;
     /* 0x08 */ f32 m08;
 }; // size = 0xC
 
@@ -36,7 +36,7 @@ static f32 hsz[] = { -7.0f, 7.0f, 12.0f, 7.0f, -7.0f, -12.0f };
 
 /* 000000EC-00000110       .text __ct__11daDr2_HIO_cFv */
 daDr2_HIO_c::daDr2_HIO_c()  {
-    m04 = -1;
+    mNo = -1;
     m08 = 1.0f;
 }
 
@@ -635,7 +635,7 @@ static BOOL daDr2_IsDelete(dr2_class*) {
 /* 00001B98-00001C58       .text daDr2_Delete__FP9dr2_class */
 static BOOL daDr2_Delete(dr2_class* i_this) {
     dComIfG_resDeleteDemo(&i_this->mPhase, "Dr2");
-    mDoHIO_deleteChild(l_HIO.m04);
+    mDoHIO_deleteChild(l_HIO.mNo);
     i_this->unk_4D8.remove();
     i_this->unk_4EC.remove();
 #if VERSION > VERSION_DEMO
@@ -796,7 +796,7 @@ static cPhs_State daDr2_Create(fopAc_ac_c* a_this) {
             return cPhs_ERROR_e;
         }
 
-        l_HIO.m04 = mDoHIO_createChild("ドラゴンシッポ", &l_HIO);
+        l_HIO.mNo = mDoHIO_createChild("ドラゴンシッポ", &l_HIO);
         fopAcM_prm_class* params = fopAcM_CreateAppend();
         params->base.parameters = 0x511;
         params->room_no = a_this->current.roomNo;
diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp
index 29b0738fa..ff13429b9 100644
--- a/src/d/actor/d_a_ki.cpp
+++ b/src/d/actor/d_a_ki.cpp
@@ -58,7 +58,7 @@ public:
 
     void genMessage(JORMContext*);
 
-    /* 0x04 */ s8 m04;
+    /* 0x04 */ s8 mNo;
     /* 0x05 */ u8 m05;
     /* 0x06 */ u8 m06;
     /* 0x07 */ u8 m07;
@@ -1188,7 +1188,7 @@ static BOOL daKi_Delete(ki_class* i_this) {
     
     if (i_this->m339 != 0) {
         hio_set = false;
-        mDoHIO_deleteChild(l_kiHIO.m04);
+        mDoHIO_deleteChild(l_kiHIO.mNo);
     }
 
 #if VERSION > VERSION_DEMO
@@ -1459,7 +1459,7 @@ static cPhs_State daKi_Create(fopAc_ac_c* a_this) {
         a_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
 
         if (!hio_set) {
-            l_kiHIO.m04 = mDoHIO_createChild("キース", &l_kiHIO);
+            l_kiHIO.mNo = mDoHIO_createChild("キース", &l_kiHIO);
             i_this->m339 = 1;
             hio_set = true;
         }
diff --git a/src/d/actor/d_a_obj_ice.cpp b/src/d/actor/d_a_obj_ice.cpp
index 262b6e8d9..30c9a0b51 100644
--- a/src/d/actor/d_a_obj_ice.cpp
+++ b/src/d/actor/d_a_obj_ice.cpp
@@ -23,7 +23,7 @@ public:
     void genMessage(JORMContext* ctx);
 
 public:
-    /* 0x04 */ s8 m04;
+    /* 0x04 */ s8 mNo;
     /* 0x08 */ f32 m08;
     /* 0x0C */ f32 m0C;
     /* 0x10 */ f32 m10;
@@ -82,7 +82,7 @@ static const dCcD_SrcCyl l_cyl_src = {
 
 #if VERSION == VERSION_DEMO
 daObjIce_HIO_c::daObjIce_HIO_c() {
-    m04 = -1;
+    mNo = -1;
     m08 = 40.0f;
     m0C = 120.0f;
     m10 = 65.0f;
@@ -275,8 +275,8 @@ cPhs_State daObjIce_c::_create() {
     }
 
 #if VERSION == VERISON_DEMO
-    if (l_HIO.m04 < 0) {
-        l_HIO.m04 = mDoHIO_createChild("汎用氷", &l_HIO);
+    if (l_HIO.mNo < 0) {
+        l_HIO.mNo = mDoHIO_createChild("汎用氷", &l_HIO);
     }
 #endif
 
@@ -302,9 +302,9 @@ bool daObjIce_c::_delete() {
     }
 
 #if VERSION == VERISON_DEMO
-    if (l_HIO.m04 >= 0) {
-        mDoHIO_deleteChild(l_HIO.m04);
-        l_HIO.m04 = -1;
+    if (l_HIO.mNo >= 0) {
+        mDoHIO_deleteChild(l_HIO.mNo);
+        l_HIO.mNo = -1;
     }
 #endif
     return true;
diff --git a/src/d/actor/d_a_obj_leaves.cpp b/src/d/actor/d_a_obj_leaves.cpp
index add1f425d..9d3ea7b51 100644
--- a/src/d/actor/d_a_obj_leaves.cpp
+++ b/src/d/actor/d_a_obj_leaves.cpp
@@ -23,7 +23,7 @@ public:
     void genMessage(JORMContext*);
 
 public:
-    /* 0x04 */ s8 m04;
+    /* 0x04 */ s8 mNo;
     /* 0x08 */ f32 m08;
     /* 0x0C */ f32 m0C;
     /* 0x10 */ f32 m10;
@@ -107,7 +107,7 @@ static const dCcD_SrcCyl l_fire_cyl_src = {
 
 #if VERSION == VERSION_DEMO
 daObjLeaves_HIO_c::daObjLeaves_HIO_c() {
-    m04 = -1;
+    mNo = -1;
     m08 = 150.0f;
     m0C = 115.0f;
     m10 = 95.0f;
@@ -522,8 +522,8 @@ cPhs_State daObjLeaves_c::_create() {
     }
 
 #if VERSION == VERSION_DEMO
-    if (l_HIO.m04 < 0) {
-        l_HIO.m04 = mDoHIO_createChild("落ち葉", &l_HIO);
+    if (l_HIO.mNo < 0) {
+        l_HIO.mNo = mDoHIO_createChild("落ち葉", &l_HIO);
     }
 #endif
     return PVar4;
@@ -555,9 +555,9 @@ bool daObjLeaves_c::_delete() {
     }
 
 #if VERSION == VERSION_DEMO
-    if (l_HIO.m04 >= 0) {
-        mDoHIO_deleteChild(l_HIO.m04);
-        l_HIO.m04 = -1;
+    if (l_HIO.mNo >= 0) {
+        mDoHIO_deleteChild(l_HIO.mNo);
+        l_HIO.mNo = -1;
     }
 #endif
 
diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp
index 4fa5c06ab..cdb974e5b 100644
--- a/src/d/actor/d_a_obj_warpt.cpp
+++ b/src/d/actor/d_a_obj_warpt.cpp
@@ -7,6 +7,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/res/res_ltubw.h"
 #include "d/d_bg_w.h"
+#include "d/d_com_inf_game.h"
 #include "d/d_lib.h"
 #include "d/d_procname.h"
 #include "d/d_priority.h"
diff --git a/src/d/actor/d_a_sie_flag.cpp b/src/d/actor/d_a_sie_flag.cpp
index df7d86508..5156599a2 100644
--- a/src/d/actor/d_a_sie_flag.cpp
+++ b/src/d/actor/d_a_sie_flag.cpp
@@ -55,7 +55,7 @@ static cXyz l_wind_offset(0.0f, 725.0f, 0.0f);
 
 /* 000000EC-00000118       .text __ct__16daSie_Flag_HIO_cFv */
 daSie_Flag_HIO_c::daSie_Flag_HIO_c() {
-    m04 = -1;
+    mNo = -1;
     m08 = 0.0f;
     m0c = 0;
 }