From cf15d5bbc62d58eec714afe0d54d9470fadf25f5 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 1 Aug 2025 00:46:53 +0200
Subject: [PATCH] remove obsolete //go:build tags

These are no longer needed as these are now part of a module.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 daemon/container.go                                          | 3 ---
 daemon/container/view.go                                     | 3 ---
 daemon/container_operations.go                               | 3 ---
 daemon/containerd/image_delete.go                            | 3 ---
 daemon/containerd/image_inspect.go                           | 3 ---
 daemon/containerd/image_push_test.go                         | 3 ---
 daemon/containerd/imagespec.go                               | 3 ---
 daemon/create.go                                             | 3 ---
 daemon/daemon.go                                             | 3 ---
 daemon/daemon_unix.go                                        | 3 +--
 daemon/info.go                                               | 3 ---
 daemon/inspect.go                                            | 3 ---
 daemon/internal/builder-next/adapters/containerimage/pull.go | 3 ---
 daemon/internal/builder-next/exporter/mobyexporter/export.go | 3 ---
 daemon/internal/image/rootfs.go                              | 3 ---
 daemon/internal/platform/platform_linux.go                   | 3 ---
 daemon/internal/sliceutil/sliceutil.go                       | 3 ---
 daemon/internal/unshare/unshare_linux.go                     | 2 --
 daemon/libnetwork/agent.go                                   | 3 ---
 daemon/libnetwork/agent_test.go                              | 3 ---
 daemon/libnetwork/config/config.go                           | 3 ---
 daemon/libnetwork/drivers/bridge/bridge_linux.go             | 3 ---
 daemon/libnetwork/drivers/bridge/internal/firewaller/stub.go | 3 +--
 daemon/libnetwork/drivers/bridge/internal/nftabler/port.go   | 3 +--
 daemon/libnetwork/drivers/bridge/port_mapping_linux.go       | 3 ---
 daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go  | 3 ---
 daemon/libnetwork/drivers/overlay/ov_network.go              | 3 +--
 daemon/libnetwork/drivers/overlay/peerdb.go                  | 3 +--
 daemon/libnetwork/drivers/remote/driver.go                   | 3 ---
 daemon/libnetwork/endpoint.go                                | 3 ---
 daemon/libnetwork/endpoint_store.go                          | 3 ---
 daemon/libnetwork/internal/countmap/countmap.go              | 3 ---
 daemon/libnetwork/internal/hashable/net.go                   | 3 ---
 daemon/libnetwork/internal/l2disco/unsol_arp_linux.go        | 3 ---
 daemon/libnetwork/internal/l2disco/unsol_na_linux.go         | 3 ---
 daemon/libnetwork/internal/maputil/maputil.go                | 3 ---
 daemon/libnetwork/internal/nftables/nftables_linux.go        | 3 ---
 daemon/libnetwork/internal/resolvconf/resolvconf.go          | 3 ---
 daemon/libnetwork/internal/setmatrix/setmatrix.go            | 3 ---
 daemon/libnetwork/ipams/defaultipam/address_space.go         | 3 ---
 daemon/libnetwork/ipamutils/utils.go                         | 3 ---
 daemon/libnetwork/iptables/iptables.go                       | 3 +--
 daemon/libnetwork/netutils/utils_linux.go                    | 3 +--
 daemon/libnetwork/network.go                                 | 3 ---
 daemon/libnetwork/network_store.go                           | 3 ---
 daemon/libnetwork/networkdb/cluster.go                       | 3 ---
 daemon/libnetwork/networkdb/networkdb.go                     | 3 ---
 daemon/libnetwork/options/options.go                         | 3 ---
 daemon/libnetwork/osl/interface_linux.go                     | 3 ---
 daemon/libnetwork/osl/route_linux.go                         | 3 +--
 daemon/libnetwork/portmappers/routed/mapper_linux.go         | 3 ---
 daemon/libnetwork/sandbox.go                                 | 3 ---
 daemon/libnetwork/service.go                                 | 3 ---
 daemon/logger/loggerutils/logfile.go                         | 3 ---
 daemon/pkg/oci/defaults.go                                   | 3 ---
 daemon/pkg/plugin/v2/plugin_linux.go                         | 3 ---
 daemon/pkg/registry/config.go                                | 3 ---
 daemon/server/router/container/inspect.go                    | 3 ---
 daemon/server/router/grpc/grpc.go                            | 3 ---
 daemon/server/router/image/inspect_response.go               | 3 ---
 daemon/server/router/system/info_response.go                 | 3 ---
 daemon/server/router/system/system.go                        | 3 ---
 daemon/server/router/system/system_routes.go                 | 3 ---
 internal/iterutil/iterutil.go                                | 3 ---
 internal/iterutil/iterutil_test.go                           | 3 ---
 testutil/daemon/daemon.go                                    | 3 ---
 testutil/environment/protect_linux.go                        | 3 ---
 testutil/helpers.go                                          | 3 ---
 68 files changed, 8 insertions(+), 195 deletions(-)

