--- Remmina-git-7be0cf234.old/plugins/python_wrapper/python_wrapper_plugin.c
+++ Remmina-git-7be0cf234/plugins/python_wrapper/python_wrapper_plugin.c
@@ -39,8 +39,6 @@
 #include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
-#elif defined(GDK_WINDOWING_WAYLAND)
-#include <gdk/gdkwayland.h>
 #endif
 #include "config.h"
 #include "remmina/plugin.h"
--- Remmina-git-7be0cf234.old/plugins/rdp/rdp_plugin.c
+++ Remmina-git-7be0cf234/plugins/rdp/rdp_plugin.c
@@ -87,8 +87,6 @@
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 #include <gdk/gdkx.h>
-#elif defined(GDK_WINDOWING_WAYLAND)
-#include <gdk/gdkwayland.h>
 #endif
 
 #if defined(__FreeBSD__)
--- Remmina-git-7be0cf234.old/plugins/rdp/rdp_plugin.h
+++ Remmina-git-7be0cf234/plugins/rdp/rdp_plugin.h
@@ -49,8 +49,6 @@
 #include <freerdp/client/disp.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
-#elif defined(GDK_WINDOWING_WAYLAND)
-#include <gdk/gdkwayland.h>
 #endif
 
 #include <winpr/clipboard.h>
--- Remmina-git-7be0cf234.old/plugins/x2go/x2go_plugin.c
+++ Remmina-git-7be0cf234/plugins/x2go/x2go_plugin.c
@@ -47,8 +47,6 @@
 #include <gtk/gtkx.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
-#elif defined(GDK_WINDOWING_WAYLAND)
-#include <gdk/gdkwayland.h>
 #endif
 
 #include <X11/Xlib.h>
--- Remmina-git-7be0cf234.old/src/rcw.c
+++ Remmina-git-7be0cf234/src/rcw.c
@@ -67,11 +67,6 @@
 #include "remmina_widget_pool.h"
 #include "remmina/remmina_trace_calls.h"
 
-#ifdef GDK_WINDOWING_WAYLAND
-#include <gdk/gdkwayland.h>
-#endif
-
-
 #define DEBUG_KB_GRABBING 0
 #include "remmina_exec.h"
 
@@ -1063,13 +1058,6 @@
 	 * and gdk_monitor_get_workarea() seem to have been divided by the
 	 * gdk scale factor, so we need to adjust the returned rect
 	 * undoing the division */
-#ifdef GDK_WINDOWING_WAYLAND
-	if (GDK_IS_WAYLAND_DISPLAY(display)) {
-		int monitor_scale_factor = gdk_monitor_get_scale_factor(monitor);
-		monitor_geometry.width *= monitor_scale_factor;
-		monitor_geometry.height *= monitor_scale_factor;
-	}
-#endif
 #elif gdk_screen_get_monitor_workarea
 	gdk_screen_get_monitor_workarea(screen, monitor, &monitor_geometry);
 #else
@@ -3989,14 +3977,6 @@
 		return;
 	}
 
