diff --git a/archive/compression/compression_fuzzer.go b/archive/compression/compression_fuzzer.go
index b8374799d..3516494ac 100644
--- a/archive/compression/compression_fuzzer.go
+++ b/archive/compression/compression_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/content/local/content_local_fuzzer.go b/content/local/content_local_fuzzer.go
index fb9a7031b..a523f28d9 100644
--- a/content/local/content_local_fuzzer.go
+++ b/content/local/content_local_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/content/local/store_bsd.go b/content/local/store_bsd.go
index 42fddd341..7dcc19232 100644
--- a/content/local/store_bsd.go
+++ b/content/local/store_bsd.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || netbsd
-// +build darwin freebsd netbsd
 
 /*
    Copyright The containerd Authors.
diff --git a/content/local/store_openbsd.go b/content/local/store_openbsd.go
index 2b58b617b..45dfa9997 100644
--- a/content/local/store_openbsd.go
+++ b/content/local/store_openbsd.go
@@ -1,5 +1,4 @@
 //go:build openbsd
-// +build openbsd
 
 /*
    Copyright The containerd Authors.
diff --git a/content/local/store_unix.go b/content/local/store_unix.go
index efa2eb943..cb01c91c7 100644
--- a/content/local/store_unix.go
+++ b/content/local/store_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || solaris
-// +build linux solaris
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/apparmor/apparmor.go b/contrib/apparmor/apparmor.go
index be6a49a39..56454ab93 100644
--- a/contrib/apparmor/apparmor.go
+++ b/contrib/apparmor/apparmor.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/apparmor/apparmor_fuzzer.go b/contrib/apparmor/apparmor_fuzzer.go
index c4a037bfe..03681ed74 100644
--- a/contrib/apparmor/apparmor_fuzzer.go
+++ b/contrib/apparmor/apparmor_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 // Copyright 2022 ADA Logics Ltd
 //
diff --git a/contrib/apparmor/apparmor_test.go b/contrib/apparmor/apparmor_test.go
index 8c907ef54..a00b6119f 100644
--- a/contrib/apparmor/apparmor_test.go
+++ b/contrib/apparmor/apparmor_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/apparmor/apparmor_unsupported.go b/contrib/apparmor/apparmor_unsupported.go
index ac00fd178..beb7b7c70 100644
--- a/contrib/apparmor/apparmor_unsupported.go
+++ b/contrib/apparmor/apparmor_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/apparmor/template.go b/contrib/apparmor/template.go
index c0b0e542e..ccf4a263d 100644
--- a/contrib/apparmor/template.go
+++ b/contrib/apparmor/template.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The docker Authors.
diff --git a/contrib/apparmor/template_test.go b/contrib/apparmor/template_test.go
index 1dd392ca6..142dca96a 100644
--- a/contrib/apparmor/template_test.go
+++ b/contrib/apparmor/template_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package apparmor
 
diff --git a/contrib/fuzz/archive_fuzzer.go b/contrib/fuzz/archive_fuzzer.go
index b4fe440e3..a487c060e 100644
--- a/contrib/fuzz/archive_fuzzer.go
+++ b/contrib/fuzz/archive_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/fuzz/containerd_import_fuzzer.go b/contrib/fuzz/containerd_import_fuzzer.go
index 5fbccde60..9b5154fdb 100644
--- a/contrib/fuzz/containerd_import_fuzzer.go
+++ b/contrib/fuzz/containerd_import_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/fuzz/content_fuzzer.go b/contrib/fuzz/content_fuzzer.go
index ea8d6d298..abf423b92 100644
--- a/contrib/fuzz/content_fuzzer.go
+++ b/contrib/fuzz/content_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/fuzz/cri_fuzzer.go b/contrib/fuzz/cri_fuzzer.go
index 48c428e68..92bf3c9bf 100644
--- a/contrib/fuzz/cri_fuzzer.go
+++ b/contrib/fuzz/cri_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/fuzz/cri_sbserver_fuzzer.go b/contrib/fuzz/cri_sbserver_fuzzer.go
index f1ced19c4..e2e2b63cb 100644
--- a/contrib/fuzz/cri_sbserver_fuzzer.go
+++ b/contrib/fuzz/cri_sbserver_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/fuzz/cri_server_fuzzer.go b/contrib/fuzz/cri_server_fuzzer.go
index f9ba0eb68..2b6622bf8 100644
--- a/contrib/fuzz/cri_server_fuzzer.go
+++ b/contrib/fuzz/cri_server_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/fuzz/daemon.go b/contrib/fuzz/daemon.go
index a06bc561f..4ce201801 100644
--- a/contrib/fuzz/daemon.go
+++ b/contrib/fuzz/daemon.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go
index cc8dd0da8..45837a2d2 100644
--- a/contrib/fuzz/metadata_fuzzer.go
+++ b/contrib/fuzz/metadata_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/seccomp/seccomp_default.go b/contrib/seccomp/seccomp_default.go
index a66414c20..4cda6d9fd 100644
--- a/contrib/seccomp/seccomp_default.go
+++ b/contrib/seccomp/seccomp_default.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/contrib/seccomp/seccomp_default_unsupported.go b/contrib/seccomp/seccomp_default_unsupported.go
index d06d6487e..e3ebe0d53 100644
--- a/contrib/seccomp/seccomp_default_unsupported.go
+++ b/contrib/seccomp/seccomp_default_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/diff/apply/apply_other.go b/diff/apply/apply_other.go
index 7a0d665b2..3bd79781d 100644
--- a/diff/apply/apply_other.go
+++ b/diff/apply/apply_other.go
@@ -1,5 +1,4 @@
 //go:build !linux && !darwin
-// +build !linux,!darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/client/client_unix.go b/integration/client/client_unix.go
index de83ea76b..6e8ae3e98 100644
--- a/integration/client/client_unix.go
+++ b/integration/client/client_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/client/client_unix_test.go b/integration/client/client_unix_test.go
index ba24f4ae1..67319580a 100644
--- a/integration/client/client_unix_test.go
+++ b/integration/client/client_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/client/container_checkpoint_test.go b/integration/client/container_checkpoint_test.go
index 932975131..80190a70e 100644
--- a/integration/client/container_checkpoint_test.go
+++ b/integration/client/container_checkpoint_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/client/container_fuzzer.go b/integration/client/container_fuzzer.go
index e176603d3..e74a8ba0b 100644
--- a/integration/client/container_fuzzer.go
+++ b/integration/client/container_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/client/helpers_unix.go b/integration/client/helpers_unix.go
index e9786268a..302652121 100644
--- a/integration/client/helpers_unix.go
+++ b/integration/client/helpers_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/client/helpers_unix_test.go b/integration/client/helpers_unix_test.go
index 5670ade1e..ae93e7abb 100644
--- a/integration/client/helpers_unix_test.go
+++ b/integration/client/helpers_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/client/task_opts_unix_test.go b/integration/client/task_opts_unix_test.go
index 7fccee41f..e1d99c354 100644
--- a/integration/client/task_opts_unix_test.go
+++ b/integration/client/task_opts_unix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/remote/util/util_unix.go b/integration/remote/util/util_unix.go
index 2be67bd5e..7136b0cb9 100644
--- a/integration/remote/util/util_unix.go
+++ b/integration/remote/util/util_unix.go
@@ -1,5 +1,4 @@
 //go:build freebsd || linux || darwin
-// +build freebsd linux darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/remote/util/util_unsupported.go b/integration/remote/util/util_unsupported.go
index 99128fdb9..b10f5378d 100644
--- a/integration/remote/util/util_unsupported.go
+++ b/integration/remote/util/util_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !freebsd && !linux && !windows && !darwin
-// +build !freebsd,!linux,!windows,!darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/integration/windows_device_test.go b/integration/windows_device_test.go
index 2baa7858e..4186b4275 100644
--- a/integration/windows_device_test.go
+++ b/integration/windows_device_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/cgroups.go b/metrics/cgroups/cgroups.go
index eb9bce0fa..313743757 100644
--- a/metrics/cgroups/cgroups.go
+++ b/metrics/cgroups/cgroups.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/common/type.go b/metrics/cgroups/common/type.go
index 98b4e64b6..e9699223f 100644
--- a/metrics/cgroups/common/type.go
+++ b/metrics/cgroups/common/type.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/metrics_test.go b/metrics/cgroups/metrics_test.go
index e99d1aada..b1345bee3 100644
--- a/metrics/cgroups/metrics_test.go
+++ b/metrics/cgroups/metrics_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v1/blkio.go b/metrics/cgroups/v1/blkio.go
index 2348f37cd..e5c9e8976 100644
--- a/metrics/cgroups/v1/blkio.go
+++ b/metrics/cgroups/v1/blkio.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go
index 0533471e4..72ebe690f 100644
--- a/metrics/cgroups/v1/cgroups.go
+++ b/metrics/cgroups/v1/cgroups.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v1/cpu.go b/metrics/cgroups/v1/cpu.go
index 77996d940..ff302e688 100644
--- a/metrics/cgroups/v1/cpu.go
+++ b/metrics/cgroups/v1/cpu.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v1/hugetlb.go b/metrics/cgroups/v1/hugetlb.go
index e29b05701..6f267e4ba 100644
--- a/metrics/cgroups/v1/hugetlb.go
+++ b/metrics/cgroups/v1/hugetlb.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v1/memory.go b/metrics/cgroups/v1/memory.go
index 86f6196ce..ff5fe0d62 100644
--- a/metrics/cgroups/v1/memory.go
+++ b/metrics/cgroups/v1/memory.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v1/metric.go b/metrics/cgroups/v1/metric.go
index c4f2947cd..d5fab6bf6 100644
--- a/metrics/cgroups/v1/metric.go
+++ b/metrics/cgroups/v1/metric.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v1/metrics.go b/metrics/cgroups/v1/metrics.go
index c3b95b425..983f78129 100644
--- a/metrics/cgroups/v1/metrics.go
+++ b/metrics/cgroups/v1/metrics.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v1/oom.go b/metrics/cgroups/v1/oom.go
index fbafa0e0c..4f6b32197 100644
--- a/metrics/cgroups/v1/oom.go
+++ b/metrics/cgroups/v1/oom.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v1/pids.go b/metrics/cgroups/v1/pids.go
index 3d60cd49a..a50200c1b 100644
--- a/metrics/cgroups/v1/pids.go
+++ b/metrics/cgroups/v1/pids.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v2/cgroups.go b/metrics/cgroups/v2/cgroups.go
index f8a6aa9da..691cd14e7 100644
--- a/metrics/cgroups/v2/cgroups.go
+++ b/metrics/cgroups/v2/cgroups.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v2/cpu.go b/metrics/cgroups/v2/cpu.go
index 29f3dd36d..66c4748f2 100644
--- a/metrics/cgroups/v2/cpu.go
+++ b/metrics/cgroups/v2/cpu.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v2/io.go b/metrics/cgroups/v2/io.go
index b62673799..0ad9a27fe 100644
--- a/metrics/cgroups/v2/io.go
+++ b/metrics/cgroups/v2/io.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v2/memory.go b/metrics/cgroups/v2/memory.go
index 41813a348..3c6508a06 100644
--- a/metrics/cgroups/v2/memory.go
+++ b/metrics/cgroups/v2/memory.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v2/metric.go b/metrics/cgroups/v2/metric.go
index f42b70d5a..bcd4e72c6 100644
--- a/metrics/cgroups/v2/metric.go
+++ b/metrics/cgroups/v2/metric.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v2/metrics.go b/metrics/cgroups/v2/metrics.go
index b34cc4a82..ece4e1057 100644
--- a/metrics/cgroups/v2/metrics.go
+++ b/metrics/cgroups/v2/metrics.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/cgroups/v2/pids.go b/metrics/cgroups/v2/pids.go
index 78f90ca97..1e1651ffa 100644
--- a/metrics/cgroups/v2/pids.go
+++ b/metrics/cgroups/v2/pids.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/types/v1/types.go b/metrics/types/v1/types.go
index 9b0e9ea92..6eaef03b1 100644
--- a/metrics/types/v1/types.go
+++ b/metrics/types/v1/types.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/metrics/types/v2/types.go b/metrics/types/v2/types.go
index d3f62a78d..2535d6124 100644
--- a/metrics/types/v2/types.go
+++ b/metrics/types/v2/types.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/apparmor/apparmor_unsupported.go b/pkg/apparmor/apparmor_unsupported.go
index 833170338..3c3c5beb6 100644
--- a/pkg/apparmor/apparmor_unsupported.go
+++ b/pkg/apparmor/apparmor_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/blockio_linux.go b/pkg/cri/sbserver/blockio_linux.go
index 627e5b694..6a05371bd 100644
--- a/pkg/cri/sbserver/blockio_linux.go
+++ b/pkg/cri/sbserver/blockio_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/blockio_stub_linux.go b/pkg/cri/sbserver/blockio_stub_linux.go
index 154875a6a..23c6baa75 100644
--- a/pkg/cri/sbserver/blockio_stub_linux.go
+++ b/pkg/cri/sbserver/blockio_stub_linux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/container_create_other.go b/pkg/cri/sbserver/container_create_other.go
index 8119ccb2e..a5cbf3848 100644
--- a/pkg/cri/sbserver/container_create_other.go
+++ b/pkg/cri/sbserver/container_create_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/container_create_other_test.go b/pkg/cri/sbserver/container_create_other_test.go
index a12431a85..ece4565ef 100644
--- a/pkg/cri/sbserver/container_create_other_test.go
+++ b/pkg/cri/sbserver/container_create_other_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/container_stats_list_other.go b/pkg/cri/sbserver/container_stats_list_other.go
index 2d6d0833a..b92e5c361 100644
--- a/pkg/cri/sbserver/container_stats_list_other.go
+++ b/pkg/cri/sbserver/container_stats_list_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/container_update_resources.go b/pkg/cri/sbserver/container_update_resources.go
index b0665f7b5..7a55b21dc 100644
--- a/pkg/cri/sbserver/container_update_resources.go
+++ b/pkg/cri/sbserver/container_update_resources.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !freebsd
-// +build !darwin,!freebsd
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/container_update_resources_other.go b/pkg/cri/sbserver/container_update_resources_other.go
index 944159beb..7fa3f29df 100644
--- a/pkg/cri/sbserver/container_update_resources_other.go
+++ b/pkg/cri/sbserver/container_update_resources_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/fuzz.go b/pkg/cri/sbserver/fuzz.go
index eadc7d123..362817803 100644
--- a/pkg/cri/sbserver/fuzz.go
+++ b/pkg/cri/sbserver/fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/helpers_other.go b/pkg/cri/sbserver/helpers_other.go
index 7472439dd..e0a904ae7 100644
--- a/pkg/cri/sbserver/helpers_other.go
+++ b/pkg/cri/sbserver/helpers_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/podsandbox/helpers_other.go b/pkg/cri/sbserver/podsandbox/helpers_other.go
index 7ed1cb9ad..464d07092 100644
--- a/pkg/cri/sbserver/podsandbox/helpers_other.go
+++ b/pkg/cri/sbserver/podsandbox/helpers_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run_other.go b/pkg/cri/sbserver/podsandbox/sandbox_run_other.go
index b629566ba..b703c5117 100644
--- a/pkg/cri/sbserver/podsandbox/sandbox_run_other.go
+++ b/pkg/cri/sbserver/podsandbox/sandbox_run_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/podsandbox/sandbox_run_other_test.go b/pkg/cri/sbserver/podsandbox/sandbox_run_other_test.go
index 5d5ad96ec..196955f7f 100644
--- a/pkg/cri/sbserver/podsandbox/sandbox_run_other_test.go
+++ b/pkg/cri/sbserver/podsandbox/sandbox_run_other_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/rdt_linux.go b/pkg/cri/sbserver/rdt_linux.go
index 188c2100a..12640912c 100644
--- a/pkg/cri/sbserver/rdt_linux.go
+++ b/pkg/cri/sbserver/rdt_linux.go
@@ -1,5 +1,4 @@
 //go:build !no_rdt
-// +build !no_rdt
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/rdt_stub_linux.go b/pkg/cri/sbserver/rdt_stub_linux.go
index ac1e65906..d362ac2ac 100644
--- a/pkg/cri/sbserver/rdt_stub_linux.go
+++ b/pkg/cri/sbserver/rdt_stub_linux.go
@@ -1,5 +1,4 @@
 //go:build no_rdt
-// +build no_rdt
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/sandbox_portforward_other.go b/pkg/cri/sbserver/sandbox_portforward_other.go
index b79d44cdc..cadbae0c8 100644
--- a/pkg/cri/sbserver/sandbox_portforward_other.go
+++ b/pkg/cri/sbserver/sandbox_portforward_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/sandbox_run_other.go b/pkg/cri/sbserver/sandbox_run_other.go
index aab18f150..fff065169 100644
--- a/pkg/cri/sbserver/sandbox_run_other.go
+++ b/pkg/cri/sbserver/sandbox_run_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/sandbox_stats_other.go b/pkg/cri/sbserver/sandbox_stats_other.go
index 393bc784b..2da4f28d8 100644
--- a/pkg/cri/sbserver/sandbox_stats_other.go
+++ b/pkg/cri/sbserver/sandbox_stats_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/sbserver/service_other.go b/pkg/cri/sbserver/service_other.go
index 41820e331..6118a4d60 100644
--- a/pkg/cri/sbserver/service_other.go
+++ b/pkg/cri/sbserver/service_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/bandwidth/unsupported.go b/pkg/cri/server/bandwidth/unsupported.go
index 998207039..08b629fda 100644
--- a/pkg/cri/server/bandwidth/unsupported.go
+++ b/pkg/cri/server/bandwidth/unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/nri-api.go b/pkg/cri/server/nri-api.go
index 3f256ee21..9ef35afa8 100644
--- a/pkg/cri/server/nri-api.go
+++ b/pkg/cri/server/nri-api.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/nri-api_other.go b/pkg/cri/server/nri-api_other.go
index 382299e18..5bada0d2b 100644
--- a/pkg/cri/server/nri-api_other.go
+++ b/pkg/cri/server/nri-api_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/cri/server/nri-api_windows.go b/pkg/cri/server/nri-api_windows.go
index bc83cd76b..627266346 100644
--- a/pkg/cri/server/nri-api_windows.go
+++ b/pkg/cri/server/nri-api_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/dialer/dialer_unix.go b/pkg/dialer/dialer_unix.go
index b4304ffbf..798566bc5 100644
--- a/pkg/dialer/dialer_unix.go
+++ b/pkg/dialer/dialer_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/netns/netns_other.go b/pkg/netns/netns_other.go
index ec8124ceb..08134451b 100644
--- a/pkg/netns/netns_other.go
+++ b/pkg/netns/netns_other.go
@@ -1,5 +1,4 @@
 //go:build !windows && !linux
-// +build !windows,!linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/nri/container_linux.go b/pkg/nri/container_linux.go
index 0632b6dc0..59b9e025f 100644
--- a/pkg/nri/container_linux.go
+++ b/pkg/nri/container_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/nri/container_other.go b/pkg/nri/container_other.go
index 9f1793a64..25e783b56 100644
--- a/pkg/nri/container_other.go
+++ b/pkg/nri/container_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/nri/sandbox_linux.go b/pkg/nri/sandbox_linux.go
index 6e457945f..e80230ed7 100644
--- a/pkg/nri/sandbox_linux.go
+++ b/pkg/nri/sandbox_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/nri/sandbox_other.go b/pkg/nri/sandbox_other.go
index d7683cfa8..0b986043a 100644
--- a/pkg/nri/sandbox_other.go
+++ b/pkg/nri/sandbox_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/oom/oom.go b/pkg/oom/oom.go
index bbc46f818..fc714cbf0 100644
--- a/pkg/oom/oom.go
+++ b/pkg/oom/oom.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/oom/v1/v1.go b/pkg/oom/v1/v1.go
index 6496db472..96974168e 100644
--- a/pkg/oom/v1/v1.go
+++ b/pkg/oom/v1/v1.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/oom/v2/v2.go b/pkg/oom/v2/v2.go
index 2df8eaf75..7ee4b61f0 100644
--- a/pkg/oom/v2/v2.go
+++ b/pkg/oom/v2/v2.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/process/deleted_state.go b/pkg/process/deleted_state.go
index e1441623c..30852104b 100644
--- a/pkg/process/deleted_state.go
+++ b/pkg/process/deleted_state.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/process/exec.go b/pkg/process/exec.go
index dcd7592e8..620ad093a 100644
--- a/pkg/process/exec.go
+++ b/pkg/process/exec.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/process/exec_state.go b/pkg/process/exec_state.go
index 4c3dd8fba..d84709b2c 100644
--- a/pkg/process/exec_state.go
+++ b/pkg/process/exec_state.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/process/init.go b/pkg/process/init.go
index f25679c06..318e36783 100644
--- a/pkg/process/init.go
+++ b/pkg/process/init.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/process/init_state.go b/pkg/process/init_state.go
index 09a17aeeb..23f5b9212 100644
--- a/pkg/process/init_state.go
+++ b/pkg/process/init_state.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/process/io.go b/pkg/process/io.go
index ed9b1da18..687d5a2a3 100644
--- a/pkg/process/io.go
+++ b/pkg/process/io.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/process/io_test.go b/pkg/process/io_test.go
index 6b03ec880..90072f7cc 100644
--- a/pkg/process/io_test.go
+++ b/pkg/process/io_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/process/utils.go b/pkg/process/utils.go
index afada02b7..b074958cf 100644
--- a/pkg/process/utils.go
+++ b/pkg/process/utils.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/seccomp/seccomp_unsupported.go b/pkg/seccomp/seccomp_unsupported.go
index 4458c1c70..41c2ceacb 100644
--- a/pkg/seccomp/seccomp_unsupported.go
+++ b/pkg/seccomp/seccomp_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/seed/seed_other.go b/pkg/seed/seed_other.go
index ddefd74a9..03cd46ba9 100644
--- a/pkg/seed/seed_other.go
+++ b/pkg/seed/seed_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/testutil/helpers_unix.go b/pkg/testutil/helpers_unix.go
index d479f7d52..6e03a07f9 100644
--- a/pkg/testutil/helpers_unix.go
+++ b/pkg/testutil/helpers_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/testutil/mount_other.go b/pkg/testutil/mount_other.go
index 412d72bca..163073bd0 100644
--- a/pkg/testutil/mount_other.go
+++ b/pkg/testutil/mount_other.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 /*
    Copyright The containerd Authors.
diff --git a/pkg/userns/userns_unsupported.go b/pkg/userns/userns_unsupported.go
index 4f8d7dd2d..c67f773d0 100644
--- a/pkg/userns/userns_unsupported.go
+++ b/pkg/userns/userns_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/platforms/cpuinfo_other.go b/platforms/cpuinfo_other.go
index 51fb62ea7..fa5f19c42 100644
--- a/platforms/cpuinfo_other.go
+++ b/platforms/cpuinfo_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/remotes/docker/config/config_unix.go b/remotes/docker/config/config_unix.go
index 6967f680d..9db18dedc 100644
--- a/remotes/docker/config/config_unix.go
+++ b/remotes/docker/config/config_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/remotes/docker/config/docker_fuzzer_internal.go b/remotes/docker/config/docker_fuzzer_internal.go
index f48e2e2f8..335614fdb 100644
--- a/remotes/docker/config/docker_fuzzer_internal.go
+++ b/remotes/docker/config/docker_fuzzer_internal.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/remotes/docker/converter_fuzz.go b/remotes/docker/converter_fuzz.go
index f2a88b20a..908205392 100644
--- a/remotes/docker/converter_fuzz.go
+++ b/remotes/docker/converter_fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/remotes/docker/fetcher_fuzz.go b/remotes/docker/fetcher_fuzz.go
index e126ebbd8..b98886c59 100644
--- a/remotes/docker/fetcher_fuzz.go
+++ b/remotes/docker/fetcher_fuzz.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v1/linux/bundle.go b/runtime/v1/linux/bundle.go
index d25957b83..0a5d07486 100644
--- a/runtime/v1/linux/bundle.go
+++ b/runtime/v1/linux/bundle.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v1/linux/bundle_test.go b/runtime/v1/linux/bundle_test.go
index 242411097..2f79c92e5 100644
--- a/runtime/v1/linux/bundle_test.go
+++ b/runtime/v1/linux/bundle_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v1/linux/process.go b/runtime/v1/linux/process.go
index dcb28b626..d23e1e1ca 100644
--- a/runtime/v1/linux/process.go
+++ b/runtime/v1/linux/process.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v1/linux/runtime.go b/runtime/v1/linux/runtime.go
index 4d94d21f7..df7614829 100644
--- a/runtime/v1/linux/runtime.go
+++ b/runtime/v1/linux/runtime.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v1/linux/task.go b/runtime/v1/linux/task.go
index 021a2be6d..528b43b66 100644
--- a/runtime/v1/linux/task.go
+++ b/runtime/v1/linux/task.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v1/shim/client/client.go b/runtime/v1/shim/client/client.go
index 72aa073b9..2fa6daeb6 100644
--- a/runtime/v1/shim/client/client.go
+++ b/runtime/v1/shim/client/client.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v1/shim/client/client_unix.go b/runtime/v1/shim/client/client_unix.go
index 5da615146..2533f7138 100644
--- a/runtime/v1/shim/client/client_unix.go
+++ b/runtime/v1/shim/client/client_unix.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v1/shim/local.go b/runtime/v1/shim/local.go
index cd6fa4ff7..cb9cda6c2 100644
--- a/runtime/v1/shim/local.go
+++ b/runtime/v1/shim/local.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/bundle_default.go b/runtime/v2/bundle_default.go
index 2be40c825..01977adb4 100644
--- a/runtime/v2/bundle_default.go
+++ b/runtime/v2/bundle_default.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/example/cmd/main.go b/runtime/v2/example/cmd/main.go
index 7a59d721d..187258d05 100644
--- a/runtime/v2/example/cmd/main.go
+++ b/runtime/v2/example/cmd/main.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/example/example.go b/runtime/v2/example/example.go
index c3ab72d9f..2d6d66092 100644
--- a/runtime/v2/example/example.go
+++ b/runtime/v2/example/example.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/logging/logging_unix.go b/runtime/v2/logging/logging_unix.go
index f04fcc770..9c0c4efc9 100644
--- a/runtime/v2/logging/logging_unix.go
+++ b/runtime/v2/logging/logging_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/manager_test.go b/runtime/v2/manager_test.go
index b6a2b8940..e1b42f948 100644
--- a/runtime/v2/manager_test.go
+++ b/runtime/v2/manager_test.go
@@ -1,5 +1,4 @@
 //go:build !windows && !darwin
-// +build !windows,!darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/manager_unix.go b/runtime/v2/manager_unix.go
index eb87c20da..df2559afd 100644
--- a/runtime/v2/manager_unix.go
+++ b/runtime/v2/manager_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/runc/pause/sandbox.go b/runtime/v2/runc/pause/sandbox.go
index e9f00e4c6..39b249115 100644
--- a/runtime/v2/runc/pause/sandbox.go
+++ b/runtime/v2/runc/pause/sandbox.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/runc/platform.go b/runtime/v2/runc/platform.go
index 65c017149..fea18a141 100644
--- a/runtime/v2/runc/platform.go
+++ b/runtime/v2/runc/platform.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/runc/util.go b/runtime/v2/runc/util.go
index c965a2214..0cb31bdfe 100644
--- a/runtime/v2/runc/util.go
+++ b/runtime/v2/runc/util.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/shim/shim_unix.go b/runtime/v2/shim/shim_unix.go
index e2dab0931..82d3e7eb6 100644
--- a/runtime/v2/shim/shim_unix.go
+++ b/runtime/v2/shim/shim_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/shim_unix.go b/runtime/v2/shim_unix.go
index 9ebfb27c8..d95b5bb6d 100644
--- a/runtime/v2/shim_unix.go
+++ b/runtime/v2/shim_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/runtime/v2/shim_unix_test.go b/runtime/v2/shim_unix_test.go
index dba47c88f..4ef447780 100644
--- a/runtime/v2/shim_unix_test.go
+++ b/runtime/v2/shim_unix_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/services/diff/service_unix.go b/services/diff/service_unix.go
index defea4bae..51240d282 100644
--- a/services/diff/service_unix.go
+++ b/services/diff/service_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/services/introspection/pidns_others.go b/services/introspection/pidns_others.go
index 8b4c47dd9..c2cc475af 100644
--- a/services/introspection/pidns_others.go
+++ b/services/introspection/pidns_others.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/services/opt/path_unix.go b/services/opt/path_unix.go
index 7d21e0dfe..1bb8abeac 100644
--- a/services/opt/path_unix.go
+++ b/services/opt/path_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/services/server/server_unsupported.go b/services/server/server_unsupported.go
index c3eb53b54..def4b548a 100644
--- a/services/server/server_unsupported.go
+++ b/services/server/server_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows && !solaris
-// +build !linux,!windows,!solaris
 
 /*
    Copyright The containerd Authors.
diff --git a/services/tasks/blockio_default.go b/services/tasks/blockio_default.go
index ac4103468..60aca6114 100644
--- a/services/tasks/blockio_default.go
+++ b/services/tasks/blockio_default.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/services/tasks/blockio_linux.go b/services/tasks/blockio_linux.go
index 72c729d8a..1471f8434 100644
--- a/services/tasks/blockio_linux.go
+++ b/services/tasks/blockio_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/services/tasks/local_darwin.go b/services/tasks/local_darwin.go
index d3a3e8022..e10c66b7e 100644
--- a/services/tasks/local_darwin.go
+++ b/services/tasks/local_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/services/tasks/local_unix.go b/services/tasks/local_unix.go
index df381a892..ec6eca15d 100644
--- a/services/tasks/local_unix.go
+++ b/services/tasks/local_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows && !freebsd && !darwin
-// +build !windows,!freebsd,!darwin
 
 /*
    Copyright The containerd Authors.
diff --git a/services/tasks/rdt_default.go b/services/tasks/rdt_default.go
index 05007dc77..08b4ba0e3 100644
--- a/services/tasks/rdt_default.go
+++ b/services/tasks/rdt_default.go
@@ -1,5 +1,4 @@
 //go:build !linux || no_rdt
-// +build !linux no_rdt
 
 /*
    Copyright The containerd Authors.
diff --git a/services/tasks/rdt_linux.go b/services/tasks/rdt_linux.go
index 78f0d6979..6692216a8 100644
--- a/services/tasks/rdt_linux.go
+++ b/services/tasks/rdt_linux.go
@@ -1,5 +1,4 @@
 //go:build linux && !no_rdt
-// +build linux,!no_rdt
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/benchsuite/benchmark.go b/snapshots/benchsuite/benchmark.go
index 6b37bdafb..ec6577f6c 100644
--- a/snapshots/benchsuite/benchmark.go
+++ b/snapshots/benchsuite/benchmark.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go
index 54b793de5..4e5d1734a 100644
--- a/snapshots/benchsuite/benchmark_test.go
+++ b/snapshots/benchsuite/benchmark_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/btrfs/btrfs.go b/snapshots/btrfs/btrfs.go
index 5cf17da8d..3cee8225b 100644
--- a/snapshots/btrfs/btrfs.go
+++ b/snapshots/btrfs/btrfs.go
@@ -1,5 +1,4 @@
 //go:build linux && !no_btrfs && cgo
-// +build linux,!no_btrfs,cgo
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/btrfs/btrfs_test.go b/snapshots/btrfs/btrfs_test.go
index 6e5b246ce..0671d15c4 100644
--- a/snapshots/btrfs/btrfs_test.go
+++ b/snapshots/btrfs/btrfs_test.go
@@ -1,5 +1,4 @@
 //go:build linux && !no_btrfs && cgo
-// +build linux,!no_btrfs,cgo
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/btrfs/plugin/plugin.go b/snapshots/btrfs/plugin/plugin.go
index 7e39dc1e0..f6635846c 100644
--- a/snapshots/btrfs/plugin/plugin.go
+++ b/snapshots/btrfs/plugin/plugin.go
@@ -1,5 +1,4 @@
 //go:build linux && !no_btrfs && cgo
-// +build linux,!no_btrfs,cgo
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/blkdiscard/blkdiscard.go b/snapshots/devmapper/blkdiscard/blkdiscard.go
index 384184afa..bec283047 100644
--- a/snapshots/devmapper/blkdiscard/blkdiscard.go
+++ b/snapshots/devmapper/blkdiscard/blkdiscard.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/config.go b/snapshots/devmapper/config.go
index 7713f1561..5b82de539 100644
--- a/snapshots/devmapper/config.go
+++ b/snapshots/devmapper/config.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/config_test.go b/snapshots/devmapper/config_test.go
index dcbabbff4..1ee740e66 100644
--- a/snapshots/devmapper/config_test.go
+++ b/snapshots/devmapper/config_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/device_info.go b/snapshots/devmapper/device_info.go
index 37e0dbfd6..124f9cd93 100644
--- a/snapshots/devmapper/device_info.go
+++ b/snapshots/devmapper/device_info.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/dmsetup/dmsetup.go b/snapshots/devmapper/dmsetup/dmsetup.go
index b190efa09..8d1c145c0 100644
--- a/snapshots/devmapper/dmsetup/dmsetup.go
+++ b/snapshots/devmapper/dmsetup/dmsetup.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/dmsetup/dmsetup_test.go b/snapshots/devmapper/dmsetup/dmsetup_test.go
index 88d1297b2..eaf4ff336 100644
--- a/snapshots/devmapper/dmsetup/dmsetup_test.go
+++ b/snapshots/devmapper/dmsetup/dmsetup_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/metadata.go b/snapshots/devmapper/metadata.go
index 00a989cf9..9f5a1cd0d 100644
--- a/snapshots/devmapper/metadata.go
+++ b/snapshots/devmapper/metadata.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/metadata_test.go b/snapshots/devmapper/metadata_test.go
index 769d0e22e..32c5aa088 100644
--- a/snapshots/devmapper/metadata_test.go
+++ b/snapshots/devmapper/metadata_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/plugin/plugin.go b/snapshots/devmapper/plugin/plugin.go
index 403fd69d2..dec4b37f8 100644
--- a/snapshots/devmapper/plugin/plugin.go
+++ b/snapshots/devmapper/plugin/plugin.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/pool_device.go b/snapshots/devmapper/pool_device.go
index 1bf742944..86ef1897f 100644
--- a/snapshots/devmapper/pool_device.go
+++ b/snapshots/devmapper/pool_device.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/pool_device_test.go b/snapshots/devmapper/pool_device_test.go
index e570230d0..02c5fec7c 100644
--- a/snapshots/devmapper/pool_device_test.go
+++ b/snapshots/devmapper/pool_device_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/snapshotter.go b/snapshots/devmapper/snapshotter.go
index 7494b3817..245362195 100644
--- a/snapshots/devmapper/snapshotter.go
+++ b/snapshots/devmapper/snapshotter.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/devmapper/snapshotter_test.go b/snapshots/devmapper/snapshotter_test.go
index 551b8a05f..a596d4e8e 100644
--- a/snapshots/devmapper/snapshotter_test.go
+++ b/snapshots/devmapper/snapshotter_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/native/native_default.go b/snapshots/native/native_default.go
index b51bf4869..d2d99bbe2 100644
--- a/snapshots/native/native_default.go
+++ b/snapshots/native/native_default.go
@@ -1,5 +1,4 @@
 //go:build !freebsd
-// +build !freebsd
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/overlay/overlay.go b/snapshots/overlay/overlay.go
index dba85ca69..74bb722f5 100644
--- a/snapshots/overlay/overlay.go
+++ b/snapshots/overlay/overlay.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/overlay/overlay_test.go b/snapshots/overlay/overlay_test.go
index 13493c45e..c0357df41 100644
--- a/snapshots/overlay/overlay_test.go
+++ b/snapshots/overlay/overlay_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/overlay/overlayutils/check.go b/snapshots/overlay/overlayutils/check.go
index f96d9b350..d2ac91aa8 100644
--- a/snapshots/overlay/overlayutils/check.go
+++ b/snapshots/overlay/overlayutils/check.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/overlay/overlayutils/check_test.go b/snapshots/overlay/overlayutils/check_test.go
index 700057217..7dba370f8 100644
--- a/snapshots/overlay/overlayutils/check_test.go
+++ b/snapshots/overlay/overlayutils/check_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/overlay/plugin/plugin.go b/snapshots/overlay/plugin/plugin.go
index 460ede81e..12059fcd8 100644
--- a/snapshots/overlay/plugin/plugin.go
+++ b/snapshots/overlay/plugin/plugin.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/testsuite/helpers_other.go b/snapshots/testsuite/helpers_other.go
index 2c5f65a96..d39ec0734 100644
--- a/snapshots/testsuite/helpers_other.go
+++ b/snapshots/testsuite/helpers_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 /*
    Copyright The containerd Authors.
diff --git a/snapshots/testsuite/testsuite_unix.go b/snapshots/testsuite/testsuite_unix.go
index 94b8218e2..46a974b71 100644
--- a/snapshots/testsuite/testsuite_unix.go
+++ b/snapshots/testsuite/testsuite_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.
diff --git a/sys/reaper/reaper_unix.go b/sys/reaper/reaper_unix.go
index 19f751601..8172f224e 100644
--- a/sys/reaper/reaper_unix.go
+++ b/sys/reaper/reaper_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /*
    Copyright The containerd Authors.