diff --git a/Makefile.in b/Makefile.in
index 314c394af7..9ed6afed87 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4875,7 +4875,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS =  \
 	monodll_generic_caret.o \
 	monodll_generic_imaglist.o \
 	monodll_unix_dialup.o \
-	monodll_displayx11.o \
 	monodll_unix_fontenum.o \
 	monodll_unix_fontutil.o \
 	monodll_uiactionx11.o \
@@ -4915,7 +4914,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS =  \
 	monodll_gtk1_toplevel.o \
 	monodll_gtk1_utilsgtk.o \
 	monodll_gtk1_win_gtk.o \
-	monodll_gtk1_window.o
+	monodll_gtk1_window.o \
+	monodll_displayx11.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
 	$(__GTK_PLATFORM_SRC_OBJECTS) \
@@ -5035,7 +5035,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_generic_caret.o \
 	monodll_generic_imaglist.o \
 	monodll_unix_dialup.o \
-	monodll_displayx11.o \
 	monodll_unix_fontenum.o \
 	monodll_unix_fontutil.o \
 	monodll_uiactionx11.o \
@@ -5050,7 +5049,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_x11_palette.o \
 	monodll_x11_pen.o \
 	monodll_x11_region.o \
-	monodll_utilsx.o
+	monodll_utilsx.o \
+	monodll_displayx11.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_activex.o \
@@ -5128,7 +5128,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_generic_caret.o \
 	monodll_generic_imaglist.o \
 	monodll_unix_dialup.o \
-	monodll_displayx11.o \
 	monodll_unix_fontenum.o \
 	monodll_unix_fontutil.o \
 	monodll_uiactionx11.o \
@@ -5165,7 +5164,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
 	monodll_x11_toplevel.o \
 	monodll_x11_utils.o \
 	monodll_utilsx.o \
-	monodll_x11_window.o
+	monodll_x11_window.o \
+	monodll_displayx11.o
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS =  \
 	monodll_generic_accel.o \
@@ -5779,7 +5779,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_generic_caret.o \
 	monodll_generic_imaglist.o \
 	monodll_unix_dialup.o \
-	monodll_displayx11.o \
 	monodll_unix_fontenum.o \
 	monodll_unix_fontutil.o \
 	monodll_uiactionx11.o \
@@ -5819,7 +5818,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_gtk1_toplevel.o \
 	monodll_gtk1_utilsgtk.o \
 	monodll_gtk1_win_gtk.o \
-	monodll_gtk1_window.o
+	monodll_gtk1_window.o \
+	monodll_displayx11.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
 	$(__GTK_PLATFORM_SRC_OBJECTS) \
@@ -5939,7 +5939,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_generic_caret.o \
 	monodll_generic_imaglist.o \
 	monodll_unix_dialup.o \
-	monodll_displayx11.o \
 	monodll_unix_fontenum.o \
 	monodll_unix_fontutil.o \
 	monodll_uiactionx11.o \
@@ -5954,7 +5953,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_x11_palette.o \
 	monodll_x11_pen.o \
 	monodll_x11_region.o \
-	monodll_utilsx.o
+	monodll_utilsx.o \
+	monodll_displayx11.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_activex.o \
@@ -6032,7 +6032,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_generic_caret.o \
 	monodll_generic_imaglist.o \
 	monodll_unix_dialup.o \
-	monodll_displayx11.o \
 	monodll_unix_fontenum.o \
 	monodll_unix_fontutil.o \
 	monodll_uiactionx11.o \
@@ -6069,7 +6068,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
 	monodll_x11_toplevel.o \
 	monodll_x11_utils.o \
 	monodll_utilsx.o \
-	monodll_x11_window.o
+	monodll_x11_window.o \
+	monodll_displayx11.o
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__UNIV_PLATFORM_SRC_OBJECTS \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= monodll_animateg.o
@@ -6852,7 +6852,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_generic_caret.o \
 	monolib_generic_imaglist.o \
 	monolib_unix_dialup.o \
-	monolib_displayx11.o \
 	monolib_unix_fontenum.o \
 	monolib_unix_fontutil.o \
 	monolib_uiactionx11.o \
@@ -6892,7 +6891,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_gtk1_toplevel.o \
 	monolib_gtk1_utilsgtk.o \
 	monolib_gtk1_win_gtk.o \
-	monolib_gtk1_window.o
+	monolib_gtk1_window.o \
+	monolib_displayx11.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
 	$(__GTK_PLATFORM_SRC_OBJECTS_27) \
@@ -7012,7 +7012,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_generic_caret.o \
 	monolib_generic_imaglist.o \
 	monolib_unix_dialup.o \
-	monolib_displayx11.o \
 	monolib_unix_fontenum.o \
 	monolib_unix_fontutil.o \
 	monolib_uiactionx11.o \
@@ -7027,7 +7026,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_x11_palette.o \
 	monolib_x11_pen.o \
 	monolib_x11_region.o \
-	monolib_utilsx.o
+	monolib_utilsx.o \
+	monolib_displayx11.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_activex.o \
@@ -7105,7 +7105,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_generic_caret.o \
 	monolib_generic_imaglist.o \
 	monolib_unix_dialup.o \
