diff --git a/client-nowasm_test.go b/client-nowasm_test.go
index 7725f71e..62c5a1db 100644
--- a/client-nowasm_test.go
+++ b/client-nowasm_test.go
@@ -1,4 +1,5 @@
 //go:build !wasm
+// +build !wasm
 
 package torrent
 
diff --git a/iplist/packed.go b/iplist/packed.go
index 62f51db7..5ae1faea 100644
--- a/iplist/packed.go
+++ b/iplist/packed.go
@@ -1,4 +1,5 @@
 //go:build !wasm
+// +build !wasm
 
 package iplist
 
diff --git a/issue211_test.go b/issue211_test.go
index e9b9f0f3..5d93d1f2 100644
--- a/issue211_test.go
+++ b/issue211_test.go
@@ -1,4 +1,5 @@
 //go:build !wasm
+// +build !wasm
 
 package torrent
 
diff --git a/storage/bolt-piece-completion.go b/storage/bolt-piece-completion.go
index fcf3143b..43417f20 100644
--- a/storage/bolt-piece-completion.go
+++ b/storage/bolt-piece-completion.go
@@ -1,4 +1,5 @@
 //go:build !noboltdb && !wasm
+// +build !noboltdb,!wasm
 
 package storage
 
diff --git a/storage/bolt-piece.go b/storage/bolt-piece.go
index 644dc88c..12916ee5 100644
--- a/storage/bolt-piece.go
+++ b/storage/bolt-piece.go
@@ -1,4 +1,5 @@
 //go:build !noboltdb && !wasm
+// +build !noboltdb,!wasm
 
 package storage
 
diff --git a/storage/bolt.go b/storage/bolt.go
index 6885c865..4473b841 100644
--- a/storage/bolt.go
+++ b/storage/bolt.go
@@ -1,4 +1,5 @@
 //go:build !noboltdb && !wasm
+// +build !noboltdb,!wasm
 
 package storage
 
diff --git a/storage/default-dir-piece-completion-sqlite.go b/storage/default-dir-piece-completion-sqlite.go
index 412abaeb..beb992fc 100644
--- a/storage/default-dir-piece-completion-sqlite.go
+++ b/storage/default-dir-piece-completion-sqlite.go
@@ -1,4 +1,5 @@
 //go:build cgo && !nosqlite
+// +build cgo,!nosqlite
 
 package storage
 
diff --git a/storage/mmap.go b/storage/mmap.go
index db96d2c2..9c9e8471 100644
--- a/storage/mmap.go
+++ b/storage/mmap.go
@@ -1,4 +1,5 @@
 //go:build !wasm
+// +build !wasm
 
 package storage
 
diff --git a/storage/sqlite-piece-completion.go b/storage/sqlite-piece-completion.go
index 1ae0984f..5f31e413 100644
--- a/storage/sqlite-piece-completion.go
+++ b/storage/sqlite-piece-completion.go
@@ -1,4 +1,5 @@
 //go:build cgo && !nosqlite
+// +build cgo,!nosqlite
 
 package storage
 
diff --git a/storage/sqlite/direct.go b/storage/sqlite/direct.go
index e74cc960..4fda7d0c 100644
--- a/storage/sqlite/direct.go
+++ b/storage/sqlite/direct.go
@@ -1,4 +1,5 @@
 //go:build cgo
+// +build cgo
 
 package sqliteStorage
 
diff --git a/storage/sqlite/sqlite-storage_test.go b/storage/sqlite/sqlite-storage_test.go
index dc869a6e..43c743e3 100644
--- a/storage/sqlite/sqlite-storage_test.go
+++ b/storage/sqlite/sqlite-storage_test.go
@@ -1,4 +1,5 @@
 //go:build cgo
+// +build cgo
 
 package sqliteStorage
 
diff --git a/torrent_mmap_test.go b/torrent_mmap_test.go
index c09932dc..81143095 100644
--- a/torrent_mmap_test.go
+++ b/torrent_mmap_test.go
@@ -1,4 +1,5 @@
 //go:build !wasm
+// +build !wasm
 
 package torrent
 
diff --git a/utp_libutp.go b/utp_libutp.go
index cbb0d69a..1e8fa673 100644
--- a/utp_libutp.go
+++ b/utp_libutp.go
@@ -1,9 +1,10 @@
 //go:build cgo && !disable_libutp
+// +build cgo,!disable_libutp
 
 package torrent
 
 import (
-	utp "github.com/anacrolix/go-libutp"
+	"github.com/anacrolix/go-libutp"
 )
 
 func NewUtpSocket(network, addr string, fc firewallCallback) (utpSocket, error) {