diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index f54f986b5c..5ac1e51f0d 100644
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -1221,4 +1221,13 @@
 
 /* --- end common options --- */
 
+/*
+ * Unix-specific options
+ */
+#define wxUSE_SELECT_DISPATCHER 1
+#define wxUSE_EPOLL_DISPATCHER 0
+
+#define wxUSE_UNICODE_UTF8 0
+#define wxUSE_UTF8_LOCALE_ONLY 0
+
 #endif // _WX_SETUP_H_
diff --git a/include/wx/private/selectdispatcher.h b/include/wx/private/selectdispatcher.h
index eea139f37c..9d75cdd77f 100644
--- a/include/wx/private/selectdispatcher.h
+++ b/include/wx/private/selectdispatcher.h
@@ -15,7 +15,13 @@
 
 #if wxUSE_SELECT_DISPATCHER
 
-#include <sys/types.h>
+#ifdef __WATCOMC__
+  #include <types.h>
+  #include <sys/ioctl.h>
+  #include <sys/select.h>
+#else
+  #include <sys/types.h>
+#endif
 
 #include "wx/private/fdiodispatcher.h"