-	monolib_displayx11.o \
 	monolib_unix_fontenum.o \
 	monolib_unix_fontutil.o \
 	monolib_uiactionx11.o \
@@ -7142,7 +7141,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 =  \
 	monolib_x11_toplevel.o \
 	monolib_x11_utils.o \
 	monolib_utilsx.o \
-	monolib_x11_window.o
+	monolib_x11_window.o \
+	monolib_displayx11.o
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 =  \
 	monolib_generic_accel.o \
@@ -7756,7 +7756,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_generic_caret.o \
 	monolib_generic_imaglist.o \
 	monolib_unix_dialup.o \
-	monolib_displayx11.o \
 	monolib_unix_fontenum.o \
 	monolib_unix_fontutil.o \
 	monolib_uiactionx11.o \
@@ -7796,7 +7795,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_gtk1_toplevel.o \
 	monolib_gtk1_utilsgtk.o \
 	monolib_gtk1_win_gtk.o \
-	monolib_gtk1_window.o
+	monolib_gtk1_window.o \
+	monolib_displayx11.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
 	$(__GTK_PLATFORM_SRC_OBJECTS_27) \
@@ -7916,7 +7916,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_generic_caret.o \
 	monolib_generic_imaglist.o \
 	monolib_unix_dialup.o \
-	monolib_displayx11.o \
 	monolib_unix_fontenum.o \
 	monolib_unix_fontutil.o \
 	monolib_uiactionx11.o \
@@ -7931,7 +7930,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_x11_palette.o \
 	monolib_x11_pen.o \
 	monolib_x11_region.o \
-	monolib_utilsx.o
+	monolib_utilsx.o \
+	monolib_displayx11.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_activex.o \
@@ -8009,7 +8009,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_generic_caret.o \
 	monolib_generic_imaglist.o \
 	monolib_unix_dialup.o \
-	monolib_displayx11.o \
 	monolib_unix_fontenum.o \
 	monolib_unix_fontutil.o \
 	monolib_uiactionx11.o \
@@ -8046,7 +8045,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
 	monolib_x11_toplevel.o \
 	monolib_x11_utils.o \
 	monolib_utilsx.o \
-	monolib_x11_window.o
+	monolib_x11_window.o \
+	monolib_displayx11.o
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__UNIV_PLATFORM_SRC_OBJECTS_1 \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= monolib_animateg.o
@@ -8976,7 +8976,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_generic_caret.o \
 	coredll_generic_imaglist.o \
 	coredll_unix_dialup.o \
-	coredll_displayx11.o \
 	coredll_unix_fontenum.o \
 	coredll_unix_fontutil.o \
 	coredll_uiactionx11.o \
@@ -9016,7 +9015,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_gtk1_toplevel.o \
 	coredll_gtk1_utilsgtk.o \
 	coredll_gtk1_win_gtk.o \
-	coredll_gtk1_window.o
+	coredll_gtk1_window.o \
+	coredll_displayx11.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
 	$(__GTK_PLATFORM_SRC_OBJECTS_1_4) \
@@ -9136,7 +9136,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_generic_caret.o \
 	coredll_generic_imaglist.o \
 	coredll_unix_dialup.o \
-	coredll_displayx11.o \
 	coredll_unix_fontenum.o \
 	coredll_unix_fontutil.o \
 	coredll_uiactionx11.o \
@@ -9151,7 +9150,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_x11_palette.o \
 	coredll_x11_pen.o \
 	coredll_x11_region.o \
-	coredll_utilsx.o
+	coredll_utilsx.o \
+	coredll_displayx11.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_activex.o \
@@ -9229,7 +9229,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_generic_caret.o \
 	coredll_generic_imaglist.o \
 	coredll_unix_dialup.o \
-	coredll_displayx11.o \
 	coredll_unix_fontenum.o \
 	coredll_unix_fontutil.o \
 	coredll_uiactionx11.o \
@@ -9266,7 +9265,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 =  \
 	coredll_x11_toplevel.o \
 	coredll_x11_utils.o \
 	coredll_utilsx.o \
-	coredll_x11_window.o
+	coredll_x11_window.o \
+	coredll_displayx11.o
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 =  \
 	coredll_generic_accel.o \
@@ -9880,7 +9880,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_generic_caret.o \
 	coredll_generic_imaglist.o \
 	coredll_unix_dialup.o \
-	coredll_displayx11.o \
 	coredll_unix_fontenum.o \
 	coredll_unix_fontutil.o \
 	coredll_uiactionx11.o \
@@ -9920,7 +9919,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_gtk1_toplevel.o \
 	coredll_gtk1_utilsgtk.o \
 	coredll_gtk1_win_gtk.o \
-	coredll_gtk1_window.o
+	coredll_gtk1_window.o \
+	coredll_displayx11.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
 	$(__GTK_PLATFORM_SRC_OBJECTS_1_4) \
@@ -10040,7 +10040,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_generic_caret.o \
 	coredll_generic_imaglist.o \
 	coredll_unix_dialup.o \
-	coredll_displayx11.o \
 	coredll_unix_fontenum.o \
 	coredll_unix_fontutil.o \
 	coredll_uiactionx11.o \
