diff --git a/include/wx/defs.h b/include/wx/defs.h
index f8b01d2c33..bde33b9841 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -836,6 +836,7 @@ enum {
 #define wxID_CLEAR              5033
 #define wxID_FIND               5034
 #define wxID_DUPLICATE          5035
+#define wxID_SELECTALL          5036
 
 #define wxID_FILE1              5050
 #define wxID_FILE2              5051
diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index 323da34925..b46d01b5ef 100644
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -79,7 +79,7 @@
 #define wxUSE_SCROLLBAR   1
                                     // Define 1 to compile contributed wxScrollBar class
 #define wxUSE_XPM_IN_X    1
-#define wxUSE_XPM_IN_MSW  1
+#define wxUSE_XPM_IN_MSW  0
                                     // Define 1 to support the XPM package in wxBitmap,
                                     // separated by platform. If 1, you must link in
                                     // the XPM library to your applications.