diff --git a/app/datadir.go b/app/datadir.go
index 31e5453f..500a59ab 100644
--- a/app/datadir.go
+++ b/app/datadir.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build !android
 // +build !android
 
 package app
diff --git a/app/datadir_android.go b/app/datadir_android.go
index 0fc8178e..c4739e02 100644
--- a/app/datadir_android.go
+++ b/app/datadir_android.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build android
 // +build android
 
 package app
diff --git a/app/internal/log/log_ios.go b/app/internal/log/log_ios.go
index 6cc58a7a..ea784144 100644
--- a/app/internal/log/log_ios.go
+++ b/app/internal/log/log_ios.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build darwin && ios
 // +build darwin,ios
 
 package log
diff --git a/app/internal/windows/windows.go b/app/internal/windows/windows.go
index 8af575e7..8edc3c13 100644
--- a/app/internal/windows/windows.go
+++ b/app/internal/windows/windows.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build windows
 // +build windows
 
 package windows
diff --git a/app/internal/wm/egl_wayland.go b/app/internal/wm/egl_wayland.go
index f0012865..685b0c53 100644
--- a/app/internal/wm/egl_wayland.go
+++ b/app/internal/wm/egl_wayland.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build (linux && !android && !nowayland) || freebsd
 // +build linux,!android,!nowayland freebsd
 
 package wm
diff --git a/app/internal/wm/egl_x11.go b/app/internal/wm/egl_x11.go
index dc15f149..ca8dd5ce 100644
--- a/app/internal/wm/egl_x11.go
+++ b/app/internal/wm/egl_x11.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build (linux && !android && !nox11) || freebsd || openbsd
 // +build linux,!android,!nox11 freebsd openbsd
 
 package wm
diff --git a/app/internal/wm/gl_ios.go b/app/internal/wm/gl_ios.go
index 65501716..547b6641 100644
--- a/app/internal/wm/gl_ios.go
+++ b/app/internal/wm/gl_ios.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build darwin && ios
 // +build darwin,ios
 
 package wm
diff --git a/app/internal/wm/gl_macos.go b/app/internal/wm/gl_macos.go
index 7fd49a0a..2d5ae365 100644
--- a/app/internal/wm/gl_macos.go
+++ b/app/internal/wm/gl_macos.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build darwin && !ios
 // +build darwin,!ios
 
 package wm
diff --git a/app/internal/wm/os_ios.go b/app/internal/wm/os_ios.go
index aa298396..d9e77cef 100644
--- a/app/internal/wm/os_ios.go
+++ b/app/internal/wm/os_ios.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build darwin && ios
 // +build darwin,ios
 
 package wm
diff --git a/app/internal/wm/os_macos.go b/app/internal/wm/os_macos.go
index 8d605e74..cac2bdd4 100644
--- a/app/internal/wm/os_macos.go
+++ b/app/internal/wm/os_macos.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build darwin && !ios
 // +build darwin,!ios
 
 package wm
diff --git a/app/internal/wm/os_unix.go b/app/internal/wm/os_unix.go
index d17ef7f3..c41dc9a5 100644
--- a/app/internal/wm/os_unix.go
+++ b/app/internal/wm/os_unix.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build (linux && !android) || freebsd || openbsd
 // +build linux,!android freebsd openbsd
 
 package wm
diff --git a/app/internal/wm/os_wayland.go b/app/internal/wm/os_wayland.go
index 6fa69526..5d7a0b0a 100644
--- a/app/internal/wm/os_wayland.go
+++ b/app/internal/wm/os_wayland.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build (linux && !android && !nowayland) || freebsd
 // +build linux,!android,!nowayland freebsd
 
 package wm
diff --git a/app/internal/wm/os_x11.go b/app/internal/wm/os_x11.go
index feb125de..b5d0ebd7 100644
--- a/app/internal/wm/os_x11.go
+++ b/app/internal/wm/os_x11.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build (linux && !android && !nox11) || freebsd || openbsd
 // +build linux,!android,!nox11 freebsd openbsd
 
 package wm
diff --git a/app/internal/wm/runmain.go b/app/internal/wm/runmain.go
index 46172170..0fa7a6cf 100644
--- a/app/internal/wm/runmain.go
+++ b/app/internal/wm/runmain.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build android || (darwin && ios)
 // +build android darwin,ios
 
 package wm
diff --git a/app/internal/xkb/xkb_unix.go b/app/internal/xkb/xkb_unix.go
index 9e5a6264..68b13291 100644
--- a/app/internal/xkb/xkb_unix.go
+++ b/app/internal/xkb/xkb_unix.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build (linux && !android) || freebsd || openbsd
 // +build linux,!android freebsd openbsd
 
 // Package xkb implements a Go interface for the X Keyboard Extension library.
diff --git a/app/sigpipe_darwin.go b/app/sigpipe_darwin.go
index aca19b74..74dd969b 100644
--- a/app/sigpipe_darwin.go
+++ b/app/sigpipe_darwin.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build !go1.14
 // +build !go1.14
 
 // Work around golang.org/issue/33384, fixed in CL 191785,
diff --git a/cmd/gogio/race_test.go b/cmd/gogio/race_test.go
index 07499364..1f3c689a 100644
--- a/cmd/gogio/race_test.go
+++ b/cmd/gogio/race_test.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build race
 // +build race
 
 package main_test
diff --git a/gpu/headless/headless_egl.go b/gpu/headless/headless_egl.go
index ea53b3ba..d08b9dda 100644
--- a/gpu/headless/headless_egl.go
+++ b/gpu/headless/headless_egl.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build linux || freebsd || windows || openbsd
 // +build linux freebsd windows openbsd
 
 package headless
diff --git a/gpu/headless/headless_gl.go b/gpu/headless/headless_gl.go
index c00083ee..6bfb28cf 100644
--- a/gpu/headless/headless_gl.go
+++ b/gpu/headless/headless_gl.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build !windows
 // +build !windows
 
 package headless
diff --git a/internal/egl/egl.go b/internal/egl/egl.go
index 8c0554fd..2b281d76 100644
--- a/internal/egl/egl.go
+++ b/internal/egl/egl.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build linux || windows || freebsd || openbsd
 // +build linux windows freebsd openbsd
 
 package egl
diff --git a/internal/egl/egl_unix.go b/internal/egl/egl_unix.go
index 38a8cb65..bd3efa5c 100644
--- a/internal/egl/egl_unix.go
+++ b/internal/egl/egl_unix.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build linux || freebsd || openbsd
 // +build linux freebsd openbsd
 
 package egl
diff --git a/internal/gl/gl_unix.go b/internal/gl/gl_unix.go
index 93f550c9..5992d41e 100644
--- a/internal/gl/gl_unix.go
+++ b/internal/gl/gl_unix.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build darwin || linux || freebsd || openbsd
 // +build darwin linux freebsd openbsd
 
 package gl
diff --git a/internal/gl/types.go b/internal/gl/types.go
index 821d3f69..dd24963c 100644
--- a/internal/gl/types.go
+++ b/internal/gl/types.go
@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package gl
diff --git a/io/key/mod.go b/io/key/mod.go
index c5db56cb..4b23d32c 100644
--- a/io/key/mod.go
+++ b/io/key/mod.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build !darwin
 // +build !darwin
 
 package key
diff --git a/layout/alloc_test.go b/layout/alloc_test.go
index f428c5a9..59f9c907 100644
--- a/layout/alloc_test.go
+++ b/layout/alloc_test.go
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Unlicense OR MIT
 
+//go:build !race
 // +build !race
 
 package layout