diff --git a/include/d/d_menu_capture.h b/include/d/d_menu_capture.h
index a8863f169..1dd6f6646 100644
--- a/include/d/d_menu_capture.h
+++ b/include/d/d_menu_capture.h
@@ -1,6 +1,7 @@
 #ifndef D_MENU_CAPTURE_H
 #define D_MENU_CAPTURE_H
 
+#include "d/d_com_inf_game.h"
 #include "d/d_drawlist.h"
 #include "d/d_menu_cloth.h"
 #include "d/d_menu_item.h"
@@ -35,6 +36,9 @@ public:
 
 class dDlst_MENU_CAPTURE_c : public dDlst_base_c {
 public:
+    dDlst_MENU_CAPTURE_c() { setDrawFlagOff(); }
+    virtual ~dDlst_MENU_CAPTURE_c() {}
+
     virtual void draw() {
         if (checkDrawFlag() == 1) {
             setDrawFlagOn2();
@@ -101,10 +105,6 @@ public:
         }
     }
 
-    virtual ~dDlst_MENU_CAPTURE_c() {}
-
-    dDlst_MENU_CAPTURE_c() { setDrawFlagOff(); }
-
     u8 checkDrawFlag() { return mStatus; }
     void setDrawFlagOff() { mStatus = 0; }
     void setDrawFlagOn() { mStatus = 1; }
diff --git a/include/d/d_menu_cloth.h b/include/d/d_menu_cloth.h
index 9768521d1..c70b6b607 100644
--- a/include/d/d_menu_cloth.h
+++ b/include/d/d_menu_cloth.h
@@ -1,9 +1,11 @@
 #ifndef D_MENU_CLOTH_H
 #define D_MENU_CLOTH_H
 
+#include "SSystem/SComponent/c_sxyz.h"
 #include "dolphin/types.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/gx/GXStruct.h"
+#include "m_Do/m_Do_hostIO.h"
 
 class JKRArchive;
 
diff --git a/include/d/d_menu_fmap.h b/include/d/d_menu_fmap.h
index b87312a89..bb0928ff7 100644
--- a/include/d/d_menu_fmap.h
+++ b/include/d/d_menu_fmap.h
@@ -1,6 +1,7 @@
 #ifndef D_MENU_FMAP_H
 #define D_MENU_FMAP_H
 
+#include "d/d_drawlist.h"
 #include "dolphin/types.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "d/d_menu_fmap2.h"
diff --git a/include/d/d_menu_window.h b/include/d/d_menu_window.h
index 347da562d..4a57d993f 100644
--- a/include/d/d_menu_window.h
+++ b/include/d/d_menu_window.h
@@ -2,6 +2,8 @@
 #define D_MENU_WINDOW_H
 
 #include "dolphin/types.h"
+#include "f_op/f_op_msg.h"
+#include "m_Do/m_Do_hostIO.h"
 
 class dMCloth_c;
 class JKRExpHeap;
@@ -61,6 +63,9 @@ enum dMw_Status {
     MENU_STATE_SAVE_CLOSE = 38,
 };
 
+class JKRHeap;
+class JKRArchive;
+
 class sub_ms_screen_class : public msg_class {
 public:
     /* 0x00FC */ JKRHeap* parentHeap_0xfc;
diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp
index 464c88011..9d0ac76b5 100644
--- a/src/d/d_menu_window.cpp
+++ b/src/d/d_menu_window.cpp
@@ -70,7 +70,7 @@ dMenu_FmapSv_c dMv_CIO_c;
 dMw_HIO_c g_mwHIO;
 dMw_DHIO_c g_mwDHIO;
 
-static dMCloth_c* cloth_c;
+dMCloth_c* cloth_c;
 
 static JUTFont* fonttype;
 static JUTFont* rfonttype;
@@ -178,7 +178,7 @@ dMw_DHIO_c::dMw_DHIO_c() {
     }
 }
 
-static u8 lockFlag = 0;
+static u8 lockFlag = 1;
 
 /* 801DB568-801DB91C       .text dMs_item_create__FP19sub_ms_screen_class */
 void dMs_item_create(sub_ms_screen_class* i_Ms) {
@@ -1581,5 +1581,5 @@ msg_process_profile_definition g_profile_MENUWINDOW = {
     /* Parameters   */ 0,
     /* Leaf SubMtd  */ &g_fopMsg_Method,
     /* Priority     */ PRIO_MENUWINDOW,
-    /* Msg SubMtd */ &l_dMs_Method,
+    /* Msg SubMtd   */ &l_dMs_Method,
 };