diff --git a/daemon/container.go b/daemon/container.go
index 60ca6cc2f5..70fa622a57 100644
--- a/daemon/container.go
+++ b/daemon/container.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package daemon
 
 import (
diff --git a/daemon/container/view.go b/daemon/container/view.go
index 7ea81f84e1..d849db6375 100644
--- a/daemon/container/view.go
+++ b/daemon/container/view.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package container
 
 import (
diff --git a/daemon/container_operations.go b/daemon/container_operations.go
index 03c3ba3b7b..cf51847f2a 100644
--- a/daemon/container_operations.go
+++ b/daemon/container_operations.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package daemon
 
 import (
diff --git a/daemon/containerd/image_delete.go b/daemon/containerd/image_delete.go
index be6ca86a2d..314dc385a6 100644
--- a/daemon/containerd/image_delete.go
+++ b/daemon/containerd/image_delete.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package containerd
 
 import (
diff --git a/daemon/containerd/image_inspect.go b/daemon/containerd/image_inspect.go
index 2119ab2d0e..d2d1bb0f65 100644
--- a/daemon/containerd/image_inspect.go
+++ b/daemon/containerd/image_inspect.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package containerd
 
 import (
diff --git a/daemon/containerd/image_push_test.go b/daemon/containerd/image_push_test.go
index d2bee4e97b..a9e0c05d29 100644
--- a/daemon/containerd/image_push_test.go
+++ b/daemon/containerd/image_push_test.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package containerd
 
 import (
diff --git a/daemon/containerd/imagespec.go b/daemon/containerd/imagespec.go
index c2e6dbcc1f..6ec79d8011 100644
--- a/daemon/containerd/imagespec.go
+++ b/daemon/containerd/imagespec.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package containerd
 
 import (
diff --git a/daemon/create.go b/daemon/create.go
index d2dc768abd..8dc113a371 100644
--- a/daemon/create.go
+++ b/daemon/create.go
@@ -1,6 +1,3 @@
-// TODO(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package daemon
 
 import (
diff --git a/daemon/daemon.go b/daemon/daemon.go
index fecbe464cb..c6ffd369eb 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 // Package daemon exposes the functions that occur on the host server
 // that the Docker daemon is running.
 //
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
index be5b42aa04..98d04017f2 100644
--- a/daemon/daemon_unix.go
+++ b/daemon/daemon_unix.go
@@ -1,5 +1,4 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23 && (linux || freebsd)
+//go:build linux || freebsd
 
 package daemon
 
diff --git a/daemon/info.go b/daemon/info.go
index 9d943cd38c..107b2bcb11 100644
--- a/daemon/info.go
+++ b/daemon/info.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package daemon
 
 import (
diff --git a/daemon/inspect.go b/daemon/inspect.go
index 658305aca7..1362667bdd 100644
--- a/daemon/inspect.go
+++ b/daemon/inspect.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package daemon
 
 import (
diff --git a/daemon/internal/builder-next/adapters/containerimage/pull.go b/daemon/internal/builder-next/adapters/containerimage/pull.go
index 271ba420b3..d549358f8a 100644
--- a/daemon/internal/builder-next/adapters/containerimage/pull.go
+++ b/daemon/internal/builder-next/adapters/containerimage/pull.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package containerimage
 
 import (
diff --git a/daemon/internal/builder-next/exporter/mobyexporter/export.go b/daemon/internal/builder-next/exporter/mobyexporter/export.go
index 43a289da42..3aac1d258f 100644
--- a/daemon/internal/builder-next/exporter/mobyexporter/export.go
+++ b/daemon/internal/builder-next/exporter/mobyexporter/export.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package mobyexporter
 
 import (
diff --git a/daemon/internal/image/rootfs.go b/daemon/internal/image/rootfs.go
index 95771f0d9b..6b1f9c7fdb 100644
--- a/daemon/internal/image/rootfs.go
+++ b/daemon/internal/image/rootfs.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package image
 
 import (
diff --git a/daemon/internal/platform/platform_linux.go b/daemon/internal/platform/platform_linux.go
index 7cb49aa901..c2f079bdbb 100644
--- a/daemon/internal/platform/platform_linux.go
+++ b/daemon/internal/platform/platform_linux.go
@@ -1,6 +1,3 @@
-// TODO(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package platform
 
 import (
diff --git a/daemon/internal/sliceutil/sliceutil.go b/daemon/internal/sliceutil/sliceutil.go
index f0733852a6..6e3967c927 100644
--- a/daemon/internal/sliceutil/sliceutil.go
+++ b/daemon/internal/sliceutil/sliceutil.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package sliceutil
 
 func Dedup[T comparable](slice []T) []T {
diff --git a/daemon/internal/unshare/unshare_linux.go b/daemon/internal/unshare/unshare_linux.go
index 2269979522..8491b3abc0 100644
--- a/daemon/internal/unshare/unshare_linux.go
+++ b/daemon/internal/unshare/unshare_linux.go
@@ -1,5 +1,3 @@
-//go:build go1.10
-
 package unshare
 
 import (
diff --git a/daemon/libnetwork/agent.go b/daemon/libnetwork/agent.go
index 126175c19c..50a4c9e534 100644
--- a/daemon/libnetwork/agent.go
+++ b/daemon/libnetwork/agent.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package libnetwork
 
 //go:generate protoc -I=. -I=../../vendor/ --gogofaster_out=import_path=github.com/docker/docker/daemon/libnetwork:. agent.proto
diff --git a/daemon/libnetwork/agent_test.go b/daemon/libnetwork/agent_test.go
index 39db24c778..8dd85837ca 100644
--- a/daemon/libnetwork/agent_test.go
+++ b/daemon/libnetwork/agent_test.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package libnetwork
 
 import (
diff --git a/daemon/libnetwork/config/config.go b/daemon/libnetwork/config/config.go
index d584da6d4a..ea60a45c62 100644
--- a/daemon/libnetwork/config/config.go
+++ b/daemon/libnetwork/config/config.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package config
 
 import (
diff --git a/daemon/libnetwork/drivers/bridge/bridge_linux.go b/daemon/libnetwork/drivers/bridge/bridge_linux.go
index 22dfb14bd1..ec7b0cae8a 100644
--- a/daemon/libnetwork/drivers/bridge/bridge_linux.go
+++ b/daemon/libnetwork/drivers/bridge/bridge_linux.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package bridge
 
 import (
diff --git a/daemon/libnetwork/drivers/bridge/internal/firewaller/stub.go b/daemon/libnetwork/drivers/bridge/internal/firewaller/stub.go
index e318b369c5..cf884edd26 100644
--- a/daemon/libnetwork/drivers/bridge/internal/firewaller/stub.go
+++ b/daemon/libnetwork/drivers/bridge/internal/firewaller/stub.go
@@ -1,5 +1,4 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23 && linux
+//go:build linux
 
 package firewaller
 
diff --git a/daemon/libnetwork/drivers/bridge/internal/nftabler/port.go b/daemon/libnetwork/drivers/bridge/internal/nftabler/port.go
index 1160a64971..63de1fca87 100644
--- a/daemon/libnetwork/drivers/bridge/internal/nftabler/port.go
+++ b/daemon/libnetwork/drivers/bridge/internal/nftabler/port.go
@@ -1,5 +1,4 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.22 && linux
+//go:build linux
 
 package nftabler
 
diff --git a/daemon/libnetwork/drivers/bridge/port_mapping_linux.go b/daemon/libnetwork/drivers/bridge/port_mapping_linux.go
index 75bf1372d1..f0cb7a117f 100644
--- a/daemon/libnetwork/drivers/bridge/port_mapping_linux.go
+++ b/daemon/libnetwork/drivers/bridge/port_mapping_linux.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package bridge
 
 import (
diff --git a/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go b/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go
index 70b522b9d6..4d1ef78691 100644
--- a/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go
+++ b/daemon/libnetwork/drivers/bridge/port_mapping_linux_test.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package bridge
 
 import (
diff --git a/daemon/libnetwork/drivers/overlay/ov_network.go b/daemon/libnetwork/drivers/overlay/ov_network.go
index 933711b6a5..0a63b2ca02 100644
--- a/daemon/libnetwork/drivers/overlay/ov_network.go
+++ b/daemon/libnetwork/drivers/overlay/ov_network.go
@@ -1,5 +1,4 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23 && linux
+//go:build linux
 
 package overlay
 
diff --git a/daemon/libnetwork/drivers/overlay/peerdb.go b/daemon/libnetwork/drivers/overlay/peerdb.go
index 71329c729a..f33e740cb4 100644
--- a/daemon/libnetwork/drivers/overlay/peerdb.go
+++ b/daemon/libnetwork/drivers/overlay/peerdb.go
@@ -1,5 +1,4 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23 && linux
+//go:build linux
 
 package overlay
 
diff --git a/daemon/libnetwork/drivers/remote/driver.go b/daemon/libnetwork/drivers/remote/driver.go
index a295cca38f..e2543732a7 100644
--- a/daemon/libnetwork/drivers/remote/driver.go
+++ b/daemon/libnetwork/drivers/remote/driver.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package remote
 
 import (
diff --git a/daemon/libnetwork/endpoint.go b/daemon/libnetwork/endpoint.go
index 8d1eda42b8..401b41152c 100644
--- a/daemon/libnetwork/endpoint.go
+++ b/daemon/libnetwork/endpoint.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package libnetwork
 
 import (
diff --git a/daemon/libnetwork/endpoint_store.go b/daemon/libnetwork/endpoint_store.go
index e35944e359..4a4193b4ef 100644
--- a/daemon/libnetwork/endpoint_store.go
+++ b/daemon/libnetwork/endpoint_store.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package libnetwork
 
 import (
diff --git a/daemon/libnetwork/internal/countmap/countmap.go b/daemon/libnetwork/internal/countmap/countmap.go
index a028ed9684..e9ec4a0310 100644
--- a/daemon/libnetwork/internal/countmap/countmap.go
+++ b/daemon/libnetwork/internal/countmap/countmap.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package countmap
 
 // Map is a map of counters.
diff --git a/daemon/libnetwork/internal/hashable/net.go b/daemon/libnetwork/internal/hashable/net.go
index f33a3fbe79..a8a6a6dae5 100644
--- a/daemon/libnetwork/internal/hashable/net.go
+++ b/daemon/libnetwork/internal/hashable/net.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 // Package hashable provides handy utility types for making unhashable values
 // hashable.
 package hashable
diff --git a/daemon/libnetwork/internal/l2disco/unsol_arp_linux.go b/daemon/libnetwork/internal/l2disco/unsol_arp_linux.go
index 6d696b99df..8f41a960dd 100644
--- a/daemon/libnetwork/internal/l2disco/unsol_arp_linux.go
+++ b/daemon/libnetwork/internal/l2disco/unsol_arp_linux.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package l2disco
 
 import (
diff --git a/daemon/libnetwork/internal/l2disco/unsol_na_linux.go b/daemon/libnetwork/internal/l2disco/unsol_na_linux.go
index cf47c9b43d..017e95d734 100644
--- a/daemon/libnetwork/internal/l2disco/unsol_na_linux.go
+++ b/daemon/libnetwork/internal/l2disco/unsol_na_linux.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package l2disco
 
 import (
diff --git a/daemon/libnetwork/internal/maputil/maputil.go b/daemon/libnetwork/internal/maputil/maputil.go
index 06a55c0ed1..1f3e9f6164 100644
--- a/daemon/libnetwork/internal/maputil/maputil.go
+++ b/daemon/libnetwork/internal/maputil/maputil.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package maputil
 
 func FilterValues[K comparable, V any](in map[K]V, fn func(V) bool) []V {
diff --git a/daemon/libnetwork/internal/nftables/nftables_linux.go b/daemon/libnetwork/internal/nftables/nftables_linux.go
index ca99134f92..da6fc51559 100644
--- a/daemon/libnetwork/internal/nftables/nftables_linux.go
+++ b/daemon/libnetwork/internal/nftables/nftables_linux.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 // Package nftables provides methods to create an nftables table and manage its maps, sets,
 // chains, and rules.
 //
diff --git a/daemon/libnetwork/internal/resolvconf/resolvconf.go b/daemon/libnetwork/internal/resolvconf/resolvconf.go
index 32242c9a5b..f73d5872b5 100644
--- a/daemon/libnetwork/internal/resolvconf/resolvconf.go
+++ b/daemon/libnetwork/internal/resolvconf/resolvconf.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 // Package resolvconf is used to generate a container's /etc/resolv.conf file.
 //
 // Constructor Load and Parse read a resolv.conf file from the filesystem or
diff --git a/daemon/libnetwork/internal/setmatrix/setmatrix.go b/daemon/libnetwork/internal/setmatrix/setmatrix.go
index 4e19a9aa16..8edb7b4f44 100644
--- a/daemon/libnetwork/internal/setmatrix/setmatrix.go
+++ b/daemon/libnetwork/internal/setmatrix/setmatrix.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package setmatrix
 
 import (
diff --git a/daemon/libnetwork/ipams/defaultipam/address_space.go b/daemon/libnetwork/ipams/defaultipam/address_space.go
index 485952fd11..b6b66d69ce 100644
--- a/daemon/libnetwork/ipams/defaultipam/address_space.go
+++ b/daemon/libnetwork/ipams/defaultipam/address_space.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package defaultipam
 
 import (
diff --git a/daemon/libnetwork/ipamutils/utils.go b/daemon/libnetwork/ipamutils/utils.go
index 750757cdb8..8d7d937fa0 100644
--- a/daemon/libnetwork/ipamutils/utils.go
+++ b/daemon/libnetwork/ipamutils/utils.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 // Package ipamutils provides utility functions for ipam management
 package ipamutils
 
diff --git a/daemon/libnetwork/iptables/iptables.go b/daemon/libnetwork/iptables/iptables.go
index 5686fff2dc..f2d473cc93 100644
--- a/daemon/libnetwork/iptables/iptables.go
+++ b/daemon/libnetwork/iptables/iptables.go
@@ -1,5 +1,4 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23 && linux
+//go:build linux
 
 package iptables
 
diff --git a/daemon/libnetwork/netutils/utils_linux.go b/daemon/libnetwork/netutils/utils_linux.go
index 3ab31ed70b..06607fdd14 100644
--- a/daemon/libnetwork/netutils/utils_linux.go
+++ b/daemon/libnetwork/netutils/utils_linux.go
@@ -1,5 +1,4 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23 && linux
+//go:build linux
 
 package netutils
 
diff --git a/daemon/libnetwork/network.go b/daemon/libnetwork/network.go
index d43f225215..4a47dbc2d5 100644
--- a/daemon/libnetwork/network.go
+++ b/daemon/libnetwork/network.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package libnetwork
 
 import (
diff --git a/daemon/libnetwork/network_store.go b/daemon/libnetwork/network_store.go
index 5eeab47ad1..40ab4d6acd 100644
--- a/daemon/libnetwork/network_store.go
+++ b/daemon/libnetwork/network_store.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package libnetwork
 
 import (
diff --git a/daemon/libnetwork/networkdb/cluster.go b/daemon/libnetwork/networkdb/cluster.go
index 29c97c055f..774844f8f6 100644
--- a/daemon/libnetwork/networkdb/cluster.go
+++ b/daemon/libnetwork/networkdb/cluster.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package networkdb
 
 import (
diff --git a/daemon/libnetwork/networkdb/networkdb.go b/daemon/libnetwork/networkdb/networkdb.go
index de0efb8858..fffdaee838 100644
--- a/daemon/libnetwork/networkdb/networkdb.go
+++ b/daemon/libnetwork/networkdb/networkdb.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package networkdb
 
 //go:generate protoc -I=. -I=../../../vendor/ --gogofaster_out=import_path=github.com/docker/docker/daemon/libnetwork/networkdb:. networkdb.proto
diff --git a/daemon/libnetwork/options/options.go b/daemon/libnetwork/options/options.go
index 60f4ccb6e7..be3f82672f 100644
--- a/daemon/libnetwork/options/options.go
+++ b/daemon/libnetwork/options/options.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 // Package options provides a way to pass unstructured sets of options to a
 // component expecting a strongly-typed configuration structure.
 package options
diff --git a/daemon/libnetwork/osl/interface_linux.go b/daemon/libnetwork/osl/interface_linux.go
index 5eec769196..a5adf9ad9b 100644
--- a/daemon/libnetwork/osl/interface_linux.go
+++ b/daemon/libnetwork/osl/interface_linux.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package osl
 
 import (
diff --git a/daemon/libnetwork/osl/route_linux.go b/daemon/libnetwork/osl/route_linux.go
index 1530dbccf6..92c35a65fc 100644
--- a/daemon/libnetwork/osl/route_linux.go
+++ b/daemon/libnetwork/osl/route_linux.go
@@ -1,5 +1,4 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23 && (linux || freebsd)
+//go:build linux || freebsd
 
 package osl
 
diff --git a/daemon/libnetwork/portmappers/routed/mapper_linux.go b/daemon/libnetwork/portmappers/routed/mapper_linux.go
index f3725975e6..7d3264b77f 100644
--- a/daemon/libnetwork/portmappers/routed/mapper_linux.go
+++ b/daemon/libnetwork/portmappers/routed/mapper_linux.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package routed
 
 import (
diff --git a/daemon/libnetwork/sandbox.go b/daemon/libnetwork/sandbox.go
index 7a1b61c8dd..bd57127caa 100644
--- a/daemon/libnetwork/sandbox.go
+++ b/daemon/libnetwork/sandbox.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package libnetwork
 
 import (
diff --git a/daemon/libnetwork/service.go b/daemon/libnetwork/service.go
index 33fa891b6f..0cb8baea24 100644
--- a/daemon/libnetwork/service.go
+++ b/daemon/libnetwork/service.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package libnetwork
 
 import (
diff --git a/daemon/logger/loggerutils/logfile.go b/daemon/logger/loggerutils/logfile.go
index 22b685fa4e..265a63ebac 100644
--- a/daemon/logger/loggerutils/logfile.go
+++ b/daemon/logger/loggerutils/logfile.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package loggerutils
 
 import (
diff --git a/daemon/pkg/oci/defaults.go b/daemon/pkg/oci/defaults.go
index 9b221fa33a..5ebe04a88d 100644
--- a/daemon/pkg/oci/defaults.go
+++ b/daemon/pkg/oci/defaults.go
@@ -1,6 +1,3 @@
-// TODO(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package oci
 
 import (
diff --git a/daemon/pkg/plugin/v2/plugin_linux.go b/daemon/pkg/plugin/v2/plugin_linux.go
index 92fa6cc592..6dfe1367f7 100644
--- a/daemon/pkg/plugin/v2/plugin_linux.go
+++ b/daemon/pkg/plugin/v2/plugin_linux.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package v2
 
 import (
diff --git a/daemon/pkg/registry/config.go b/daemon/pkg/registry/config.go
index 7979aeaaef..ac13a31a82 100644
--- a/daemon/pkg/registry/config.go
+++ b/daemon/pkg/registry/config.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package registry
 
 import (
diff --git a/daemon/server/router/container/inspect.go b/daemon/server/router/container/inspect.go
index 7a11615707..f249e3ab9a 100644
--- a/daemon/server/router/container/inspect.go
+++ b/daemon/server/router/container/inspect.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package container
 
 import (
diff --git a/daemon/server/router/grpc/grpc.go b/daemon/server/router/grpc/grpc.go
index 97fc636b31..a1a3f8230a 100644
--- a/daemon/server/router/grpc/grpc.go
+++ b/daemon/server/router/grpc/grpc.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package grpc
 
 import (
diff --git a/daemon/server/router/image/inspect_response.go b/daemon/server/router/image/inspect_response.go
index 7d7f855941..c393d353de 100644
--- a/daemon/server/router/image/inspect_response.go
+++ b/daemon/server/router/image/inspect_response.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package image
 
 import (
diff --git a/daemon/server/router/system/info_response.go b/daemon/server/router/system/info_response.go
index 2ff1b5fdcf..92124de3f8 100644
--- a/daemon/server/router/system/info_response.go
+++ b/daemon/server/router/system/info_response.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package system
 
 import (
diff --git a/daemon/server/router/system/system.go b/daemon/server/router/system/system.go
index cb68188fff..8384fbd811 100644
--- a/daemon/server/router/system/system.go
+++ b/daemon/server/router/system/system.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package system
 
 import (
diff --git a/daemon/server/router/system/system_routes.go b/daemon/server/router/system/system_routes.go
index 580eba0587..194c399edd 100644
--- a/daemon/server/router/system/system_routes.go
+++ b/daemon/server/router/system/system_routes.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package system
 
 import (
diff --git a/internal/iterutil/iterutil.go b/internal/iterutil/iterutil.go
index d7d9dc0d5f..2a29e0f437 100644
--- a/internal/iterutil/iterutil.go
+++ b/internal/iterutil/iterutil.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package iterutil
 
 import (
diff --git a/internal/iterutil/iterutil_test.go b/internal/iterutil/iterutil_test.go
index c5a4de26da..4753108b21 100644
--- a/internal/iterutil/iterutil_test.go
+++ b/internal/iterutil/iterutil_test.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package iterutil
 
 import (
diff --git a/testutil/daemon/daemon.go b/testutil/daemon/daemon.go
index 015dd4a1f7..5f4afbdc14 100644
--- a/testutil/daemon/daemon.go
+++ b/testutil/daemon/daemon.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package daemon
 
 import (
diff --git a/testutil/environment/protect_linux.go b/testutil/environment/protect_linux.go
index 40369d8082..174b250d05 100644
--- a/testutil/environment/protect_linux.go
+++ b/testutil/environment/protect_linux.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package environment
 
 import (
diff --git a/testutil/helpers.go b/testutil/helpers.go
index db73ea7c13..353cfc46dc 100644
--- a/testutil/helpers.go
+++ b/testutil/helpers.go
@@ -1,6 +1,3 @@
-// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
-//go:build go1.23
-
 package testutil
 
 import (