diff --git a/platform/xen/rumpxendev/busdev.c b/platform/xen/rumpxendev/busdev.c
index 7e37f939c..f731e8218 100644
--- a/platform/xen/rumpxendev/busdev.c
+++ b/platform/xen/rumpxendev/busdev.c
@@ -65,11 +65,8 @@ __KERNEL_RCSID(0, "$NetBSD: $");
 
 #include <xen/io/xs_wire.h>
 
-#pragma GCC diagnostic ignored "-Wcast-qual"
-/* mini-os/os.h has some bad casts */
 #include <mini-os/xenbus.h>
 #include <mini-os/wait.h>
-#pragma GCC diagnostic error "-Wcast-qual"
 
 /*----- data structures -----*/
 
diff --git a/platform/xen/rumpxendev/evtdev.c b/platform/xen/rumpxendev/evtdev.c
index 99276512a..cef5883b9 100644
--- a/platform/xen/rumpxendev/evtdev.c
+++ b/platform/xen/rumpxendev/evtdev.c
@@ -36,11 +36,8 @@
 #include <bmk-rumpuser/rumpuser.h>
 #include <bmk-core/memalloc.h>
 
-#pragma GCC diagnostic ignored "-Wcast-qual"
-/* mini-os/os.h has some bad casts */
 #include <mini-os/events.h>
 #include <mini-os/wait.h>
-#pragma GCC diagnostic error "-Wcast-qual"
 
 /* For ioctl interface. */
 #include "xenio3.h"