diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index d2d38c0bdd..83c9ed5ea8 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -51,8 +51,8 @@ public:
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
 
-// MS Smartphone
-#elif defined(__SMARTPHONE__) && defined(__WXWINCE__)
+// MS PocketPC or MS Smartphone
+#elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)
 
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 0bb55362d5..f011311407 100644
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_DIRDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+#if wxUSE_DIRDLG && (!defined(__WXWINCE__) || defined(__HANDHELDPC__))
 
 #if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE