diff --git a/setup.py b/setup.py
index 0fd37222ee..b3120a5afd 100755
--- a/setup.py
+++ b/setup.py
@@ -2272,15 +2272,23 @@ def bundle_tests():
 tace(lz4_ENABLED, "xpra.net.lz4.lz4", "liblz4")
 
 if cythonize_more_ENABLED:
+    if client_ENABLED:
+        ace("xpra.client.base.fileprint_mixin")
+        #ace("xpra.client.base.top_client")
+        ace("xpra.client.base.gobject_client_base")
     if client_ENABLED and gtk3_ENABLED:
         ace("xpra.client.gtk3.cairo_backing")
         ace("xpra.client.gtk3.client")
         ace("xpra.client.gtk3.client_window")
+        ace("xpra.client.gtk3.gtk_client_base")
+        ace("xpra.client.gtk3.gtk_client_window_base")
         ace("xpra.client.gui.window_backing_base")
         ace("xpra.client.gui.window_base")
+        ace("xpra.client.gl.gl_window_backing_base")
     if codecs_ENABLED:
         ace("xpra.codecs.image_wrapper")
         ace("xpra.codecs.rgb_transform")
+        ace("xpra.codecs.video_helper")
     if http_ENABLED:
         ace("xpra.net.http.handler")
     ace("xpra.net.protocol.header")
@@ -2290,6 +2298,12 @@ def bundle_tests():
         ace("xpra.net.websockets.handler")
         ace("xpra.net.websockets.header")
         ace("xpra.net.websockets.protocol")
+    if quic_ENABLED:
+        ace("xpra.net.quic.client")
+        ace("xpra.net.quic.connection")
+        ace("xpra.net.quic.http")
+        ace("xpra.net.quic.listener")
+        ace("xpra.net.quic.websocket")
     ace("xpra.net.bytestreams")
     ace("xpra.net.crypto")
     ace("xpra.net.digest")
@@ -2297,8 +2311,42 @@ def bundle_tests():
     ace("xpra.net.mmap_pipe")
     ace("xpra.net.packet_encoding")
     ace("xpra.net.subprocess_wrapper")
-    ace("xpra.server.window.window_source")
-    ace("xpra.server.window.window_video_source")
+    if server_ENABLED:
+        ace("xpra.server.server_core")
+        ace("xpra.server.server_base")
+        ace("xpra.server.server_util")
+        ace("xpra.server.window.batch_delay_calculator")
+        ace("xpra.server.window.video_scoring")
+        ace("xpra.server.window.video_subregion")
+        ace("xpra.server.window.window_stats")
+        ace("xpra.server.window.window_source")
+        ace("xpra.server.window.window_video_source")
+    if x11_ENABLED:
+        ace("xpra.x11.gtk_x11.composite")
+        ace("xpra.x11.gtk_x11.window_damage")
+        ace("xpra.x11.models.core")
+        ace("xpra.x11.models.base")
+        ace("xpra.x11.models.or_window")
+        ace("xpra.x11.models.size_hints_util")
+        ace("xpra.x11.models.systray")
+        ace("xpra.x11.models.window")
+        ace("xpra.x11.server.core")
+        ace("xpra.x11.server.base")
+        ace("xpra.x11.server.expand")
+        ace("xpra.x11.server.seamless")
+        ace("xpra.x11.server.shadow")
+        ace("xpra.x11.vfb_util")
+        ace("xpra.x11.desktop.desktop_server_base")
+        ace("xpra.x11.desktop.desktop_server")
+        ace("xpra.x11.desktop.monitor_server")
+    ace("xpra.child_reaper")
+    ace("xpra.common")
+    ace("xpra.os_util")
+    ace("xpra.util")
+    ace("xpra.queue_scheduler")
+    ace("xpra.scaling_parser")
+    ace("xpra.simple_stats")
+    ace("xpra.splash_screen")
 
 
 if ext_modules: