diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 4bc5654394..241ac32886 100644
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -1058,6 +1058,22 @@
 
 /* --- end common options --- */
 
+// ----------------------------------------------------------------------------
+// general Windows-specific stuff
+// ----------------------------------------------------------------------------
+
+// Set this to 1 for generic OLE support: this is required for drag-and-drop,
+// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
+// can't compile/doesn't have the OLE headers.
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_OLE           1
+
+// Set this to 1 to enable wxDIB (don't change unless you have reason to)
+#define wxUSE_WXDIB 1
+
 // ----------------------------------------------------------------------------
 // Windows CE specific stuff
 // ----------------------------------------------------------------------------