-#ifdef __WXMSW__
-#define wxHelpController wxWinHelpController
-#define sm_classwxHelpController sm_classwxWinHelpController
-#elif defined(__WXGTK__)
-#define wxHelpController wxHTMLHelpController
-#define sm_classwxHelpController sm_classwxHTMLHelpController
+#ifdef __WXWINCE__
+ #include "wx/msw/wince/helpwce.h"
+
+ #define wxHelpController wxWinceHelpController
+#elif defined(__WXMSW__)
+ #include "wx/msw/helpchm.h"
+
+ #define wxHelpController wxCHMHelpController
+#else // !MSW
+
+#if wxUSE_WXHTML_HELP
+ #include "wx/html/helpctrl.h"
+ #define wxHelpController wxHtmlHelpController