diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 397642e189..b16aa2569d 100644
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -39,7 +39,9 @@ private:
     long m_dialogStyle;
 };
 
-#if defined(__WXUNIVERSAL__) || defined(__WXGPE__)
+#if defined(__WX_COMPILING_MSGDLGG_CPP__)
+#include "wx/generic/msgdlgg.h"
+#elif defined(__WXUNIVERSAL__) || defined(__WXGPE__)
 #include "wx/generic/msgdlgg.h"
 #elif defined(__WXPALMOS__)
 #include "wx/palmos/msgdlg.h"
diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index 1c498768e1..537154714b 100644
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -38,7 +38,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "wx/generic/msgdlgg.h"
+#define __WX_COMPILING_MSGDLGG_CPP__ 1
+#include "wx/msgdlg.h"
 #include "wx/artprov.h"
 #include "wx/settings.h"