diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index 5c58befd40..0216cacdd7 100644
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -18,7 +18,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_MDI_ARCHITECTURE
+#if wxUSE_MDI_ARCHITECTURE && wxUSE_DOC_VIEW_ARCHITECTURE
 
 #include "wx/docview.h"
 #include "wx/mdi.h"
@@ -85,6 +85,6 @@ DECLARE_EVENT_TABLE()
 
 #endif
     // wxUSE_MDI_ARCHITECTURE
-    
+
 #endif
     // _WX_DOCMDI_H_
diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index 4038ddb700..6ce731631b 100644
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_DOC_VIEW_ARCHITECTURE
+#if wxUSE_MDI_ARCHITECTURE && wxUSE_DOC_VIEW_ARCHITECTURE
 
 #include "wx/docmdi.h"