diff --git a/src/common/debugrpt.cpp b/src/common/debugrpt.cpp
index 96ccc60012..2f5ba823e3 100644
--- a/src/common/debugrpt.cpp
+++ b/src/common/debugrpt.cpp
@@ -224,7 +224,12 @@ wxDebugReport::~wxDebugReport()
 
     if ( !m_dir.empty() )
     {
+        // Temp fix: what should this be? eVC++ doesn't like wxRmDir
+#ifdef __WXWINCE__
+        if ( wxRmdir(m_dir.fn_str()) != 0 )
+#else
         if ( wxRmDir(m_dir.fn_str()) != 0 )
+#endif
         {
             wxLogSysError(_("Failed to clean up debug report directory \"%s\""),
                           m_dir.c_str());
diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp
index c09e021cd7..4a6397b5b4 100644
--- a/src/generic/dbgrptg.cpp
+++ b/src/generic/dbgrptg.cpp
@@ -29,7 +29,7 @@
     #include "wx/textctrl.h"
 #endif // WX_PRECOMP
 
-#if wxUSE_DEBUGREPORT
+#if wxUSE_DEBUGREPORT && wxUSE_CHECKLISTBOX
 
 #include "wx/debugrpt.h"