diff --git a/repos/dde_linux/src/drivers/usb_host/spec/rpi/platform.cc b/repos/dde_linux/src/drivers/usb_host/spec/rpi/platform.cc
index 781b885311..4d76d02611 100644
--- a/repos/dde_linux/src/drivers/usb_host/spec/rpi/platform.cc
+++ b/repos/dde_linux/src/drivers/usb_host/spec/rpi/platform.cc
@@ -20,7 +20,6 @@
 /* emulation */
 #include <platform.h>
 #include <lx_emul.h>
-#include <timer_session/connection.h>
 
 /* dwc-otg */
 #define new new_
diff --git a/repos/dde_linux/src/include/lx_emul/impl/delay.h b/repos/dde_linux/src/include/lx_emul/impl/delay.h
index b9ddbbc459..523ed45fa6 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/delay.h
+++ b/repos/dde_linux/src/include/lx_emul/impl/delay.h
@@ -11,6 +11,15 @@
  * version 2.
  */
 
+/*
+ * Disable preprocessor macros that are incompatible to Genode headers for this
+ * file.
+ */
+#pragma push_macro("max")
+#pragma push_macro("min")
+#undef max
+#undef min
+
 /* Genode includes */
 #include <timer_session/connection.h>
 
@@ -49,3 +58,7 @@ void msleep(unsigned int msecs)
 
 
 void mdelay(unsigned long msecs) { msleep(msecs); }
+
+
+#pragma pop_macro("max")
+#pragma pop_macro("min")
diff --git a/repos/dde_linux/src/lib/usb/spec/rpi/platform.cc b/repos/dde_linux/src/lib/usb/spec/rpi/platform.cc
index 13fda8ada0..b16e520879 100644
--- a/repos/dde_linux/src/lib/usb/spec/rpi/platform.cc
+++ b/repos/dde_linux/src/lib/usb/spec/rpi/platform.cc
@@ -20,7 +20,6 @@
 /* emulation */
 #include <platform.h>
 #include <lx_emul.h>
-#include <timer_session/connection.h>
 
 /* dwc-otg */
 #define new new_