diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index e6796a5db2..774c2612a6 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -364,7 +364,6 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
                 <sys-lib>oleaut32</sys-lib>
                 <sys-lib>uuid</sys-lib>
                 <sys-lib>commctrl</sys-lib>
-                <sys-lib>commdlg</sys-lib>
                 <sys-lib>winsock</sys-lib>
                 <sys-lib>wininet</sys-lib>
             </if>
diff --git a/include/wx/msw/wince/libraries.h b/include/wx/msw/wince/libraries.h
index ff6b6ac96d..81c5f23881 100644
--- a/include/wx/msw/wince/libraries.h
+++ b/include/wx/msw/wince/libraries.h
@@ -23,13 +23,22 @@
 
 #ifdef __VISUALC__
 
+#if _WIN32_WCE >= 400
+    #pragma comment(lib,"commdlg.lib")
+#endif
+
 #if defined(WCE_PLATFORM_STANDARDSDK)
     // DoDragDrop:
     #pragma comment(lib,"olece400.lib")
 #elif defined(WIN32_PLATFORM_PSPC)
+    // PocketPC build:
     // DoDragDrop:
     #pragma comment(lib,"ceshell.lib")
 
+    #pragma comment(lib,"aygshell.lib")
+#elif defined(WIN32_PLATFORM_WFSP)
+    // Smartphone build:
+    #pragma comment(lib,"ceshell.lib")
     #pragma comment(lib,"aygshell.lib")
 #else
     #error "Unknown SDK, please fill-in missing pieces"