diff --git a/app/headless/headless_windows.go b/app/headless/headless_windows.go
index 9a4911af..b82195a0 100644
--- a/app/headless/headless_windows.go
+++ b/app/headless/headless_windows.go
@@ -7,8 +7,6 @@ import (
 
 	"gioui.org/gpu"
 	"gioui.org/internal/d3d11"
-
-	_ "gioui.org/app/internal/d3d11"
 )
 
 type d3d11Context struct {
diff --git a/app/loop.go b/app/loop.go
index 444d344f..57aa11a5 100644
--- a/app/loop.go
+++ b/app/loop.go
@@ -10,8 +10,6 @@ import (
 	"gioui.org/app/internal/window"
 	"gioui.org/gpu"
 	"gioui.org/op"
-
-	_ "gioui.org/app/internal/d3d11"
 )
 
 type renderLoop struct {
diff --git a/gpu/gpu.go b/gpu/gpu.go
index 65427042..dac15b90 100644
--- a/gpu/gpu.go
+++ b/gpu/gpu.go
@@ -29,8 +29,9 @@ import (
 	"gioui.org/op"
 	"gioui.org/op/clip"
 
-	// Register backend.
+	// Register backends.
 	_ "gioui.org/gpu/gl"
+	_ "gioui.org/gpu/internal/d3d11"
 )
 
 type GPU interface {
diff --git a/app/internal/d3d11/backend.go b/gpu/internal/d3d11/backend.go
similarity index 100%
rename from app/internal/d3d11/backend.go
rename to gpu/internal/d3d11/backend.go
diff --git a/app/internal/d3d11/backend_windows.go b/gpu/internal/d3d11/backend_windows.go
similarity index 100%
rename from app/internal/d3d11/backend_windows.go
rename to gpu/internal/d3d11/backend_windows.go