diff --git a/include/wx/debugrpt.h b/include/wx/debugrpt.h
index 0337633e9f..48b640c408 100644
--- a/include/wx/debugrpt.h
+++ b/include/wx/debugrpt.h
@@ -15,6 +15,8 @@
 
 #if wxUSE_DEBUGREPORT && wxUSE_XML
 
+#include "wx/string.h"
+
 class WXDLLIMPEXP_XML wxXmlNode;
 
 // ----------------------------------------------------------------------------
@@ -227,7 +229,6 @@ public:
 
 #endif // wxUSE_GUI
 
-#endif // wxUSE_DEBUGREPORT
+#endif // wxUSE_DEBUGREPORT && wxUSE_XML
 
 #endif // _WX_DEBUGRPT_H_
-
diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index bc6ee53637..ac2de5b9f5 100644
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filedlgg.h
+// Name:        wx/generic/filedlgg.h
 // Purpose:     wxGenericFileDialog
 // Author:      Robert Roebling
 // Modified by:
@@ -15,6 +15,7 @@
 #include "wx/listctrl.h"
 #include "wx/datetime.h"
 #include "wx/filefn.h"
+#include "wx/filedlg.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -304,4 +305,3 @@ private:
 };
 
 #endif // _WX_FILEDLGG_H_
-