diff --git a/daemon_stub.go b/daemon_stub.go
index 25f3bbb..9b2fbc2 100644
--- a/daemon_stub.go
+++ b/daemon_stub.go
@@ -1,3 +1,4 @@
+//go:build !darwin && !dragonfly && !freebsd && !linux &&!netbsd && !openbsd && !plan9 && !solaris
 // +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!plan9,!solaris
 
 package daemon
diff --git a/daemon_unix.go b/daemon_unix.go
index 7c31213..57c37b1 100644
--- a/daemon_unix.go
+++ b/daemon_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || plan9 || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd plan9 solaris
 
 package daemon
diff --git a/lock_file_solaris.go b/lock_file_solaris.go
index 313dca0..6578fd0 100644
--- a/lock_file_solaris.go
+++ b/lock_file_solaris.go
@@ -1,3 +1,4 @@
+//go:build solaris
 // +build solaris
 
 package daemon
diff --git a/lock_file_stub.go b/lock_file_stub.go
index 3be0c01..baf43d8 100644
--- a/lock_file_stub.go
+++ b/lock_file_stub.go
@@ -1,3 +1,4 @@
+//go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !plan9 && !solaris
 // +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!plan9,!solaris
 
 package daemon
diff --git a/lock_file_unix.go b/lock_file_unix.go
index 4215a8c..94673e9 100644
--- a/lock_file_unix.go
+++ b/lock_file_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || plan9
 // +build darwin dragonfly freebsd linux netbsd openbsd plan9
 
 package daemon
diff --git a/os_executable.go b/os_executable.go
index ae38074..ddebe3d 100644
--- a/os_executable.go
+++ b/os_executable.go
@@ -1,3 +1,4 @@
+//go:build go1.8
 // +build go1.8
 
 package daemon
diff --git a/os_executable_pre18.go b/os_executable_pre18.go
index d1a705c..281a82c 100644
--- a/os_executable_pre18.go
+++ b/os_executable_pre18.go
@@ -1,3 +1,4 @@
+//go:build !go1.8
 // +build !go1.8
 
 package daemon
diff --git a/syscall_dup.go b/syscall_dup.go
index 4b98efb..55a07fd 100644
--- a/syscall_dup.go
+++ b/syscall_dup.go
@@ -1,3 +1,4 @@
+//go:build (!linux || !arm64) && (!linux || !riscv64) && !windows && !go1.7
 // +build !linux !arm64
 // +build !linux !riscv64
 // +build !windows
diff --git a/syscall_dup3.go b/syscall_dup3.go
index 08fba5a..16bddc9 100644
--- a/syscall_dup3.go
+++ b/syscall_dup3.go
@@ -1,3 +1,4 @@
+//go:build linux && (riscv64 || arm64)
 // +build linux
 // +build riscv64 arm64
 
diff --git a/syscall_dup_pre17.go b/syscall_dup_pre17.go
index b95621b..381db75 100644
--- a/syscall_dup_pre17.go
+++ b/syscall_dup_pre17.go
@@ -1,3 +1,4 @@
+//go:build (!linux || !arm64) && !windows && !go1.7
 // +build !linux !arm64
 // +build !windows
 // +build !go1.7