@@ -10055,7 +10054,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_x11_palette.o \
 	coredll_x11_pen.o \
 	coredll_x11_region.o \
-	coredll_utilsx.o
+	coredll_utilsx.o \
+	coredll_displayx11.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_activex.o \
@@ -10133,7 +10133,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_generic_caret.o \
 	coredll_generic_imaglist.o \
 	coredll_unix_dialup.o \
-	coredll_displayx11.o \
 	coredll_unix_fontenum.o \
 	coredll_unix_fontutil.o \
 	coredll_uiactionx11.o \
@@ -10170,7 +10169,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 =  \
 	coredll_x11_toplevel.o \
 	coredll_x11_utils.o \
 	coredll_utilsx.o \
-	coredll_x11_window.o
+	coredll_x11_window.o \
+	coredll_displayx11.o
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__UNIV_PLATFORM_SRC_OBJECTS_2 \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= coredll_animateg.o
@@ -10695,7 +10695,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_generic_caret.o \
 	corelib_generic_imaglist.o \
 	corelib_unix_dialup.o \
-	corelib_displayx11.o \
 	corelib_unix_fontenum.o \
 	corelib_unix_fontutil.o \
 	corelib_uiactionx11.o \
@@ -10735,7 +10734,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_gtk1_toplevel.o \
 	corelib_gtk1_utilsgtk.o \
 	corelib_gtk1_win_gtk.o \
-	corelib_gtk1_window.o
+	corelib_gtk1_window.o \
+	corelib_displayx11.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
 	$(__GTK_PLATFORM_SRC_OBJECTS_2_2) \
@@ -10855,7 +10855,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_generic_caret.o \
 	corelib_generic_imaglist.o \
 	corelib_unix_dialup.o \
-	corelib_displayx11.o \
 	corelib_unix_fontenum.o \
 	corelib_unix_fontutil.o \
 	corelib_uiactionx11.o \
@@ -10870,7 +10869,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_x11_palette.o \
 	corelib_x11_pen.o \
 	corelib_x11_region.o \
-	corelib_utilsx.o
+	corelib_utilsx.o \
+	corelib_displayx11.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_activex.o \
@@ -10948,7 +10948,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_generic_caret.o \
 	corelib_generic_imaglist.o \
 	corelib_unix_dialup.o \
-	corelib_displayx11.o \
 	corelib_unix_fontenum.o \
 	corelib_unix_fontutil.o \
 	corelib_uiactionx11.o \
@@ -10985,7 +10984,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 =  \
 	corelib_x11_toplevel.o \
 	corelib_x11_utils.o \
 	corelib_utilsx.o \
-	corelib_x11_window.o
+	corelib_x11_window.o \
+	corelib_displayx11.o
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 =  \
 	corelib_generic_accel.o \
@@ -11599,7 +11599,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_generic_caret.o \
 	corelib_generic_imaglist.o \
 	corelib_unix_dialup.o \
-	corelib_displayx11.o \
 	corelib_unix_fontenum.o \
 	corelib_unix_fontutil.o \
 	corelib_uiactionx11.o \
@@ -11639,7 +11638,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_gtk1_toplevel.o \
 	corelib_gtk1_utilsgtk.o \
 	corelib_gtk1_win_gtk.o \
-	corelib_gtk1_window.o
+	corelib_gtk1_window.o \
+	corelib_displayx11.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
 	$(__GTK_PLATFORM_SRC_OBJECTS_2_2) \
@@ -11759,7 +11759,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_generic_caret.o \
 	corelib_generic_imaglist.o \
 	corelib_unix_dialup.o \
-	corelib_displayx11.o \
 	corelib_unix_fontenum.o \
 	corelib_unix_fontutil.o \
 	corelib_uiactionx11.o \
@@ -11774,7 +11773,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_x11_palette.o \
 	corelib_x11_pen.o \
 	corelib_x11_region.o \
-	corelib_utilsx.o
+	corelib_utilsx.o \
+	corelib_displayx11.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_activex.o \
@@ -11852,7 +11852,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_generic_caret.o \
 	corelib_generic_imaglist.o \
 	corelib_unix_dialup.o \
-	corelib_displayx11.o \
 	corelib_unix_fontenum.o \
 	corelib_unix_fontutil.o \
 	corelib_uiactionx11.o \
@@ -11889,7 +11888,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
 	corelib_x11_toplevel.o \
 	corelib_x11_utils.o \
 	corelib_utilsx.o \
-	corelib_x11_window.o
+	corelib_x11_window.o \
+	corelib_displayx11.o
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__UNIV_PLATFORM_SRC_OBJECTS_3 \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= corelib_animateg.o
@@ -13185,7 +13185,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS =  \
 	monodll_generic_caret.o \
 	monodll_generic_imaglist.o \
 	monodll_unix_dialup.o \
-	monodll_displayx11.o \
 	monodll_unix_fontenum.o \
 	monodll_unix_fontutil.o \
 	monodll_uiactionx11.o \
@@ -13199,7 +13198,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS =  \
 	monodll_generic_caret.o \
 	monodll_generic_imaglist.o \
 	monodll_unix_dialup.o \
