From ce9365f5cd29db77a655767d7b600a5182b89ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
Date: Mon, 11 Apr 2022 18:03:06 -0400
Subject: [PATCH] global: Remove legacy build tags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---
 lxc/console_unix.go                             | 1 -
 lxc/console_windows.go                          | 1 -
 lxc/exec_unix.go                                | 1 -
 lxc/exec_windows.go                             | 1 -
 lxc/utils_notwindows.go                         | 1 -
 lxc/utils_windows.go                            | 1 -
 lxd/cgo.go                                      | 1 -
 lxd/db/backups.go                               | 1 -
 lxd/db/certificate_projects.go                  | 1 -
 lxd/db/certificate_projects.interface.mapper.go | 1 -
 lxd/db/certificate_projects.mapper.go           | 1 -
 lxd/db/certificates.go                          | 1 -
 lxd/db/certificates.interface.mapper.go         | 1 -
 lxd/db/certificates.mapper.go                   | 1 -
 lxd/db/certificates_test.go                     | 1 -
 lxd/db/cluster.go                               | 1 -
 lxd/db/config.go                                | 1 -
 lxd/db/config.interface.mapper.go               | 1 -
 lxd/db/config.mapper.go                         | 1 -
 lxd/db/config_test.go                           | 1 -
 lxd/db/db.go                                    | 1 -
 lxd/db/db_internal_test.go                      | 1 -
 lxd/db/db_test.go                               | 1 -
 lxd/db/devices.go                               | 1 -
 lxd/db/devices.interface.mapper.go              | 1 -
 lxd/db/devices.mapper.go                        | 1 -
 lxd/db/entity.go                                | 1 -
 lxd/db/generate/file/write.go                   | 1 -
 lxd/db/images.go                                | 1 -
 lxd/db/images.interface.mapper.go               | 1 -
 lxd/db/images.mapper.go                         | 1 -
 lxd/db/images_test.go                           | 1 -
 lxd/db/instance_profiles.go                     | 1 -
 lxd/db/instance_profiles.interface.mapper.go    | 1 -
 lxd/db/instance_profiles.mapper.go              | 1 -
 lxd/db/instances.go                             | 1 -
 lxd/db/instances.interface.mapper.go            | 1 -
 lxd/db/instances.mapper.go                      | 1 -
 lxd/db/instances_test.go                        | 1 -
 lxd/db/migration.go                             | 1 -
 lxd/db/migration_test.go                        | 1 -
 lxd/db/network_acls.go                          | 1 -
 lxd/db/network_forwards.go                      | 1 -
 lxd/db/network_peers.go                         | 1 -
 lxd/db/network_zones.go                         | 1 -
 lxd/db/networks.go                              | 1 -
 lxd/db/networks_test.go                         | 1 -
 lxd/db/node.go                                  | 1 -
 lxd/db/node_test.go                             | 1 -
 lxd/db/operations.go                            | 1 -
 lxd/db/operations.interface.mapper.go           | 1 -
 lxd/db/operations.mapper.go                     | 1 -
 lxd/db/operations_test.go                       | 1 -
 lxd/db/patches.go                               | 1 -
 lxd/db/profiles.go                              | 1 -
 lxd/db/profiles.interface.mapper.go             | 1 -
 lxd/db/profiles.mapper.go                       | 1 -
 lxd/db/projects.go                              | 1 -
 lxd/db/projects.interface.mapper.go             | 1 -
 lxd/db/projects.mapper.go                       | 1 -
 lxd/db/projects_test.go                         | 1 -
 lxd/db/raft.go                                  | 1 -
 lxd/db/raft_test.go                             | 1 -
 lxd/db/schema.go                                | 1 -
 lxd/db/snapshots.go                             | 1 -
 lxd/db/snapshots.interface.mapper.go            | 1 -
 lxd/db/snapshots.mapper.go                      | 1 -
 lxd/db/snapshots_test.go                        | 1 -
 lxd/db/storage_pools.go                         | 1 -
 lxd/db/storage_pools_export_test.go             | 1 -
 lxd/db/storage_pools_test.go                    | 1 -
 lxd/db/storage_volume_snapshots.go              | 1 -
 lxd/db/storage_volumes.go                       | 1 -
 lxd/db/storage_volumes_test.go                  | 1 -
 lxd/db/testing.go                               | 1 -
 lxd/db/transaction.go                           | 1 -
 lxd/db/transaction_export_test.go               | 1 -
 lxd/db/warning_severity.go                      | 1 -
 lxd/db/warning_status.go                        | 1 -
 lxd/db/warnings.go                              | 1 -
 lxd/db/warnings.interface.mapper.go             | 1 -
 lxd/db/warnings.mapper.go                       | 1 -
 lxd/db/warnings_types.go                        | 1 -
 lxd/device/unix_hotplug.go                      | 1 -
 lxd/endpoints/devlxd.go                         | 1 -
 lxd/endpoints/local.go                          | 1 -
 lxd/endpoints/notlinux.go                       | 1 -
 lxd/endpoints/socket.go                         | 1 -
 lxd/operations/linux.go                         | 1 -
 lxd/operations/notlinux.go                      | 1 -
 lxd/response/smart_linux.go                     | 1 -
 lxd/seccomp/cgo.go                              | 1 -
 lxd/seccomp/seccomp.go                          | 1 -
 lxd/seccomp/seccomp_test.go                     | 1 -
 lxd/state/notlinux.go                           | 1 -
 lxd/state/state.go                              | 1 -
 lxd/state/testing.go                            | 1 -
 lxd/storage/cgo.go                              | 1 -
 lxd/storage/drivers/utils_cgo.go                | 1 -
 lxd/storage/quota/cgo.go                        | 1 -
 lxd/sys/apparmor.go                             | 1 -
 lxd/sys/empty.go                                | 1 -
 lxd/sys/fs.go                                   | 1 -
 lxd/sys/os.go                                   | 1 -
 lxd/sys/testing.go                              | 1 -
 lxd/util/sys.go                                 | 1 -
 shared/cgo.go                                   | 1 -
 shared/eagain/file_unix.go                      | 1 -
 shared/i18n/i18n.go                             | 1 -
 shared/i18n/i18n_linux.go                       | 1 -
 shared/idmap/cgo.go                             | 1 -
 shared/idmap/idmapset_linux.go                  | 1 -
 shared/idmap/idmapset_linux_test.go             | 1 -
 shared/idmap/parse_linux.go                     | 1 -
 shared/idmap/shift_linux.go                     | 1 -
 shared/instancewriter/instance_tar_writer.go    | 1 -
 shared/logger/syslog_linux.go                   | 1 -
 shared/logger/syslog_other.go                   | 1 -
 shared/netutils/cgo.go                          | 1 -
 shared/netutils/netns_getifaddrs.c              | 1 -
 shared/netutils/network.c                       | 1 -
 shared/netutils/network_linux.go                | 1 -
 shared/netutils/network_linux_cgo.go            | 1 -
 shared/netutils/unixfd.c                        | 2 --
 shared/netutils/unixfd.h                        | 2 --
 shared/network_unix.go                          | 1 -
 shared/network_windows.go                       | 1 -
 shared/osarch/architectures_linux.go            | 1 -
 shared/osarch/architectures_others.go           | 1 -
 shared/subprocess/bgpm_test.go                  | 1 -
 shared/subprocess/errors.go                     | 1 -
 shared/subprocess/manager.go                    | 1 -
 shared/subprocess/proc.go                       | 1 -
 shared/subprocess/proc_linux.go                 | 1 -
 shared/subprocess/proc_others.go                | 1 -
 shared/tcp/tcp_timeout_user.go                  | 1 -
 shared/tcp/tcp_timeout_user_noop.go             | 1 -
 shared/termios/termios_linux.go                 | 1 -
 shared/termios/termios_other.go                 | 1 -
 shared/util_linux.go                            | 1 -
 shared/util_linux_cgo.go                        | 1 -
 shared/util_linux_notcgo.go                     | 1 -
 shared/util_unix.go                             | 1 -
 shared/util_windows.go                          | 1 -
 shared/version/platform_linux.go                | 1 -
 shared/version/platform_others.go               | 1 -
 146 files changed, 148 deletions(-)

