diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e514245d..10a4a8f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -101,7 +101,8 @@ jobs:
           - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest,   }
           - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "x11,x11-dlopen" }
           - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "wayland,wayland-dlopen" }
-          - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "kms" }
+          # Build with default Winit backends.
+          - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, options: --no-default-features, features: "kms,winit/default" }
           - { target: x86_64-unknown-redox,     os: ubuntu-latest,   }
           - { target: x86_64-unknown-freebsd,   os: ubuntu-latest,   }
           - { target: x86_64-unknown-netbsd,    os: ubuntu-latest, options: --no-default-features, features: "x11,x11-dlopen,wayland,wayland-dlopen"  }
diff --git a/Cargo.toml b/Cargo.toml
index fa34ffaf..e560eb0c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,8 +26,10 @@ wayland = [
     "memmap2",
     "rustix",
     "fastrand",
+    "winit/wayland",
+    "winit/wayland-csd-adwaita",
 ]
-wayland-dlopen = ["wayland-sys/dlopen"]
+wayland-dlopen = ["wayland-sys/dlopen", "winit/wayland-dlopen"]
 x11 = [
     "as-raw-xcb-connection",
     "bytemuck",
@@ -35,6 +37,7 @@ x11 = [
     "rustix",
     "tiny-xlib",
     "x11rb",
+    "winit/x11",
 ]
 x11-dlopen = ["tiny-xlib/dlopen", "x11rb/dl-libxcb"]
 
@@ -133,7 +136,7 @@ redox_syscall = "0.7"
 [dev-dependencies]
 colorous = "1.0.12"
 web-time = "1.0.0"
-winit = "0.30.0"
+winit = { version = "0.30.0", default-features = false, features = ["rwh_06"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 glam = { version = "0.30.10", features = ["rand"] }
 rand = "0.9.2"