-	monodll_displayx11.o \
 	monodll_unix_fontenum.o \
 	monodll_unix_fontutil.o \
 	monodll_uiactionx11.o \
@@ -13328,7 +13326,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_27 =  \
 	monolib_generic_caret.o \
 	monolib_generic_imaglist.o \
 	monolib_unix_dialup.o \
-	monolib_displayx11.o \
 	monolib_unix_fontenum.o \
 	monolib_unix_fontutil.o \
 	monolib_uiactionx11.o \
@@ -13342,7 +13339,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_27 =  \
 	monolib_generic_caret.o \
 	monolib_generic_imaglist.o \
 	monolib_unix_dialup.o \
-	monolib_displayx11.o \
 	monolib_unix_fontenum.o \
 	monolib_unix_fontutil.o \
 	monolib_uiactionx11.o \
@@ -13471,7 +13467,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_1_4 =  \
 	coredll_generic_caret.o \
 	coredll_generic_imaglist.o \
 	coredll_unix_dialup.o \
-	coredll_displayx11.o \
 	coredll_unix_fontenum.o \
 	coredll_unix_fontutil.o \
 	coredll_uiactionx11.o \
@@ -13485,7 +13480,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_1_4 =  \
 	coredll_generic_caret.o \
 	coredll_generic_imaglist.o \
 	coredll_unix_dialup.o \
-	coredll_displayx11.o \
 	coredll_unix_fontenum.o \
 	coredll_unix_fontutil.o \
 	coredll_uiactionx11.o \
@@ -13611,7 +13605,6 @@ COND_PLATFORM_MACOSX_1___GTK_PLATFORM_SRC_OBJECTS_2_2 =  \
 	corelib_generic_caret.o \
 	corelib_generic_imaglist.o \
 	corelib_unix_dialup.o \
-	corelib_displayx11.o \
 	corelib_unix_fontenum.o \
 	corelib_unix_fontutil.o \
 	corelib_uiactionx11.o \
@@ -13625,7 +13618,6 @@ COND_PLATFORM_UNIX_1___GTK_PLATFORM_SRC_OBJECTS_2_2 =  \
 	corelib_generic_caret.o \
 	corelib_generic_imaglist.o \
 	corelib_unix_dialup.o \
-	corelib_displayx11.o \
 	corelib_unix_fontenum.o \
 	corelib_unix_fontutil.o \
 	corelib_uiactionx11.o \
@@ -17631,33 +17623,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
 
@@ -18513,6 +18478,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
 
@@ -22902,33 +22876,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
 
@@ -23784,6 +23731,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
 
@@ -28266,33 +28222,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
 
@@ -29148,6 +29077,15 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
 
@@ -32532,33 +32470,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
 
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
 @COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_4_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
 
@@ -33414,6 +33325,15 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MOTIF_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index b4834f11f5..328e0c3b68 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1311,7 +1311,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/caret.cpp
     src/generic/imaglist.cpp
     src/unix/dialup.cpp
-    src/unix/displayx11.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/uiactionx11.cpp
@@ -1629,6 +1628,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk1/utilsgtk.cpp
     src/gtk1/win_gtk.c
     src/gtk1/window.cpp
+    src/unix/displayx11.cpp
 </set>
 <set var="GTK1_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
@@ -1774,6 +1774,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/pen.cpp
     src/x11/region.cpp
     src/x11/utilsx.cpp
+    src/unix/displayx11.cpp
 </set>
 <set var="MOTIF_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
@@ -1965,6 +1966,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/utils.cpp
     src/x11/utilsx.cpp
     src/x11/window.cpp
+    src/unix/displayx11.cpp
 </set>
 <set var="X11_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 75d55340a6..f8c6c12d39 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -1206,7 +1206,6 @@ set(XWIN_LOWLEVEL_SRC
     src/generic/caret.cpp
     src/generic/imaglist.cpp
     src/unix/dialup.cpp
-    src/unix/displayx11.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/uiactionx11.cpp
@@ -1513,6 +1512,7 @@ set(GTK1_LOWLEVEL_SRC
     src/gtk1/utilsgtk.cpp
     src/gtk1/win_gtk.c
     src/gtk1/window.cpp
+    src/unix/displayx11.cpp
 )
 
 set(GTK1_LOWLEVEL_HDR
@@ -1656,6 +1656,7 @@ set(MOTIF_LOWLEVEL_SRC
     src/x11/pen.cpp
     src/x11/region.cpp
     src/x11/utilsx.cpp
+    src/unix/displayx11.cpp
 )
 
 set(MOTIF_LOWLEVEL_HDR
@@ -1844,6 +1845,7 @@ set(X11_LOWLEVEL_SRC
     src/x11/utils.cpp
     src/x11/utilsx.cpp
     src/x11/window.cpp
+    src/unix/displayx11.cpp
 )
 
 set(X11_LOWLEVEL_HDR
diff --git a/build/files b/build/files
index 77280b9913..03bf2cbcea 100644
--- a/build/files
+++ b/build/files
@@ -1221,7 +1221,6 @@ XWIN_LOWLEVEL_SRC =
     src/generic/caret.cpp
     src/generic/imaglist.cpp
     src/unix/dialup.cpp
-    src/unix/displayx11.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/joystick.cpp
@@ -1486,6 +1485,7 @@ GTK2_HDR =
 
 GTK1_LOWLEVEL_SRC =
     $(XWIN_LOWLEVEL_SRC)
+    src/unix/displayx11.cpp
     src/generic/icon.cpp
     src/generic/paletteg.cpp
     src/generic/textmeasure.cpp
@@ -1651,6 +1651,7 @@ GTK1_HDR =
 
 MOTIF_LOWLEVEL_SRC =
     $(XWIN_LOWLEVEL_SRC)
+    src/unix/displayx11.cpp
     src/generic/textmeasure.cpp
     src/x11/bitmap.cpp
     src/x11/brush.cpp
@@ -1814,6 +1815,7 @@ MOTIF_HDR =
 
 X11_LOWLEVEL_SRC =
     $(XWIN_LOWLEVEL_SRC)
+    src/unix/displayx11.cpp
     src/generic/icon.cpp
     src/generic/textmeasure.cpp
     src/generic/timer.cpp
diff --git a/include/wx/unix/private/displayx11.h b/include/wx/unix/private/displayx11.h
new file mode 100644
index 0000000000..ea993ca249
--- /dev/null
+++ b/include/wx/unix/private/displayx11.h
@@ -0,0 +1,177 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/unix/private/displayx11.h
+// Purpose:     Helper functions used by wxX11 and wxGTK ports
+// Author:      Vadim Zeitlin
+// Created:     2018-10-04 (extracted from src/unix/displayx11.cpp)
+// Copyright:   (c) 2002-2018 wxWindows team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_UNIX_PRIVATE_DISPLAYX11_H_
+#define _WX_UNIX_PRIVATE_DISPLAYX11_H_
+
+#include "wx/log.h"
+#include "wx/translation.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
+#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
+
+#include <X11/extensions/xf86vmode.h>
+
+//
+//  See (http://www.xfree86.org/4.2.0/XF86VidModeDeleteModeLine.3.html) for more
+//  info about xf86 video mode extensions
+//
+
+//free private data common to x (usually s3) servers
+#define wxClearXVM(vm)  if(vm.privsize) XFree(vm.c_private)
+
+// Correct res rate from GLFW
+#define wxCRR2(v,dc) (int) (((1000.0f * (float) dc) /*PIXELS PER SECOND */) / ((float) v.htotal * v.vtotal /*PIXELS PER FRAME*/) + 0.5f)
+#define wxCRR(v) wxCRR2(v,v.dotclock)
+#define wxCVM2(v, dc, display, nScreen) wxVideoMode(v.hdisplay, v.vdisplay, DefaultDepth(display, nScreen), wxCRR2(v,dc))
+#define wxCVM(v, display, nScreen) wxCVM2(v, v.dotclock, display, nScreen)
+
+wxArrayVideoModes wxXF86VidMode_GetModes(const wxVideoMode& mode, Display* display, int nScreen)
+{
+    XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
+    int nNumModes; //Number of modes enumerated....
+
+    wxArrayVideoModes Modes; //modes to return...
+
+    if (XF86VidModeGetAllModeLines(display, nScreen, &nNumModes, &ppXModes))
+    {
+        for (int i = 0; i < nNumModes; ++i)
+        {
+            XF86VidModeModeInfo& info = *ppXModes[i];
+            const wxVideoMode vm = wxCVM(info, display, nScreen);
+            if (vm.Matches(mode))
+            {
+                Modes.Add(vm);
+            }
+            wxClearXVM(info);
+        //  XFree(ppXModes[i]); //supposed to free?
+        }
+        XFree(ppXModes);
+    }
+    else //OOPS!
+    {
+        wxLogSysError(_("Failed to enumerate video modes"));
+    }
+
+    return Modes;
+}
+
+wxVideoMode wxXF86VidMode_GetCurrentMode(Display* display, int nScreen)
+{
+  XF86VidModeModeLine VM;
+  int nDotClock;
+  if ( !XF86VidModeGetModeLine(display, nScreen, &nDotClock, &VM) )
+      return wxVideoMode();
+
+  wxClearXVM(VM);
+  return wxCVM2(VM, nDotClock, display, nScreen);
+}
+
+bool wxXF86VidMode_ChangeMode(const wxVideoMode& mode, Display* display, int nScreen)
+{
+    XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
+    int nNumModes; //Number of modes enumerated....
+
+    if(!XF86VidModeGetAllModeLines(display, nScreen, &nNumModes, &ppXModes))
+    {
+        wxLogSysError(_("Failed to change video mode"));
+        return false;
+    }
+
+    bool bRet = false;
+    if (mode == wxDefaultVideoMode)
+    {
+        bRet = XF86VidModeSwitchToMode(display, nScreen, ppXModes[0]) != 0;
+
+        for (int i = 0; i < nNumModes; ++i)
+        {
+            wxClearXVM((*ppXModes[i]));
+        //  XFree(ppXModes[i]); //supposed to free?
+        }
+    }
+    else
+    {
+        for (int i = 0; i < nNumModes; ++i)
+        {
+            if (!bRet &&
+                ppXModes[i]->hdisplay == mode.GetWidth() &&
+                ppXModes[i]->vdisplay == mode.GetHeight() &&
+                wxCRR((*ppXModes[i])) == mode.GetRefresh())
+            {
+                //switch!
+                bRet = XF86VidModeSwitchToMode(display, nScreen, ppXModes[i]) != 0;
+            }
+            wxClearXVM((*ppXModes[i]));
+        //  XFree(ppXModes[i]); //supposed to free?
+        }
+    }
+
+    XFree(ppXModes);
+
+    return bRet;
+}
+
+#else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
+
+wxArrayVideoModes wxX11_GetModes(const wxDisplayImpl* impl, const wxVideoMode& modeMatch, Display* display)
+{
+    int count_return;
+    int* depths = XListDepths(display, 0, &count_return);
+    wxArrayVideoModes modes;
+    if ( depths )
+    {
+        const wxRect rect = impl->GetGeometry();
+        for ( int x = 0; x < count_return; ++x )
+        {
+            wxVideoMode mode(rect.width, rect.height, depths[x]);
+            if ( mode.Matches(modeMatch) )
+            {
+                modes.Add(mode);
+            }
+        }
+
+        XFree(depths);
+    }
+    return modes;
+}
+
+#endif // !HAVE_X11_EXTENSIONS_XF86VMODE_H
+
+void wxGetWorkAreaX11(Screen* screen, int& x, int& y, int& width, int& height)
+{
+    Display* display = DisplayOfScreen(screen);
+    Atom property = XInternAtom(display, "_NET_WORKAREA", true);
+    if (property)
+    {
+        Atom actual_type;
+        int actual_format;
+        unsigned long nitems;
+        unsigned long bytes_after;
+        unsigned char* data = NULL;
+        Status status = XGetWindowProperty(
+            display, RootWindowOfScreen(screen), property,
+            0, 4, false, XA_CARDINAL,
+            &actual_type, &actual_format, &nitems, &bytes_after, &data);
+        if (status == Success && actual_type == XA_CARDINAL &&
+            actual_format == 32 && nitems == 4)
+        {
+            const long* p = (long*)data;
+            x = p[0];
+            y = p[1];
+            width = p[2];
+            height = p[3];
+        }
+        if (data)
+            XFree(data);
+    }
+}
+
+#endif // _WX_UNIX_PRIVATE_DISPLAYX11_H_
diff --git a/src/gtk/display.cpp b/src/gtk/display.cpp
index 5f9c28c2d5..b9eedf910b 100644
--- a/src/gtk/display.cpp
+++ b/src/gtk/display.cpp
@@ -12,6 +12,12 @@
 
 #include "wx/gtk/private/wrapgtk.h"
 #ifdef GDK_WINDOWING_X11
+    #ifndef __WXGTK4__
+        #include "wx/unix/private/displayx11.h"
+
+        #define wxGTK_HAVE_X11_DISPLAY
+    #endif
+
     #include <gdk/gdkx.h>
 #endif
 
@@ -23,10 +29,6 @@ GdkWindow* wxGetTopLevelGDK();
 
 #ifndef __WXGTK4__
 
-#ifdef GDK_WINDOWING_X11
-void wxGetWorkAreaX11(Screen* screen, int& x, int& y, int& width, int& height);
-#endif
-
 #ifndef __WXGTK3__
 static inline int wx_gdk_screen_get_primary_monitor(GdkScreen* screen)
 {
@@ -51,7 +53,7 @@ wx_gdk_screen_get_monitor_workarea(GdkScreen* screen, int monitor, GdkRectangle*
 #endif
     {
         gdk_screen_get_monitor_geometry(screen, monitor, dest);
-#ifdef GDK_WINDOWING_X11
+#ifdef wxGTK_HAVE_X11_DISPLAY
 #ifdef __WXGTK3__
         if (GDK_IS_X11_SCREEN(screen))
 #endif
@@ -63,7 +65,7 @@ wx_gdk_screen_get_monitor_workarea(GdkScreen* screen, int monitor, GdkRectangle*
             if (rect.width && rect.height)
                 gdk_rectangle_intersect(dest, &rect, dest);
         }
-#endif // GDK_WINDOWING_X11
+#endif // wxGTK_HAVE_X11_DISPLAY
     }
     wxGCC_WARNING_RESTORE()
 }
@@ -216,17 +218,10 @@ bool wxDisplayImplGTK::IsPrimary() const
 #endif
 }
 
-#if defined(GDK_WINDOWING_X11) && !defined(__WXGTK4__)
-wxArrayVideoModes wxXF86VidMode_GetModes(const wxVideoMode& mode, Display* pDisplay, int nScreen);
-wxVideoMode wxXF86VidMode_GetCurrentMode(Display* display, int nScreen);
-bool wxXF86VidMode_ChangeMode(const wxVideoMode& mode, Display* display, int nScreen);
-wxArrayVideoModes wxX11_GetModes(const wxDisplayImpl* impl, const wxVideoMode& modeMatch, Display* display);
-#endif
-
 wxArrayVideoModes wxDisplayImplGTK::GetModes(const wxVideoMode& mode) const
 {
     wxArrayVideoModes modes;
-#if defined(GDK_WINDOWING_X11) && !defined(__WXGTK4__)
+#ifdef wxGTK_HAVE_X11_DISPLAY
 #ifdef __WXGTK3__
     if (GDK_IS_X11_SCREEN(m_screen))
 #endif
@@ -248,7 +243,7 @@ wxArrayVideoModes wxDisplayImplGTK::GetModes(const wxVideoMode& mode) const
 wxVideoMode wxDisplayImplGTK::GetCurrentMode() const
 {
     wxVideoMode mode;
-#if defined(GDK_WINDOWING_X11) && defined(HAVE_X11_EXTENSIONS_XF86VMODE_H) && !defined(__WXGTK4__)
+#if defined(wxGTK_HAVE_X11_DISPLAY) && defined(HAVE_X11_EXTENSIONS_XF86VMODE_H)
 #ifdef __WXGTK3__
     if (GDK_IS_X11_SCREEN(m_screen))
 #endif
@@ -264,7 +259,7 @@ wxVideoMode wxDisplayImplGTK::GetCurrentMode() const
 bool wxDisplayImplGTK::ChangeMode(const wxVideoMode& mode)
 {
     bool success = false;
-#if defined(GDK_WINDOWING_X11) && defined(HAVE_X11_EXTENSIONS_XF86VMODE_H) && !defined(__WXGTK4__)
+#if defined(wxGTK_HAVE_X11_DISPLAY) && defined(HAVE_X11_EXTENSIONS_XF86VMODE_H)
 #ifdef __WXGTK3__
     if (GDK_IS_X11_SCREEN(m_screen))
 #endif
diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index b1794b5127..4e317ca6a0 100644
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -29,17 +29,8 @@
     #include "wx/log.h"
 #endif /* WX_PRECOMP */
 
-#ifdef __WXGTK20__
-    #include <gdk/gdk.h> // GDK_WINDOWING_X11
-#endif
-#if !defined(__WXGTK20__) || defined(GDK_WINDOWING_X11)
-    #include <X11/Xlib.h>
-    #include <X11/Xatom.h>
-#endif
-
 #include "wx/private/display.h"
-
-#ifndef __WXGTK20__
+#include "wx/unix/private/displayx11.h"
 
 static wxRect wxGetMainScreenWorkArea();
 
@@ -70,12 +61,8 @@ protected:
     }
 };
 
-#endif // !__WXGTK20__
-
 #if wxUSE_DISPLAY
 
-#ifndef __WXGTK20__
-
 #include <X11/extensions/Xinerama.h>
 
 typedef XineramaScreenInfo ScreenInfo;
@@ -189,118 +176,13 @@ wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(unsigned n)
 
     return n < screens.GetCount() ? new wxDisplayImplX11(n, screens[n]) : NULL;
 }
-#endif // !__WXGTK20__
 
 // ============================================================================
 // wxDisplayImplX11 implementation
 // ============================================================================
 
-#if !defined(__WXGTK20__) || defined(GDK_WINDOWING_X11)
-
 #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
 
-#include <X11/extensions/xf86vmode.h>
-
-//
-//  See (http://www.xfree86.org/4.2.0/XF86VidModeDeleteModeLine.3.html) for more
-//  info about xf86 video mode extensions
-//
-
-//free private data common to x (usually s3) servers
-#define wxClearXVM(vm)  if(vm.privsize) XFree(vm.c_private)
-
-// Correct res rate from GLFW
-#define wxCRR2(v,dc) (int) (((1000.0f * (float) dc) /*PIXELS PER SECOND */) / ((float) v.htotal * v.vtotal /*PIXELS PER FRAME*/) + 0.5f)
-#define wxCRR(v) wxCRR2(v,v.dotclock)
-#define wxCVM2(v, dc, display, nScreen) wxVideoMode(v.hdisplay, v.vdisplay, DefaultDepth(display, nScreen), wxCRR2(v,dc))
-#define wxCVM(v, display, nScreen) wxCVM2(v, v.dotclock, display, nScreen)
-
-wxArrayVideoModes wxXF86VidMode_GetModes(const wxVideoMode& mode, Display* display, int nScreen)
-{
-    XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
-    int nNumModes; //Number of modes enumerated....
-
-    wxArrayVideoModes Modes; //modes to return...
-
-    if (XF86VidModeGetAllModeLines(display, nScreen, &nNumModes, &ppXModes))
-    {
-        for (int i = 0; i < nNumModes; ++i)
-        {
-            XF86VidModeModeInfo& info = *ppXModes[i];
-            const wxVideoMode vm = wxCVM(info, display, nScreen);
-            if (vm.Matches(mode))
-            {
-                Modes.Add(vm);
-            }
-            wxClearXVM(info);
-        //  XFree(ppXModes[i]); //supposed to free?
-        }
-        XFree(ppXModes);
-    }
-    else //OOPS!
-    {
-        wxLogSysError(_("Failed to enumerate video modes"));
-    }
-
-    return Modes;
-}
-
-wxVideoMode wxXF86VidMode_GetCurrentMode(Display* display, int nScreen)
-{
-  XF86VidModeModeLine VM;
-  int nDotClock;
-  if ( !XF86VidModeGetModeLine(display, nScreen, &nDotClock, &VM) )
-      return wxVideoMode();
-
-  wxClearXVM(VM);
-  return wxCVM2(VM, nDotClock, display, nScreen);
-}
-
-bool wxXF86VidMode_ChangeMode(const wxVideoMode& mode, Display* display, int nScreen)
-{
-    XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
-    int nNumModes; //Number of modes enumerated....
-
-    if(!XF86VidModeGetAllModeLines(display, nScreen, &nNumModes, &ppXModes))
-    {
-        wxLogSysError(_("Failed to change video mode"));
-        return false;
-    }
-
-    bool bRet = false;
-    if (mode == wxDefaultVideoMode)
-    {
-        bRet = XF86VidModeSwitchToMode(display, nScreen, ppXModes[0]) != 0;
-
-        for (int i = 0; i < nNumModes; ++i)
-        {
-            wxClearXVM((*ppXModes[i]));
-        //  XFree(ppXModes[i]); //supposed to free?
-        }
-    }
-    else
-    {
-        for (int i = 0; i < nNumModes; ++i)
-        {
-            if (!bRet &&
-                ppXModes[i]->hdisplay == mode.GetWidth() &&
-                ppXModes[i]->vdisplay == mode.GetHeight() &&
-                wxCRR((*ppXModes[i])) == mode.GetRefresh())
-            {
-                //switch!
-                bRet = XF86VidModeSwitchToMode(display, nScreen, ppXModes[i]) != 0;
-            }
-            wxClearXVM((*ppXModes[i]));
-        //  XFree(ppXModes[i]); //supposed to free?
-        }
-    }
-
-    XFree(ppXModes);
-
-    return bRet;
-}
-
-#ifndef __WXGTK20__
 wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& modeMatch) const
 {
     Display* display = static_cast<Display*>(wxGetDisplay());
@@ -321,33 +203,9 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
     int nScreen = DefaultScreen(display);
     return wxXF86VidMode_ChangeMode(mode, display, nScreen);
 }
-#endif // !__WXGTK20__
 
 #else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
 
-wxArrayVideoModes wxX11_GetModes(const wxDisplayImpl* impl, const wxVideoMode& modeMatch, Display* display)
-{
-    int count_return;
-    int* depths = XListDepths(display, 0, &count_return);
-    wxArrayVideoModes modes;
-    if ( depths )
-    {
-        const wxRect rect = impl->GetGeometry();
-        for ( int x = 0; x < count_return; ++x )
-        {
-            wxVideoMode mode(rect.width, rect.height, depths[x]);
-            if ( mode.Matches(modeMatch) )
-            {
-                modes.Add(mode);
-            }
-        }
-
-        XFree(depths);
-    }
-    return modes;
-}
-
-#ifndef __WXGTK20__
 wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& modeMatch) const
 {
     Display* display = static_cast<Display*>(wxGetDisplay());
@@ -365,16 +223,15 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
     // Not implemented
     return false;
 }
-#endif // !__WXGTK20__
+
 #endif // !HAVE_X11_EXTENSIONS_XF86VMODE_H
-#endif // !defined(__WXGTK20__) || defined(GDK_WINDOWING_X11)
+
 #endif // wxUSE_DISPLAY
 
 // ============================================================================
 // wxDisplay::CreateFactory()
 // ============================================================================
 
-#ifndef __WXGTK20__
 /* static */ wxDisplayFactory *wxDisplay::CreateFactory()
 {
 #if wxUSE_DISPLAY
@@ -384,40 +241,6 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
 
     return new wxDisplayFactorySingleX11;
 }
-#endif
-
-#if !defined(__WXGTK20__) || defined(GDK_WINDOWING_X11)
-void wxGetWorkAreaX11(Screen* screen, int& x, int& y, int& width, int& height)
-{
-    Display* display = DisplayOfScreen(screen);
-    Atom property = XInternAtom(display, "_NET_WORKAREA", true);
-    if (property)
-    {
-        Atom actual_type;
-        int actual_format;
-        unsigned long nitems;
-        unsigned long bytes_after;
-        unsigned char* data = NULL;
-        Status status = XGetWindowProperty(
-            display, RootWindowOfScreen(screen), property,
-            0, 4, false, XA_CARDINAL,
-            &actual_type, &actual_format, &nitems, &bytes_after, &data);
-        if (status == Success && actual_type == XA_CARDINAL &&
-            actual_format == 32 && nitems == 4)
-        {
-            const long* p = (long*)data;
-            x = p[0];
-            y = p[1];
-            width = p[2];
-            height = p[3];
-        }
-        if (data)
-            XFree(data);
-    }
-}
-#endif // !defined(__WXGTK20__) || defined(GDK_WINDOWING_X11)
-
-#ifndef __WXGTK20__
 
 wxRect wxGetMainScreenWorkArea()
 {
@@ -447,5 +270,3 @@ wxRect wxGetMainScreenWorkArea()
 
     return rect;
 }
-
-#endif // !__WXGTK20__