diff --git a/lxc/console_unix.go b/lxc/console_unix.go
index 54301f4bcf95..15791fe3a693 100644
--- a/lxc/console_unix.go
+++ b/lxc/console_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/lxc/console_windows.go b/lxc/console_windows.go
index a6064cd79ba8..791024c360a4 100644
--- a/lxc/console_windows.go
+++ b/lxc/console_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 
diff --git a/lxc/exec_unix.go b/lxc/exec_unix.go
index 6bbf8de89f38..926d209cac82 100644
--- a/lxc/exec_unix.go
+++ b/lxc/exec_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/lxc/exec_windows.go b/lxc/exec_windows.go
index 849b82d7298c..1c611ed27da2 100644
--- a/lxc/exec_windows.go
+++ b/lxc/exec_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 
diff --git a/lxc/utils_notwindows.go b/lxc/utils_notwindows.go
index 8e4618f8932b..9318804bbf5a 100644
--- a/lxc/utils_notwindows.go
+++ b/lxc/utils_notwindows.go
@@ -1,5 +1,4 @@
 //go:build (linux && !appengine) || darwin || freebsd || openbsd
-// +build linux,!appengine darwin freebsd openbsd
 
 package main
 
diff --git a/lxc/utils_windows.go b/lxc/utils_windows.go
index ea222f56c0a4..f6f4248288f7 100644
--- a/lxc/utils_windows.go
+++ b/lxc/utils_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 
diff --git a/lxd/cgo.go b/lxd/cgo.go
index 578ddf08d04a..dac89d64513f 100644
--- a/lxd/cgo.go
+++ b/lxd/cgo.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package main
 
