diff --git a/dynamic/dynamic_test.go b/dynamic/dynamic_test.go
index c86bc93..3ab2505 100644
--- a/dynamic/dynamic_test.go
+++ b/dynamic/dynamic_test.go
@@ -1,3 +1,4 @@
+//go:build linux || darwin
 // +build linux darwin
 
 package main
diff --git a/dynamic/plugin.go b/dynamic/plugin.go
index ed98769..fcf3e73 100644
--- a/dynamic/plugin.go
+++ b/dynamic/plugin.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/xxhash_amd64.go b/xxhash_amd64.go
index ad14b80..0ae847f 100644
--- a/xxhash_amd64.go
+++ b/xxhash_amd64.go
@@ -1,6 +1,5 @@
-// +build !appengine
-// +build gc
-// +build !purego
+//go:build !appengine && gc && !purego
+// +build !appengine,gc,!purego
 
 package xxhash
 
diff --git a/xxhash_other.go b/xxhash_other.go
index 4a5a821..1f52f29 100644
--- a/xxhash_other.go
+++ b/xxhash_other.go
@@ -1,3 +1,4 @@
+//go:build !amd64 || appengine || !gc || purego
 // +build !amd64 appengine !gc purego
 
 package xxhash
diff --git a/xxhash_safe.go b/xxhash_safe.go
index fc9bea7..e86f1b5 100644
--- a/xxhash_safe.go
+++ b/xxhash_safe.go
@@ -1,3 +1,4 @@
+//go:build appengine
 // +build appengine
 
 // This file contains the safe implementations of otherwise unsafe-using code.
diff --git a/xxhash_unsafe.go b/xxhash_unsafe.go
index 376e0ca..dfdeaf3 100644
--- a/xxhash_unsafe.go
+++ b/xxhash_unsafe.go
@@ -1,3 +1,4 @@
+//go:build !appengine
 // +build !appengine
 
 // This file encapsulates usage of unsafe.
diff --git a/xxhash_unsafe_test.go b/xxhash_unsafe_test.go
index 6598267..f4feae2 100644
--- a/xxhash_unsafe_test.go
+++ b/xxhash_unsafe_test.go
@@ -1,3 +1,4 @@
+//go:build !appengine
 // +build !appengine
 
 package xxhash