diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp
index 4ab115b8a6..3cd261e8a1 100644
--- a/src/motif/gauge.cpp
+++ b/src/motif/gauge.cpp
@@ -13,8 +13,13 @@
 #pragma implementation "gauge.h"
 #endif
 
-#ifdef __VMS__
+#ifdef __VMS
 #include <wx/vms_x_fix.h>
+#undef XtDisplay
+#undef XtScreen
+#undef XtWindow
+#undef XtIsRealized
+#undef XtParent
 #endif
 
 # include "wx/gauge.h"
diff --git a/src/motif/xmcombo/xmcombo.c b/src/motif/xmcombo/xmcombo.c
index 32f5686026..601fe89c43 100644
--- a/src/motif/xmcombo/xmcombo.c
+++ b/src/motif/xmcombo/xmcombo.c
@@ -93,6 +93,11 @@
  */
 #ifdef __VMS
 #include <wx/vms_x_fix.h>
+#undef XtDisplay
+#undef XtScreen
+#undef XtWindow
+#undef XtIsRealized
+#undef XtParent
 #endif
 
 #include <X11/IntrinsicP.h>