diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index f5287d284c..079330cd68 100644
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -21,7 +21,6 @@
 #include <utils.h>
 #undef BYTE_ORDER
 #include <types.h>
-#include <nerrno.h>
 #define INCL_ORDERS
 #endif
 
diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h
index 83aa19c650..7bea1764b1 100644
--- a/include/wx/os2/setup.h
+++ b/include/wx/os2/setup.h
@@ -56,6 +56,12 @@
 #define wxUSE_TIMEDATE    1
                                 // 0 for no wxTime/wxDate classes
 
+#define wxUSE_MENUS       1
+                                // 0 for no menus
+
+#define wxUSE_JOYSTICK    1
+                                // 0 for no joystick functions
+
 #define wxUSE_CLIPBOARD   1
                                 // 0 for no clipboard functions
 
diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 83aa19c650..7bea1764b1 100644
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -56,6 +56,12 @@
 #define wxUSE_TIMEDATE    1
                                 // 0 for no wxTime/wxDate classes
 
+#define wxUSE_MENUS       1
+                                // 0 for no menus
+
+#define wxUSE_JOYSTICK    1
+                                // 0 for no joystick functions
+
 #define wxUSE_CLIPBOARD   1
                                 // 0 for no clipboard functions