diff --git a/lxd/db/backups.go b/lxd/db/backups.go
index 6dbbc960cb98..a30257ca9f82 100644
--- a/lxd/db/backups.go
+++ b/lxd/db/backups.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/certificate_projects.go b/lxd/db/certificate_projects.go
index bd92a24743ae..0776444df363 100644
--- a/lxd/db/certificate_projects.go
+++ b/lxd/db/certificate_projects.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/certificate_projects.interface.mapper.go b/lxd/db/certificate_projects.interface.mapper.go
index 5b39f4925d64..6e234d3797a2 100644
--- a/lxd/db/certificate_projects.interface.mapper.go
+++ b/lxd/db/certificate_projects.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/certificate_projects.mapper.go b/lxd/db/certificate_projects.mapper.go
index d0bc4f89bdac..99a7d8f1f237 100644
--- a/lxd/db/certificate_projects.mapper.go
+++ b/lxd/db/certificate_projects.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/certificates.go b/lxd/db/certificates.go
index 3643de238e33..b0c7593ecff1 100644
--- a/lxd/db/certificates.go
+++ b/lxd/db/certificates.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/certificates.interface.mapper.go b/lxd/db/certificates.interface.mapper.go
index eca80403420f..a60ff868e517 100644
--- a/lxd/db/certificates.interface.mapper.go
+++ b/lxd/db/certificates.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/certificates.mapper.go b/lxd/db/certificates.mapper.go
index fba938f72036..0ed01a563547 100644
--- a/lxd/db/certificates.mapper.go
+++ b/lxd/db/certificates.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/certificates_test.go b/lxd/db/certificates_test.go
index 478acfd7e98e..09b2ff152427 100644
--- a/lxd/db/certificates_test.go
+++ b/lxd/db/certificates_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/cluster.go b/lxd/db/cluster.go
index 503ecdb566d3..ee5e60658af7 100644
--- a/lxd/db/cluster.go
+++ b/lxd/db/cluster.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/config.go b/lxd/db/config.go
index 0c2d90e8ceac..39fc5b642e76 100644
--- a/lxd/db/config.go
+++ b/lxd/db/config.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/config.interface.mapper.go b/lxd/db/config.interface.mapper.go
index 5d24b2413f73..dee4027da2f0 100644
--- a/lxd/db/config.interface.mapper.go
+++ b/lxd/db/config.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/config.mapper.go b/lxd/db/config.mapper.go
index 1fdf0becf9fb..d09fc9636971 100644
--- a/lxd/db/config.mapper.go
+++ b/lxd/db/config.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/config_test.go b/lxd/db/config_test.go
index 0c09a61868c3..2285ba818226 100644
--- a/lxd/db/config_test.go
+++ b/lxd/db/config_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/db.go b/lxd/db/db.go
index b52f2d330293..64c78b20a67c 100644
--- a/lxd/db/db.go
+++ b/lxd/db/db.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/db_internal_test.go b/lxd/db/db_internal_test.go
index 1571f1e0dd97..7c85972aac74 100644
--- a/lxd/db/db_internal_test.go
+++ b/lxd/db/db_internal_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/db_test.go b/lxd/db/db_test.go
index f604ed48f4d3..b89540d766c5 100644
--- a/lxd/db/db_test.go
+++ b/lxd/db/db_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/devices.go b/lxd/db/devices.go
index 4c4008444a30..b5488159af77 100644
--- a/lxd/db/devices.go
+++ b/lxd/db/devices.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/devices.interface.mapper.go b/lxd/db/devices.interface.mapper.go
index 174331a6434b..e18044c539fc 100644
--- a/lxd/db/devices.interface.mapper.go
+++ b/lxd/db/devices.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/devices.mapper.go b/lxd/db/devices.mapper.go
index ecd3d4016894..f584ecd7805e 100644
--- a/lxd/db/devices.mapper.go
+++ b/lxd/db/devices.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/entity.go b/lxd/db/entity.go
index dea4f9398deb..992e2f20954c 100644
--- a/lxd/db/entity.go
+++ b/lxd/db/entity.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/generate/file/write.go b/lxd/db/generate/file/write.go
index 36b237de23b7..325a4db8dec8 100644
--- a/lxd/db/generate/file/write.go
+++ b/lxd/db/generate/file/write.go
@@ -9,7 +9,6 @@ import (
 
 // BuildComment includes the necessary comments for building. The extra new line at the end is required.
 const BuildComment = `//go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 `
 
diff --git a/lxd/db/images.go b/lxd/db/images.go
index 28d5d80d1812..7093b726a7cb 100644
--- a/lxd/db/images.go
+++ b/lxd/db/images.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/images.interface.mapper.go b/lxd/db/images.interface.mapper.go
index ad9a2636a417..186a83b0ec32 100644
--- a/lxd/db/images.interface.mapper.go
+++ b/lxd/db/images.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/images.mapper.go b/lxd/db/images.mapper.go
index 42b481d5cf57..610383cd32ce 100644
--- a/lxd/db/images.mapper.go
+++ b/lxd/db/images.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/images_test.go b/lxd/db/images_test.go
index 344d7366980e..0c6b93bc913a 100644
--- a/lxd/db/images_test.go
+++ b/lxd/db/images_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/instance_profiles.go b/lxd/db/instance_profiles.go
index 2ba2bedc1f1e..a97b5baa8df6 100644
--- a/lxd/db/instance_profiles.go
+++ b/lxd/db/instance_profiles.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/instance_profiles.interface.mapper.go b/lxd/db/instance_profiles.interface.mapper.go
index f8f699329faa..b4eef432e7d4 100644
--- a/lxd/db/instance_profiles.interface.mapper.go
+++ b/lxd/db/instance_profiles.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/instance_profiles.mapper.go b/lxd/db/instance_profiles.mapper.go
index 0786a675e4e3..527fb5bde8a2 100644
--- a/lxd/db/instance_profiles.mapper.go
+++ b/lxd/db/instance_profiles.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/instances.go b/lxd/db/instances.go
index 5b4aa3eb5fec..796313d913c7 100644
--- a/lxd/db/instances.go
+++ b/lxd/db/instances.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/instances.interface.mapper.go b/lxd/db/instances.interface.mapper.go
index 01dc03d95be6..4e6d812d9dd0 100644
--- a/lxd/db/instances.interface.mapper.go
+++ b/lxd/db/instances.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/instances.mapper.go b/lxd/db/instances.mapper.go
index b95106c3ed52..b465e48af7c3 100644
--- a/lxd/db/instances.mapper.go
+++ b/lxd/db/instances.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/instances_test.go b/lxd/db/instances_test.go
index d46712b0439f..23ddbe2b8855 100644
--- a/lxd/db/instances_test.go
+++ b/lxd/db/instances_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/migration.go b/lxd/db/migration.go
index 5d2d9cb80f14..66cfff26289e 100644
--- a/lxd/db/migration.go
+++ b/lxd/db/migration.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/migration_test.go b/lxd/db/migration_test.go
index 8bf19d58fc05..10f2486a0aba 100644
--- a/lxd/db/migration_test.go
+++ b/lxd/db/migration_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/network_acls.go b/lxd/db/network_acls.go
index e885b174e93d..88934de796f0 100644
--- a/lxd/db/network_acls.go
+++ b/lxd/db/network_acls.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/network_forwards.go b/lxd/db/network_forwards.go
index 313ae9d958fd..1c143f279de2 100644
--- a/lxd/db/network_forwards.go
+++ b/lxd/db/network_forwards.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/network_peers.go b/lxd/db/network_peers.go
index 4025ee35bf61..aad1d33559da 100644
--- a/lxd/db/network_peers.go
+++ b/lxd/db/network_peers.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/network_zones.go b/lxd/db/network_zones.go
index 6ddbdecce3a5..26794b33c99f 100644
--- a/lxd/db/network_zones.go
+++ b/lxd/db/network_zones.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index e01574cb5bc0..9f7bd1f23298 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/networks_test.go b/lxd/db/networks_test.go
index 4c03b6cc3bf0..464dfc1b341b 100644
--- a/lxd/db/networks_test.go
+++ b/lxd/db/networks_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/node.go b/lxd/db/node.go
index a0c4277a3f35..e17998e50de6 100644
--- a/lxd/db/node.go
+++ b/lxd/db/node.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/node_test.go b/lxd/db/node_test.go
index 449995516442..015225528332 100644
--- a/lxd/db/node_test.go
+++ b/lxd/db/node_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/operations.go b/lxd/db/operations.go
index eb16ac0967e2..edf4b7c222ae 100644
--- a/lxd/db/operations.go
+++ b/lxd/db/operations.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/operations.interface.mapper.go b/lxd/db/operations.interface.mapper.go
index ac057e6477e4..950836ac8b8e 100644
--- a/lxd/db/operations.interface.mapper.go
+++ b/lxd/db/operations.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/operations.mapper.go b/lxd/db/operations.mapper.go
index 242d75afa0c6..682a3691018e 100644
--- a/lxd/db/operations.mapper.go
+++ b/lxd/db/operations.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/operations_test.go b/lxd/db/operations_test.go
index 71b223d3df7f..b206c30d3e7b 100644
--- a/lxd/db/operations_test.go
+++ b/lxd/db/operations_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/patches.go b/lxd/db/patches.go
index 687dc2bf4966..ec9e462d619a 100644
--- a/lxd/db/patches.go
+++ b/lxd/db/patches.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/profiles.go b/lxd/db/profiles.go
index f0ba03ee3122..2c8b96d43eab 100644
--- a/lxd/db/profiles.go
+++ b/lxd/db/profiles.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/profiles.interface.mapper.go b/lxd/db/profiles.interface.mapper.go
index 2fa8f755f557..1d499317c5db 100644
--- a/lxd/db/profiles.interface.mapper.go
+++ b/lxd/db/profiles.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/profiles.mapper.go b/lxd/db/profiles.mapper.go
index bddc160a5a2d..45e8fcd8a85d 100644
--- a/lxd/db/profiles.mapper.go
+++ b/lxd/db/profiles.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/projects.go b/lxd/db/projects.go
index bb172bc171bd..8b263b70723e 100644
--- a/lxd/db/projects.go
+++ b/lxd/db/projects.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/projects.interface.mapper.go b/lxd/db/projects.interface.mapper.go
index cfdc087b63c9..3eb6f8b71566 100644
--- a/lxd/db/projects.interface.mapper.go
+++ b/lxd/db/projects.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/projects.mapper.go b/lxd/db/projects.mapper.go
index 2fa7f4ec24f9..40919b6c18fb 100644
--- a/lxd/db/projects.mapper.go
+++ b/lxd/db/projects.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/projects_test.go b/lxd/db/projects_test.go
index d0bd96563096..1683e5ce0ca8 100644
--- a/lxd/db/projects_test.go
+++ b/lxd/db/projects_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/raft.go b/lxd/db/raft.go
index 3f15e9c36f6b..1caf3e713bb8 100644
--- a/lxd/db/raft.go
+++ b/lxd/db/raft.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/raft_test.go b/lxd/db/raft_test.go
index 34d9ca9c852c..e941eae12bc8 100644
--- a/lxd/db/raft_test.go
+++ b/lxd/db/raft_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/schema.go b/lxd/db/schema.go
index 9bdd06baca31..b1df955dca16 100644
--- a/lxd/db/schema.go
+++ b/lxd/db/schema.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/snapshots.go b/lxd/db/snapshots.go
index 2d1b63a2f5a3..8c188d762116 100644
--- a/lxd/db/snapshots.go
+++ b/lxd/db/snapshots.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/snapshots.interface.mapper.go b/lxd/db/snapshots.interface.mapper.go
index 84ac63bbb347..683872a15a92 100644
--- a/lxd/db/snapshots.interface.mapper.go
+++ b/lxd/db/snapshots.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/snapshots.mapper.go b/lxd/db/snapshots.mapper.go
index d344c486aaa7..171dcac15f05 100644
--- a/lxd/db/snapshots.mapper.go
+++ b/lxd/db/snapshots.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/snapshots_test.go b/lxd/db/snapshots_test.go
index 42a71ae56d65..d78f9eef4406 100644
--- a/lxd/db/snapshots_test.go
+++ b/lxd/db/snapshots_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/storage_pools.go b/lxd/db/storage_pools.go
index 8d6045ca2ccb..c1e7d252b7aa 100644
--- a/lxd/db/storage_pools.go
+++ b/lxd/db/storage_pools.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/storage_pools_export_test.go b/lxd/db/storage_pools_export_test.go
index e276f5ef9ecb..d048224ae9e0 100644
--- a/lxd/db/storage_pools_export_test.go
+++ b/lxd/db/storage_pools_export_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/storage_pools_test.go b/lxd/db/storage_pools_test.go
index ec1c4876f23a..a5b12f8f0d8e 100644
--- a/lxd/db/storage_pools_test.go
+++ b/lxd/db/storage_pools_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/storage_volume_snapshots.go b/lxd/db/storage_volume_snapshots.go
index f9db58387718..534cc6a8d67b 100644
--- a/lxd/db/storage_volume_snapshots.go
+++ b/lxd/db/storage_volume_snapshots.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/storage_volumes.go b/lxd/db/storage_volumes.go
index d32b6a65760f..e07883a387d7 100644
--- a/lxd/db/storage_volumes.go
+++ b/lxd/db/storage_volumes.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/storage_volumes_test.go b/lxd/db/storage_volumes_test.go
index f13b94a9a3c7..2a1482265bb2 100644
--- a/lxd/db/storage_volumes_test.go
+++ b/lxd/db/storage_volumes_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db_test
 
diff --git a/lxd/db/testing.go b/lxd/db/testing.go
index 10247bb65d58..d9d32338fd0e 100644
--- a/lxd/db/testing.go
+++ b/lxd/db/testing.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/transaction.go b/lxd/db/transaction.go
index 844cf5efc42e..a9427f80de39 100644
--- a/lxd/db/transaction.go
+++ b/lxd/db/transaction.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/transaction_export_test.go b/lxd/db/transaction_export_test.go
index 9cbacbda40a3..f8f98368c571 100644
--- a/lxd/db/transaction_export_test.go
+++ b/lxd/db/transaction_export_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/warning_severity.go b/lxd/db/warning_severity.go
index 8cbfbeb595bd..ce4e74518783 100644
--- a/lxd/db/warning_severity.go
+++ b/lxd/db/warning_severity.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/warning_status.go b/lxd/db/warning_status.go
index c4a1fed744a9..86a055eb6949 100644
--- a/lxd/db/warning_status.go
+++ b/lxd/db/warning_status.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/warnings.go b/lxd/db/warnings.go
index 2e7ff5834003..8d000a4e16c1 100644
--- a/lxd/db/warnings.go
+++ b/lxd/db/warnings.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/warnings.interface.mapper.go b/lxd/db/warnings.interface.mapper.go
index 6c0a94ae3f16..dfb4398313d2 100644
--- a/lxd/db/warnings.interface.mapper.go
+++ b/lxd/db/warnings.interface.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/warnings.mapper.go b/lxd/db/warnings.mapper.go
index 754e23c82a1f..423a438988e2 100644
--- a/lxd/db/warnings.mapper.go
+++ b/lxd/db/warnings.mapper.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/db/warnings_types.go b/lxd/db/warnings_types.go
index 26918ef4a475..ffdc33ae44fc 100644
--- a/lxd/db/warnings_types.go
+++ b/lxd/db/warnings_types.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package db
 
diff --git a/lxd/device/unix_hotplug.go b/lxd/device/unix_hotplug.go
index 39ca346df823..70367a6bac81 100644
--- a/lxd/device/unix_hotplug.go
+++ b/lxd/device/unix_hotplug.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package device
 
diff --git a/lxd/endpoints/devlxd.go b/lxd/endpoints/devlxd.go
index 04da7a1fbd2d..99fed987bcf7 100644
--- a/lxd/endpoints/devlxd.go
+++ b/lxd/endpoints/devlxd.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package endpoints
 
diff --git a/lxd/endpoints/local.go b/lxd/endpoints/local.go
index 6fafcf1e6e26..a68bb6061e8b 100644
--- a/lxd/endpoints/local.go
+++ b/lxd/endpoints/local.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package endpoints
 
diff --git a/lxd/endpoints/notlinux.go b/lxd/endpoints/notlinux.go
index ceb5cce2361d..4d381f4d1252 100644
--- a/lxd/endpoints/notlinux.go
+++ b/lxd/endpoints/notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux || !cgo
-// +build !linux !cgo
 
 package endpoints
 
diff --git a/lxd/endpoints/socket.go b/lxd/endpoints/socket.go
index 4acde8a7d940..c7cca0705713 100644
--- a/lxd/endpoints/socket.go
+++ b/lxd/endpoints/socket.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package endpoints
 
diff --git a/lxd/operations/linux.go b/lxd/operations/linux.go
index cbfe0b124c4c..cecd49e141e0 100644
--- a/lxd/operations/linux.go
+++ b/lxd/operations/linux.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package operations
 
diff --git a/lxd/operations/notlinux.go b/lxd/operations/notlinux.go
index b9c73bdd3c1f..ca557b051d38 100644
--- a/lxd/operations/notlinux.go
+++ b/lxd/operations/notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux || !cgo || agent
-// +build !linux !cgo agent
 
 package operations
 
diff --git a/lxd/response/smart_linux.go b/lxd/response/smart_linux.go
index fa86df44e6e4..2253ecb2d366 100644
--- a/lxd/response/smart_linux.go
+++ b/lxd/response/smart_linux.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package response
 
diff --git a/lxd/seccomp/cgo.go b/lxd/seccomp/cgo.go
index 4e09e198a47e..ca37278063b3 100644
--- a/lxd/seccomp/cgo.go
+++ b/lxd/seccomp/cgo.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package seccomp
 
diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
index 65e21e7ad141..1f30e70e097d 100644
--- a/lxd/seccomp/seccomp.go
+++ b/lxd/seccomp/seccomp.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package seccomp
 
diff --git a/lxd/seccomp/seccomp_test.go b/lxd/seccomp/seccomp_test.go
index c1bf8ae4a2a9..e309ca2f2974 100644
--- a/lxd/seccomp/seccomp_test.go
+++ b/lxd/seccomp/seccomp_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package seccomp
 
diff --git a/lxd/state/notlinux.go b/lxd/state/notlinux.go
index c2ec9ac8b5ba..074a02f90df6 100644
--- a/lxd/state/notlinux.go
+++ b/lxd/state/notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux || !cgo || agent
-// +build !linux !cgo agent
 
 package state
 
diff --git a/lxd/state/state.go b/lxd/state/state.go
index e6a1e5657dfe..e1a86f14f389 100644
--- a/lxd/state/state.go
+++ b/lxd/state/state.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package state
 
diff --git a/lxd/state/testing.go b/lxd/state/testing.go
index 820d0fbe9cc9..565962587c23 100644
--- a/lxd/state/testing.go
+++ b/lxd/state/testing.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package state
 
diff --git a/lxd/storage/cgo.go b/lxd/storage/cgo.go
index 3a54314645e5..082dbfc45d74 100644
--- a/lxd/storage/cgo.go
+++ b/lxd/storage/cgo.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package storage
 
diff --git a/lxd/storage/drivers/utils_cgo.go b/lxd/storage/drivers/utils_cgo.go
index 888ebf479073..58f1edf06f1d 100644
--- a/lxd/storage/drivers/utils_cgo.go
+++ b/lxd/storage/drivers/utils_cgo.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package drivers
 
diff --git a/lxd/storage/quota/cgo.go b/lxd/storage/quota/cgo.go
index 374c8b1d7e9a..8cf1442e9a83 100644
--- a/lxd/storage/quota/cgo.go
+++ b/lxd/storage/quota/cgo.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package quota
 
diff --git a/lxd/sys/apparmor.go b/lxd/sys/apparmor.go
index 0cbee419ae54..cc82e25b5944 100644
--- a/lxd/sys/apparmor.go
+++ b/lxd/sys/apparmor.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package sys
 
diff --git a/lxd/sys/empty.go b/lxd/sys/empty.go
index 9aa14de99780..e5cc0f16896e 100644
--- a/lxd/sys/empty.go
+++ b/lxd/sys/empty.go
@@ -1,4 +1,3 @@
 //go:build !linux || !cgo || agent
-// +build !linux !cgo agent
 
 package sys
diff --git a/lxd/sys/fs.go b/lxd/sys/fs.go
index 98ef1ecd19a5..a5f4b55b22fb 100644
--- a/lxd/sys/fs.go
+++ b/lxd/sys/fs.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package sys
 
diff --git a/lxd/sys/os.go b/lxd/sys/os.go
index d69206a91ce4..1984ac8009a6 100644
--- a/lxd/sys/os.go
+++ b/lxd/sys/os.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package sys
 
diff --git a/lxd/sys/testing.go b/lxd/sys/testing.go
index 6e4a8e4f8f88..3c7f5c91354a 100644
--- a/lxd/sys/testing.go
+++ b/lxd/sys/testing.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package sys
 
diff --git a/lxd/util/sys.go b/lxd/util/sys.go
index 5d8bd0b27ca1..130832bb93e1 100644
--- a/lxd/util/sys.go
+++ b/lxd/util/sys.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo && !agent
-// +build linux,cgo,!agent
 
 package util
 
diff --git a/shared/cgo.go b/shared/cgo.go
index b65d31f1a810..8329699ad9dc 100644
--- a/shared/cgo.go
+++ b/shared/cgo.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package shared
 
diff --git a/shared/eagain/file_unix.go b/shared/eagain/file_unix.go
index d80d23f8ab6b..7086e085f3af 100644
--- a/shared/eagain/file_unix.go
+++ b/shared/eagain/file_unix.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package eagain
 
diff --git a/shared/i18n/i18n.go b/shared/i18n/i18n.go
index 4eeb9eb9ab05..fe640eb4b55b 100644
--- a/shared/i18n/i18n.go
+++ b/shared/i18n/i18n.go
@@ -1,5 +1,4 @@
 //go:build !linux || !cgo
-// +build !linux !cgo
 
 package i18n
 
diff --git a/shared/i18n/i18n_linux.go b/shared/i18n/i18n_linux.go
index d07587b6fe42..f2fb6f649b50 100644
--- a/shared/i18n/i18n_linux.go
+++ b/shared/i18n/i18n_linux.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package i18n
 
diff --git a/shared/idmap/cgo.go b/shared/idmap/cgo.go
index fc0f86665592..c937164add03 100644
--- a/shared/idmap/cgo.go
+++ b/shared/idmap/cgo.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package idmap
 
diff --git a/shared/idmap/idmapset_linux.go b/shared/idmap/idmapset_linux.go
index 4909140dfd6e..ab4e1d6a6bf1 100644
--- a/shared/idmap/idmapset_linux.go
+++ b/shared/idmap/idmapset_linux.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package idmap
 
diff --git a/shared/idmap/idmapset_linux_test.go b/shared/idmap/idmapset_linux_test.go
index fcb9b9c30691..16ff6771a99b 100644
--- a/shared/idmap/idmapset_linux_test.go
+++ b/shared/idmap/idmapset_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package idmap
 
diff --git a/shared/idmap/parse_linux.go b/shared/idmap/parse_linux.go
index c1f8c255b224..9cdfd3baac31 100644
--- a/shared/idmap/parse_linux.go
+++ b/shared/idmap/parse_linux.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package idmap
 
diff --git a/shared/idmap/shift_linux.go b/shared/idmap/shift_linux.go
index daaf3727571f..eebd41bb24b5 100644
--- a/shared/idmap/shift_linux.go
+++ b/shared/idmap/shift_linux.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package idmap
 
diff --git a/shared/instancewriter/instance_tar_writer.go b/shared/instancewriter/instance_tar_writer.go
index d83c021193cf..8df719bc49a7 100644
--- a/shared/instancewriter/instance_tar_writer.go
+++ b/shared/instancewriter/instance_tar_writer.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package instancewriter
 
diff --git a/shared/logger/syslog_linux.go b/shared/logger/syslog_linux.go
index 0d6ff01ebd04..3104d2b3aa2c 100644
--- a/shared/logger/syslog_linux.go
+++ b/shared/logger/syslog_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package logger
 
diff --git a/shared/logger/syslog_other.go b/shared/logger/syslog_other.go
index a5c76c1e5516..b9b97150585e 100644
--- a/shared/logger/syslog_other.go
+++ b/shared/logger/syslog_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package logger
 
diff --git a/shared/netutils/cgo.go b/shared/netutils/cgo.go
index 9711e393c393..2891b4571e78 100644
--- a/shared/netutils/cgo.go
+++ b/shared/netutils/cgo.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package netutils
 
diff --git a/shared/netutils/netns_getifaddrs.c b/shared/netutils/netns_getifaddrs.c
index 7ba132618241..9e10638d8cb4 100644
--- a/shared/netutils/netns_getifaddrs.c
+++ b/shared/netutils/netns_getifaddrs.c
@@ -1,4 +1,3 @@
-// +build none
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
diff --git a/shared/netutils/network.c b/shared/netutils/network.c
index e4a3011f81c1..b9998acc70a5 100644
--- a/shared/netutils/network.c
+++ b/shared/netutils/network.c
@@ -1,4 +1,3 @@
-// +build none
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
diff --git a/shared/netutils/network_linux.go b/shared/netutils/network_linux.go
index 009117c5b8a2..cfbc99dff6a8 100644
--- a/shared/netutils/network_linux.go
+++ b/shared/netutils/network_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package netutils
 
diff --git a/shared/netutils/network_linux_cgo.go b/shared/netutils/network_linux_cgo.go
index bacc1290c352..51921bec28e3 100644
--- a/shared/netutils/network_linux_cgo.go
+++ b/shared/netutils/network_linux_cgo.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package netutils
 
diff --git a/shared/netutils/unixfd.c b/shared/netutils/unixfd.c
index 145a93cf5247..b900366fc220 100644
--- a/shared/netutils/unixfd.c
+++ b/shared/netutils/unixfd.c
@@ -1,5 +1,3 @@
-// +build linux
-// +build cgo
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
diff --git a/shared/netutils/unixfd.h b/shared/netutils/unixfd.h
index 7576ae481627..2a0238d7c6dc 100644
--- a/shared/netutils/unixfd.h
+++ b/shared/netutils/unixfd.h
@@ -1,5 +1,3 @@
-// +build linux
-// +build cgo
 
 #ifndef LXD_UNIXFD_H
 #define LXD_UNIXFD_H
diff --git a/shared/network_unix.go b/shared/network_unix.go
index c60daa4ec4cd..192149b3004a 100644
--- a/shared/network_unix.go
+++ b/shared/network_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package shared
 
diff --git a/shared/network_windows.go b/shared/network_windows.go
index 7111aaeacfbb..09aa8b4ea99f 100644
--- a/shared/network_windows.go
+++ b/shared/network_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package shared
 
diff --git a/shared/osarch/architectures_linux.go b/shared/osarch/architectures_linux.go
index 267556a90ec1..78d36a5d871b 100644
--- a/shared/osarch/architectures_linux.go
+++ b/shared/osarch/architectures_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package osarch
 
diff --git a/shared/osarch/architectures_others.go b/shared/osarch/architectures_others.go
index 38c88c359c15..38cd4ecaf19c 100644
--- a/shared/osarch/architectures_others.go
+++ b/shared/osarch/architectures_others.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package osarch
 
diff --git a/shared/subprocess/bgpm_test.go b/shared/subprocess/bgpm_test.go
index 9f39c1f050b3..5024533f58ce 100644
--- a/shared/subprocess/bgpm_test.go
+++ b/shared/subprocess/bgpm_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package subprocess
 
diff --git a/shared/subprocess/errors.go b/shared/subprocess/errors.go
index 5f765189e258..fb552da23336 100644
--- a/shared/subprocess/errors.go
+++ b/shared/subprocess/errors.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package subprocess
 
diff --git a/shared/subprocess/manager.go b/shared/subprocess/manager.go
index d6f500d4f874..0d6eddde14e7 100644
--- a/shared/subprocess/manager.go
+++ b/shared/subprocess/manager.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package subprocess
 
diff --git a/shared/subprocess/proc.go b/shared/subprocess/proc.go
index 5c842ae50176..de7510887d69 100644
--- a/shared/subprocess/proc.go
+++ b/shared/subprocess/proc.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package subprocess
 
diff --git a/shared/subprocess/proc_linux.go b/shared/subprocess/proc_linux.go
index b0bf24920dfb..5d7745debbd7 100644
--- a/shared/subprocess/proc_linux.go
+++ b/shared/subprocess/proc_linux.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package subprocess
 
diff --git a/shared/subprocess/proc_others.go b/shared/subprocess/proc_others.go
index b504ac830c06..ed3edf09b3d8 100644
--- a/shared/subprocess/proc_others.go
+++ b/shared/subprocess/proc_others.go
@@ -1,5 +1,4 @@
 //go:build (!linux || !cgo) && !windows
-// +build (!linux || !cgo) && !windows
 
 package subprocess
 
diff --git a/shared/tcp/tcp_timeout_user.go b/shared/tcp/tcp_timeout_user.go
index 36a60cb948c7..6d74a5425de7 100644
--- a/shared/tcp/tcp_timeout_user.go
+++ b/shared/tcp/tcp_timeout_user.go
@@ -1,5 +1,4 @@
 //go:build linux || zos
-// +build linux zos
 
 package tcp
 
diff --git a/shared/tcp/tcp_timeout_user_noop.go b/shared/tcp/tcp_timeout_user_noop.go
index d43b9fd83deb..c1ead151f109 100644
--- a/shared/tcp/tcp_timeout_user_noop.go
+++ b/shared/tcp/tcp_timeout_user_noop.go
@@ -1,5 +1,4 @@
 //go:build !linux && !zos
-// +build !linux,!zos
 
 package tcp
 
diff --git a/shared/termios/termios_linux.go b/shared/termios/termios_linux.go
index 4cef146f7257..c46f4a09526a 100644
--- a/shared/termios/termios_linux.go
+++ b/shared/termios/termios_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package termios
 
diff --git a/shared/termios/termios_other.go b/shared/termios/termios_other.go
index 160b9d9d848b..9fbf5a6fd6d0 100644
--- a/shared/termios/termios_other.go
+++ b/shared/termios/termios_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package termios
 
diff --git a/shared/util_linux.go b/shared/util_linux.go
index 953b4b597cf3..0b310d127daa 100644
--- a/shared/util_linux.go
+++ b/shared/util_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package shared
 
diff --git a/shared/util_linux_cgo.go b/shared/util_linux_cgo.go
index 61b823c2c67f..a2e463fefc61 100644
--- a/shared/util_linux_cgo.go
+++ b/shared/util_linux_cgo.go
@@ -1,5 +1,4 @@
 //go:build linux && cgo
-// +build linux,cgo
 
 package shared
 
diff --git a/shared/util_linux_notcgo.go b/shared/util_linux_notcgo.go
index 39ca2c444f13..68facc8fe270 100644
--- a/shared/util_linux_notcgo.go
+++ b/shared/util_linux_notcgo.go
@@ -1,5 +1,4 @@
 //go:build linux && !cgo
-// +build linux,!cgo
 
 package shared
 
diff --git a/shared/util_unix.go b/shared/util_unix.go
index 040532eecf8c..5aad2310067a 100644
--- a/shared/util_unix.go
+++ b/shared/util_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package shared
 
diff --git a/shared/util_windows.go b/shared/util_windows.go
index 5479b6864886..85dcfa95f537 100644
--- a/shared/util_windows.go
+++ b/shared/util_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package shared
 
diff --git a/shared/version/platform_linux.go b/shared/version/platform_linux.go
index 983581eb1e72..978698100355 100644
--- a/shared/version/platform_linux.go
+++ b/shared/version/platform_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package version
 
diff --git a/shared/version/platform_others.go b/shared/version/platform_others.go
index 74cf7b9701cc..b82b8159fdab 100644
--- a/shared/version/platform_others.go
+++ b/shared/version/platform_others.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package version