diff --git a/include/wx/platform.h b/include/wx/platform.h
index 72ce781696..2930552e48 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -590,6 +590,15 @@
 #    warning "Compiling wxMac with probably wrong endianness"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#ifdef __WXMOTIF__
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#define XtWindow XTWINDOW
+#endif
+#endif
+
 /* Choose which method we will use for updating menus
  * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 2f7b0f5132..9271bc70de 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -18,12 +18,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __EMX__
-// The following define is needed by Innotek's libc to
-// make the definition of struct localeconv available.
-#define __INTERNAL_DEFS
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -31,6 +25,12 @@
     #pragma hdrstop
 #endif
 
+#ifdef __EMX__
+// The following define is needed by Innotek's libc to
+// make the definition of struct localeconv available.
+#define __INTERNAL_DEFS
+#endif
+
 #if wxUSE_INTL
 
 #ifndef WX_PRECOMP
diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 5a202d2fc8..6dc7739239 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -18,10 +18,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 4fa8fbcc8f..51c70a94a5 100644
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -12,11 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/app.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 7a2c68e90e..e36c360240 100644
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtScreen XTSCREEN
-#endif
-
 #include "wx/bmpbuttn.h"
 
 #ifdef __VMS__
diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index 155adc1cf4..525bc355a0 100644
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -12,11 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/motif/bmpmotif.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index 77ce5c0242..2344c38fd0 100644
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/button.h"
 
 #ifdef __VMS__
diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 84dfd520a8..625957d023 100644
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/checkbox.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 585c467600..aa8956bc26 100644
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -14,11 +14,6 @@
 
 #if wxUSE_CHOICE
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtParent XTPARENT
-#endif
-
 #include "wx/choice.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index dceb887490..bda3113436 100644
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -12,13 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtParent XTPARENT
-#define XtScreen XTSCREEN
-#endif
-
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index 84999bb11e..0c5b1e7585 100644
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index 9e481db223..7ae818ecd1 100644
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -12,12 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtParent XTPARENT
-#define XtWindow XTWINDOW
-#endif
-
 #include "wx/filedlg.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index e734afa910..30a414716f 100644
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -20,12 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtScreen XTSCREEN
-#endif
-
 #include "wx/frame.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 07670065d8..ea89b7bc97 100644
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -24,11 +24,6 @@
     #include "wx/arrstr.h"
 #endif
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 09894eea98..396cf5d3fc 100644
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -12,11 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#endif
-
 #include "wx/mdi.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 9643b1a868..b25775321a 100644
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -33,8 +33,6 @@
 
 #ifdef __VMS__
 #pragma message disable nosimpint
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
 #endif
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index fe8e598e30..2ccf50ad61 100644
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -21,7 +21,6 @@
 #include "wx/wxprec.h"
 
 #ifdef __VMS
-#define XtDisplay XTDISPLAY
 #pragma message disable nosimpint
 #include "wx/vms_x_fix.h"
 #endif
diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index fa7aba0fa4..17366b885c 100644
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -14,10 +14,6 @@
 
 #if wxUSE_RADIOBOX
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/radiobox.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 00ec024178..b0a0c043e8 100644
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/radiobut.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp
index 5b19681cf3..9442a99229 100644
--- a/src/motif/scrolbar.cpp
+++ b/src/motif/scrolbar.cpp
@@ -16,7 +16,6 @@
 
 #ifdef __VMS__
 #pragma message disable nosimpint
-#define XtDisplay XTDISPLAY
 #endif
 #include <Xm/Xm.h>
 #include <Xm/ScrollBar.h>
diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index c25efcae0e..b874f04524 100644
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/statbox.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index e109caae2d..2fb9bb0793 100644
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"
diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 8213b6b8cd..3098449abd 100644
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -20,10 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index 42851b1b38..092893e006 100644
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -20,10 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/toolbar.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index 5ce626267a..6ef5bd5a50 100644
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -27,10 +27,6 @@
 #endif
 
 #ifdef __VMS__
-#define XtDisplay XTDISPLAY
-#define XtParent XTPARENT
-#define XtScreen XTSCREEN
-#define XtWindow XTWINDOW
 #pragma message disable nosimpint
 #endif
 
diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index a8257298f6..ae13c2841e 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -20,10 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 471adea69e..b1abefc3c3 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -20,12 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtScreen XTSCREEN
-#endif
-
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/log.h"
diff --git a/src/x11/utilsx.cpp b/src/x11/utilsx.cpp
index c01eeb8af8..9bc793e343 100644
--- a/src/x11/utilsx.cpp
+++ b/src/x11/utilsx.cpp
@@ -14,7 +14,6 @@
 
 #ifdef __VMS
 #define XShapeQueryExtension XSHAPEQUERYEXTENSION
-#define XtDisplay XTDISPLAY
 #endif
 
 #include "wx/x11/privx.h"