diff --git a/xattr_bsd.go b/xattr_bsd.go
index 183730a..f4a3f95 100644
--- a/xattr_bsd.go
+++ b/xattr_bsd.go
@@ -1,3 +1,4 @@
+//go:build freebsd || netbsd
 // +build freebsd netbsd
 
 package xattr
diff --git a/xattr_darwin.go b/xattr_darwin.go
index 8a190a8..ee7a501 100644
--- a/xattr_darwin.go
+++ b/xattr_darwin.go
@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package xattr
diff --git a/xattr_flags_test.go b/xattr_flags_test.go
index 46948e4..96dd428 100644
--- a/xattr_flags_test.go
+++ b/xattr_flags_test.go
@@ -1,3 +1,4 @@
+//go:build linux || darwin || solaris
 // +build linux darwin solaris
 
 package xattr
diff --git a/xattr_linux.go b/xattr_linux.go
index f4c7f35..879085e 100644
--- a/xattr_linux.go
+++ b/xattr_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package xattr
diff --git a/xattr_solaris.go b/xattr_solaris.go
index cbd527e..38d88d6 100644
--- a/xattr_solaris.go
+++ b/xattr_solaris.go
@@ -1,3 +1,4 @@
+//go:build solaris
 // +build solaris
 
 package xattr
@@ -90,7 +91,7 @@ func removexattr(path string, name string) error {
 	if err != nil {
 		return err
 	}
-	f := os.NewFile(uintptr(fd), path);
+	f := os.NewFile(uintptr(fd), path)
 	defer func() {
 		_ = f.Close()
 	}()
diff --git a/xattr_test.go b/xattr_test.go
index f4dba9e..b6b2048 100644
--- a/xattr_test.go
+++ b/xattr_test.go
@@ -1,3 +1,4 @@
+//go:build linux || darwin || freebsd || netbsd || solaris
 // +build linux darwin freebsd netbsd solaris
 
 package xattr