-#ifdef GDK_WINDOWING_WAYLAND
-	if (GDK_IS_WAYLAND_DISPLAY(d)) {
-		REMMINA_DEBUG("Multimonitor not effective in Wayland mode");
-		return;
-	}
-#endif
-
-
 	for (int i = 0 ; i < gdk_display_get_n_monitors(d) ; i++) {
 		GdkRectangle display_placement;
 		gdk_monitor_get_workarea(gdk_display_get_monitor(gtk_widget_get_display(tboverlay), i), &display_placement);
--- Remmina-git-7be0cf234.old/src/remmina.c
+++ Remmina-git-7be0cf234/src/remmina.c
@@ -41,8 +41,6 @@
 #endif  /* G_LOG_DOMAIN */
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
-#elif defined(GDK_WINDOWING_WAYLAND)
-#include <gdk/gdkwayland.h>
 #endif
 #include <gio/gio.h>
 #include <glib/gi18n.h>
--- Remmina-git-7be0cf234.old/src/remmina_curl_connector.c
+++ Remmina-git-7be0cf234/src/remmina_curl_connector.c
@@ -46,10 +46,6 @@
 #include "remmina/remmina_trace_calls.h"
 #include "remmina_utils.h"
 
-
-#ifdef GDK_WINDOWING_WAYLAND
-	#include <gdk/gdkwayland.h>
-#endif
 #ifdef GDK_WINDOWING_X11
 	#include <gdk/gdkx.h>
 #endif
--- Remmina-git-7be0cf234.old/src/remmina_info.c
+++ Remmina-git-7be0cf234/src/remmina_info.c
@@ -159,9 +159,6 @@
 #include "remmina/remmina_trace_calls.h"
 #include "remmina_plugin_manager.h"
 
-#ifdef GDK_WINDOWING_WAYLAND
-	#include <gdk/gdkwayland.h>
-#endif
 #ifdef GDK_WINDOWING_X11
 	#include <gdk/gdkx.h>
 #endif
@@ -560,11 +557,6 @@
 
 	disp = gdk_display_get_default();
 
-#ifdef GDK_WINDOWING_WAYLAND
-	if (GDK_IS_WAYLAND_DISPLAY(disp)) {
-		bkend = "Wayland";
-	}else
-#endif
 #ifdef GDK_WINDOWING_X11
 	if (GDK_IS_X11_DISPLAY(disp)) {
 		bkend = "X11";
--- Remmina-git-7be0cf234.old/src/remmina_plugin_manager.c
+++ Remmina-git-7be0cf234/src/remmina_plugin_manager.c
@@ -44,8 +44,6 @@
 #include <json-glib/json-glib.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
-#elif defined(GDK_WINDOWING_WAYLAND)
-#include <gdk/gdkwayland.h>
 #endif
 #include "remmina_public.h"
 #include "remmina_main.h"
--- Remmina-git-7be0cf234.old/src/remmina_plugin_native.c
+++ Remmina-git-7be0cf234/src/remmina_plugin_native.c
@@ -41,8 +41,6 @@
 
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
-#elif defined(GDK_WINDOWING_WAYLAND)
-#include <gdk/gdkwayland.h>
 #endif
 
 #include "remmina_public.h"
--- Remmina-git-7be0cf234.old/src/remmina_pref_dialog.c
+++ Remmina-git-7be0cf234/src/remmina_pref_dialog.c
@@ -57,9 +57,6 @@
 #include "remmina_pref.h"
 #include "remmina_pref_dialog.h"
 #include "remmina/remmina_trace_calls.h"
-#ifdef GDK_WINDOWING_WAYLAND
-	#include <gdk/gdkwayland.h>
-#endif
 
 static RemminaPrefDialog *remmina_pref_dialog;
 
@@ -474,12 +471,7 @@
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_start_fullscreen), remmina_pref.start_fullscreen);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_start_dynres), remmina_pref.start_dynres);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_move_toolbar_multimon), remmina_pref.toolbar_fix_position_multimon);
-	// This option has no effect in Wayland, so we don't need to show it
-#ifdef GDK_WINDOWING_WAYLAND
-	if (GDK_IS_WAYLAND_DISPLAY(gtk_widget_get_display(GTK_WIDGET(remmina_pref_dialog->checkbutton_move_toolbar_multimon)))) {
-		gtk_widget_hide(GTK_WIDGET(remmina_pref_dialog->checkbutton_move_toolbar_multimon));
-	}
-#endif
+
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_hide_toolbar), remmina_pref.hide_connection_toolbar);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(remmina_pref_dialog->checkbutton_appearance_hide_searchbar), remmina_pref.hide_searchbar);
 
--- Remmina-git-7be0cf234.old/src/remmina_protocol_widget.c
+++ Remmina-git-7be0cf234/src/remmina_protocol_widget.c
@@ -53,10 +53,6 @@
 #include "remmina_log.h"
 #include "remmina/remmina_trace_calls.h"
 
-#ifdef GDK_WINDOWING_WAYLAND
-#include <gdk/gdkwayland.h>
-#endif
-
 struct _RemminaProtocolWidgetPriv {
 	RemminaFile *		remmina_file;
 	RemminaProtocolPlugin * plugin;
--- Remmina-git-7be0cf234.old/src/remmina_public.c
+++ Remmina-git-7be0cf234/src/remmina_public.c
@@ -55,8 +55,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
-#elif defined(GDK_WINDOWING_WAYLAND)
-#include <gdk/gdkwayland.h>
 #endif
 #include "remmina_public.h"
 #include "remmina_utils.h"