diff --git a/archive/tar_freebsd.go b/archive/tar_freebsd.go
index ce4dffd6d..fb5abff0e 100644
--- a/archive/tar_freebsd.go
+++ b/archive/tar_freebsd.go
@@ -1,5 +1,3 @@
-// +build freebsd
-
 /*
    Copyright The containerd Authors.
 
diff --git a/archive/tar_linux_test.go b/archive/tar_linux_test.go
index 73f5a631b..9b6d46259 100644
--- a/archive/tar_linux_test.go
+++ b/archive/tar_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/archive/tar_opts_linux.go b/archive/tar_opts_linux.go
index 38ef9e9bc..f88d826e4 100644
--- a/archive/tar_opts_linux.go
+++ b/archive/tar_opts_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/archive/tar_opts_windows.go b/archive/tar_opts_windows.go
index d3b8f4fb9..dd4cfcfd9 100644
--- a/archive/tar_opts_windows.go
+++ b/archive/tar_opts_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/archive/tar_windows.go b/archive/tar_windows.go
index 3184070ac..c38154caa 100644
--- a/archive/tar_windows.go
+++ b/archive/tar_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/cio/io_windows_test.go b/cio/io_windows_test.go
index 92fa1ff1c..e34457ddb 100644
--- a/cio/io_windows_test.go
+++ b/cio/io_windows_test.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/cmd/containerd-shim/shim_darwin.go b/cmd/containerd-shim/shim_darwin.go
index d6dc23072..7d652daa1 100644
--- a/cmd/containerd-shim/shim_darwin.go
+++ b/cmd/containerd-shim/shim_darwin.go
@@ -1,5 +1,3 @@
-// +build darwin
-
 /*
    Copyright The containerd Authors.
 
diff --git a/cmd/containerd-shim/shim_freebsd.go b/cmd/containerd-shim/shim_freebsd.go
index 1fd88546a..5cafaef47 100644
--- a/cmd/containerd-shim/shim_freebsd.go
+++ b/cmd/containerd-shim/shim_freebsd.go
@@ -1,5 +1,3 @@
-// +build freebsd
-
 /*
    Copyright The containerd Authors.
 
diff --git a/cmd/containerd-stress/rlimit_freebsd.go b/cmd/containerd-stress/rlimit_freebsd.go
index a1b39defc..92b299a37 100644
--- a/cmd/containerd-stress/rlimit_freebsd.go
+++ b/cmd/containerd-stress/rlimit_freebsd.go
@@ -1,5 +1,3 @@
-// +build freebsd
-
 /*
    Copyright The containerd Authors.
 
diff --git a/cmd/containerd-stress/rlimit_windows.go b/cmd/containerd-stress/rlimit_windows.go
index 22678adca..d98ec366f 100644
--- a/cmd/containerd-stress/rlimit_windows.go
+++ b/cmd/containerd-stress/rlimit_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/cmd/containerd/builtins_windows.go b/cmd/containerd/builtins_windows.go
index 3fdea109d..ee6281a9a 100644
--- a/cmd/containerd/builtins_windows.go
+++ b/cmd/containerd/builtins_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/cmd/containerd/command/notify_linux.go b/cmd/containerd/command/notify_linux.go
index be3d580f2..f97a1d3a5 100644
--- a/cmd/containerd/command/notify_linux.go
+++ b/cmd/containerd/command/notify_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/cmd/ctr/commands/commands_windows.go b/cmd/ctr/commands/commands_windows.go
index 4bd3d2596..5c1d98e3d 100644
--- a/cmd/ctr/commands/commands_windows.go
+++ b/cmd/ctr/commands/commands_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/defaults/defaults_darwin.go b/defaults/defaults_darwin.go
index 3cf57f39d..79a834ea2 100644
--- a/defaults/defaults_darwin.go
+++ b/defaults/defaults_darwin.go
@@ -1,5 +1,3 @@
-// +build darwin
-
 /*
    Copyright The containerd Authors.
 
diff --git a/defaults/defaults_windows.go b/defaults/defaults_windows.go
index a80700075..9f4bed8b0 100644
--- a/defaults/defaults_windows.go
+++ b/defaults/defaults_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/diff/apply/apply_linux.go b/diff/apply/apply_linux.go
index b3775c720..7f805b5f6 100644
--- a/diff/apply/apply_linux.go
+++ b/diff/apply/apply_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/diff/apply/apply_linux_test.go b/diff/apply/apply_linux_test.go
index 999d506c8..731ce0dea 100644
--- a/diff/apply/apply_linux_test.go
+++ b/diff/apply/apply_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/diff/stream_windows.go b/diff/stream_windows.go
index 19dcbacf5..1bb96f6e6 100644
--- a/diff/stream_windows.go
+++ b/diff/stream_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go
index 9257d10ae..5285ebd01 100644
--- a/integration/client/container_linux_test.go
+++ b/integration/client/container_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/integration/client/helpers_windows_test.go b/integration/client/helpers_windows_test.go
index 77647452f..2d8b11d78 100644
--- a/integration/client/helpers_windows_test.go
+++ b/integration/client/helpers_windows_test.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/integration/remote/util/util_windows.go b/integration/remote/util/util_windows.go
index 979ebf2fc..51d1b881a 100644
--- a/integration/remote/util/util_windows.go
+++ b/integration/remote/util/util_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/integration/util/boottime_util_darwin.go b/integration/util/boottime_util_darwin.go
index 74abe9fb9..910632c0c 100644
--- a/integration/util/boottime_util_darwin.go
+++ b/integration/util/boottime_util_darwin.go
@@ -1,5 +1,3 @@
-// +build darwin
-
 /*
    Copyright The containerd Authors.
 
diff --git a/integration/util/util_windows.go b/integration/util/util_windows.go
index 850a50f81..183c6b8e7 100644
--- a/integration/util/util_windows.go
+++ b/integration/util/util_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/mount/lookup_linux_test.go b/mount/lookup_linux_test.go
index f2ca5fd43..a9422ba4c 100644
--- a/mount/lookup_linux_test.go
+++ b/mount/lookup_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/mount/losetup_linux_test.go b/mount/losetup_linux_test.go
index 75bc2b929..e6dcffd01 100644
--- a/mount/losetup_linux_test.go
+++ b/mount/losetup_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/mount/mount_freebsd.go b/mount/mount_freebsd.go
index d52450013..8e30f27d0 100644
--- a/mount/mount_freebsd.go
+++ b/mount/mount_freebsd.go
@@ -1,5 +1,3 @@
-// +build freebsd
-
 /*
    Copyright The containerd Authors.
 
diff --git a/mount/mount_linux_test.go b/mount/mount_linux_test.go
index 131294d8e..a254a18fa 100644
--- a/mount/mount_linux_test.go
+++ b/mount/mount_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/oci/spec_opts_linux.go b/oci/spec_opts_linux.go
index 9c5fd6c84..b16383c5d 100644
--- a/oci/spec_opts_linux.go
+++ b/oci/spec_opts_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/oci/spec_opts_windows.go b/oci/spec_opts_windows.go
index 126a89ec8..a289162ba 100644
--- a/oci/spec_opts_windows.go
+++ b/oci/spec_opts_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/oci/spec_opts_windows_test.go b/oci/spec_opts_windows_test.go
index f2246ba09..aa3fb1474 100644
--- a/oci/spec_opts_windows_test.go
+++ b/oci/spec_opts_windows_test.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/apparmor/apparmor_linux.go b/pkg/apparmor/apparmor_linux.go
index ae01fadb3..a3e417ff2 100644
--- a/pkg/apparmor/apparmor_linux.go
+++ b/pkg/apparmor/apparmor_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/config/config_windows.go b/pkg/cri/config/config_windows.go
index 535a65af5..c1a98dfd9 100644
--- a/pkg/cri/config/config_windows.go
+++ b/pkg/cri/config/config_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/io/helpers_windows.go b/pkg/cri/io/helpers_windows.go
index f64807edf..c4f9e449f 100644
--- a/pkg/cri/io/helpers_windows.go
+++ b/pkg/cri/io/helpers_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/opts/spec_windows.go b/pkg/cri/opts/spec_windows.go
index 6dc21c054..6beb7e4e5 100644
--- a/pkg/cri/opts/spec_windows.go
+++ b/pkg/cri/opts/spec_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/server/container_create_windows.go b/pkg/cri/server/container_create_windows.go
index e10874478..3ae58de8b 100644
--- a/pkg/cri/server/container_create_windows.go
+++ b/pkg/cri/server/container_create_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/server/container_create_windows_test.go b/pkg/cri/server/container_create_windows_test.go
index 6767cc247..efe3c4269 100644
--- a/pkg/cri/server/container_create_windows_test.go
+++ b/pkg/cri/server/container_create_windows_test.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/server/container_stats_list_windows.go b/pkg/cri/server/container_stats_list_windows.go
index 548dd40c8..cd1d76e50 100644
--- a/pkg/cri/server/container_stats_list_windows.go
+++ b/pkg/cri/server/container_stats_list_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/server/container_update_resources_windows.go b/pkg/cri/server/container_update_resources_windows.go
index 6c5863cd9..2aec01c06 100644
--- a/pkg/cri/server/container_update_resources_windows.go
+++ b/pkg/cri/server/container_update_resources_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/server/helpers_windows.go b/pkg/cri/server/helpers_windows.go
index f88f34bad..1b8940129 100644
--- a/pkg/cri/server/helpers_windows.go
+++ b/pkg/cri/server/helpers_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/server/sandbox_portforward_windows.go b/pkg/cri/server/sandbox_portforward_windows.go
index 70f1ef829..c0ec854e3 100644
--- a/pkg/cri/server/sandbox_portforward_windows.go
+++ b/pkg/cri/server/sandbox_portforward_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/server/sandbox_run_windows.go b/pkg/cri/server/sandbox_run_windows.go
index b3b228b4e..dc8ca54e3 100644
--- a/pkg/cri/server/sandbox_run_windows.go
+++ b/pkg/cri/server/sandbox_run_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/server/sandbox_run_windows_test.go b/pkg/cri/server/sandbox_run_windows_test.go
index 93f706fc9..041bf6025 100644
--- a/pkg/cri/server/sandbox_run_windows_test.go
+++ b/pkg/cri/server/sandbox_run_windows_test.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cri/server/service_windows.go b/pkg/cri/server/service_windows.go
index dff475944..a107fffc4 100644
--- a/pkg/cri/server/service_windows.go
+++ b/pkg/cri/server/service_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/netns/netns_windows.go b/pkg/netns/netns_windows.go
index 1386f5364..de02094b8 100644
--- a/pkg/netns/netns_windows.go
+++ b/pkg/netns/netns_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/platforms/defaults_windows.go b/platforms/defaults_windows.go
index 0c380e3b7..ba2c5555d 100644
--- a/platforms/defaults_windows.go
+++ b/platforms/defaults_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/platforms/defaults_windows_test.go b/platforms/defaults_windows_test.go
index abf7718d4..9b046700a 100644
--- a/platforms/defaults_windows_test.go
+++ b/platforms/defaults_windows_test.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/remotes/docker/config/config_windows.go b/remotes/docker/config/config_windows.go
index 948b65396..4a9d3361e 100644
--- a/remotes/docker/config/config_windows.go
+++ b/remotes/docker/config/config_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/runtime/v1/shim/client/client_linux.go b/runtime/v1/shim/client/client_linux.go
index 2519380f5..d47988b9c 100644
--- a/runtime/v1/shim/client/client_linux.go
+++ b/runtime/v1/shim/client/client_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
    Copyright The containerd Authors.
 
diff --git a/runtime/v2/logging/logging_windows.go b/runtime/v2/logging/logging_windows.go
index 395dc82ba..47b9032d8 100644
--- a/runtime/v2/logging/logging_windows.go
+++ b/runtime/v2/logging/logging_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/runtime/v2/manager_windows.go b/runtime/v2/manager_windows.go
index 838622bcd..fe2040daf 100644
--- a/runtime/v2/manager_windows.go
+++ b/runtime/v2/manager_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/runtime/v2/shim/shim_darwin.go b/runtime/v2/shim/shim_darwin.go
index 314b45cb5..fe833df01 100644
--- a/runtime/v2/shim/shim_darwin.go
+++ b/runtime/v2/shim/shim_darwin.go
@@ -1,5 +1,3 @@
-// +build darwin
-
 /*
    Copyright The containerd Authors.
 
diff --git a/runtime/v2/shim/shim_freebsd.go b/runtime/v2/shim/shim_freebsd.go
index 4bc636280..fe833df01 100644
--- a/runtime/v2/shim/shim_freebsd.go
+++ b/runtime/v2/shim/shim_freebsd.go
@@ -1,5 +1,3 @@
-// +build freebsd
-
 /*
    Copyright The containerd Authors.
 
diff --git a/runtime/v2/shim/shim_windows.go b/runtime/v2/shim/shim_windows.go
index 7339eb2a2..1ce56d29f 100644
--- a/runtime/v2/shim/shim_windows.go
+++ b/runtime/v2/shim/shim_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/services/diff/service_windows.go b/services/diff/service_windows.go
index 00584ecb5..2d19de093 100644
--- a/services/diff/service_windows.go
+++ b/services/diff/service_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/services/server/server_windows.go b/services/server/server_windows.go
index 8b569eb45..4d7c06024 100644
--- a/services/server/server_windows.go
+++ b/services/server/server_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/services/tasks/local_freebsd.go b/services/tasks/local_freebsd.go
index d206b8f25..20f37f601 100644
--- a/services/tasks/local_freebsd.go
+++ b/services/tasks/local_freebsd.go
@@ -1,5 +1,3 @@
-// +build freebsd
-
 /*
    Copyright The containerd Authors.
 
diff --git a/services/tasks/local_windows.go b/services/tasks/local_windows.go
index d12f9e470..50993eb69 100644
--- a/services/tasks/local_windows.go
+++ b/services/tasks/local_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/snapshots/native/native_freebsd.go b/snapshots/native/native_freebsd.go
index b97eb8815..464778586 100644
--- a/snapshots/native/native_freebsd.go
+++ b/snapshots/native/native_freebsd.go
@@ -1,5 +1,3 @@
-// +build freebsd
-
 /*
    Copyright The containerd Authors.
 
diff --git a/sys/filesys_windows.go b/sys/filesys_windows.go
index 50707bbaa..fdfab4620 100644
--- a/sys/filesys_windows.go
+++ b/sys/filesys_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/sys/socket_windows.go b/sys/socket_windows.go
index 3ee7679b4..1ae12bc51 100644
--- a/sys/socket_windows.go
+++ b/sys/socket_windows.go
@@ -1,5 +1,3 @@
-// +build windows
-
 /*
    Copyright The containerd Authors.