diff --git a/app/headless/backend_test.go b/gpu/headless/backend_test.go
similarity index 100%
rename from app/headless/backend_test.go
rename to gpu/headless/backend_test.go
diff --git a/app/headless/gen.go b/gpu/headless/gen.go
similarity index 100%
rename from app/headless/gen.go
rename to gpu/headless/gen.go
diff --git a/app/headless/headless.go b/gpu/headless/headless.go
similarity index 100%
rename from app/headless/headless.go
rename to gpu/headless/headless.go
diff --git a/app/headless/headless_darwin.go b/gpu/headless/headless_darwin.go
similarity index 100%
rename from app/headless/headless_darwin.go
rename to gpu/headless/headless_darwin.go
diff --git a/app/headless/headless_egl.go b/gpu/headless/headless_egl.go
similarity index 100%
rename from app/headless/headless_egl.go
rename to gpu/headless/headless_egl.go
diff --git a/app/headless/headless_gl.go b/gpu/headless/headless_gl.go
similarity index 100%
rename from app/headless/headless_gl.go
rename to gpu/headless/headless_gl.go
diff --git a/app/headless/headless_ios.m b/gpu/headless/headless_ios.m
similarity index 100%
rename from app/headless/headless_ios.m
rename to gpu/headless/headless_ios.m
diff --git a/app/headless/headless_js.go b/gpu/headless/headless_js.go
similarity index 100%
rename from app/headless/headless_js.go
rename to gpu/headless/headless_js.go
diff --git a/app/headless/headless_macos.m b/gpu/headless/headless_macos.m
similarity index 100%
rename from app/headless/headless_macos.m
rename to gpu/headless/headless_macos.m
diff --git a/app/headless/headless_test.go b/gpu/headless/headless_test.go
similarity index 100%
rename from app/headless/headless_test.go
rename to gpu/headless/headless_test.go
diff --git a/app/headless/headless_windows.go b/gpu/headless/headless_windows.go
similarity index 100%
rename from app/headless/headless_windows.go
rename to gpu/headless/headless_windows.go
diff --git a/app/headless/shaders.go b/gpu/headless/shaders.go
similarity index 100%
rename from app/headless/shaders.go
rename to gpu/headless/shaders.go
diff --git a/app/headless/shaders/input.vert b/gpu/headless/shaders/input.vert
similarity index 100%
rename from app/headless/shaders/input.vert
rename to gpu/headless/shaders/input.vert
diff --git a/app/headless/shaders/simple.frag b/gpu/headless/shaders/simple.frag
similarity index 100%
rename from app/headless/shaders/simple.frag
rename to gpu/headless/shaders/simple.frag
diff --git a/app/headless/shaders/simple.vert b/gpu/headless/shaders/simple.vert
similarity index 100%
rename from app/headless/shaders/simple.vert
rename to gpu/headless/shaders/simple.vert
diff --git a/internal/rendertest/bench_test.go b/internal/rendertest/bench_test.go
index d83578e4..10fe0ccc 100644
--- a/internal/rendertest/bench_test.go
+++ b/internal/rendertest/bench_test.go
@@ -6,9 +6,9 @@ import (
 	"math"
 	"testing"
 
-	"gioui.org/app/headless"
 	"gioui.org/f32"
 	"gioui.org/font/gofont"
+	"gioui.org/gpu/headless"
 	"gioui.org/layout"
 	"gioui.org/op"
 	"gioui.org/op/clip"
diff --git a/internal/rendertest/util_test.go b/internal/rendertest/util_test.go
index f86f40e6..5e87d284 100644
--- a/internal/rendertest/util_test.go
+++ b/internal/rendertest/util_test.go
@@ -17,8 +17,8 @@ import (
 
 	"golang.org/x/image/colornames"
 
-	"gioui.org/app/headless"
 	"gioui.org/f32"
+	"gioui.org/gpu/headless"
 	"gioui.org/internal/f32color"
 	"gioui.org/op"
 	"gioui.org/op/paint"