diff --git a/include/wx/defs.h b/include/wx/defs.h
index cf965721b3..aaa9693188 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -315,11 +315,6 @@
     #define FALSE 0
 #endif
 
-#ifdef __VISAGECPP__
-    #define true TRUE
-    #define false FALSE
-#endif
-
 // Add more tests here for Windows compilers that already define bool
 // (under Unix, configure tests for this)
 #ifndef HAVE_BOOL
diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h
index 472f2f3291..75c0f5b4b4 100644
--- a/include/wx/os2/setup.h
+++ b/include/wx/os2/setup.h
@@ -330,5 +330,8 @@
 
 #define wxUSE_SNGLINST_CHECKER  1
 
+#define wxUSE_GEOMETRY  1
+                                // needed for wxCanvas
+
 #endif
     // _WX_SETUP_H_
diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index aff83e7a72..a77445b09b 100644
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -329,5 +329,8 @@
 
 #define wxUSE_SNGLINST_CHECKER  1
 
+#define wxUSE_GEOMETRY  1
+                                // needed for wxCanvas
+
 #endif
     // _WX_SETUP_H_