diff --git a/ci/build-cxx-root.go b/ci/build-cxx-root.go
index 3ab0f4675..7f0d34416 100644
--- a/ci/build-cxx-root.go
+++ b/ci/build-cxx-root.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 // Command to build a given ROOT version from sources.
diff --git a/ci/install-cxx-root.go b/ci/install-cxx-root.go
index 25eb0a3ff..ce9680a8b 100644
--- a/ci/install-cxx-root.go
+++ b/ci/install-cxx-root.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 // Command to install a given (binary) ROOT version.
diff --git a/ci/mk-release.go b/ci/mk-release.go
index 8c278f363..81dd631c6 100644
--- a/ci/mk-release.go
+++ b/ci/mk-release.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/ci/run-tests.go b/ci/run-tests.go
index 1d0e0ac70..ef627d91f 100644
--- a/ci/run-tests.go
+++ b/ci/run-tests.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/ci/update-godoc.go b/ci/update-godoc.go
index 84e679718..c32cca258 100644
--- a/ci/update-godoc.go
+++ b/ci/update-godoc.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/fit/run.go b/fit/run.go
index 2c7374001..eded6edb7 100644
--- a/fit/run.go
+++ b/fit/run.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/cmd/root-gen-type/gen-data.go b/groot/cmd/root-gen-type/gen-data.go
index 08cc089fd..c24b723fa 100644
--- a/groot/cmd/root-gen-type/gen-data.go
+++ b/groot/cmd/root-gen-type/gen-data.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/gen.rboot.go b/groot/gen.rboot.go
index 827a38780..8789ee0c4 100644
--- a/groot/gen.rboot.go
+++ b/groot/gen.rboot.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 // gen.rboot generates rdict streamers from the C++/ROOT ones.
diff --git a/groot/gen.rbytes.go b/groot/gen.rbytes.go
index 3fd4c4cd6..8defd8289 100644
--- a/groot/gen.rbytes.go
+++ b/groot/gen.rbytes.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/gen.rcont.go b/groot/gen.rcont.go
index 210f5bda2..cd39282f3 100644
--- a/groot/gen.rcont.go
+++ b/groot/gen.rcont.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/gen.rhist.go b/groot/gen.rhist.go
index bd2301132..081550671 100644
--- a/groot/gen.rhist.go
+++ b/groot/gen.rhist.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/gen.rtree.go b/groot/gen.rtree.go
index 8bc43c28e..85bb42214 100644
--- a/groot/gen.rtree.go
+++ b/groot/gen.rtree.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/internal/list-groot-sinfos.go b/groot/internal/list-groot-sinfos.go
index bc6e465a1..94356613d 100644
--- a/groot/internal/list-groot-sinfos.go
+++ b/groot/internal/list-groot-sinfos.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 // list-groot-sinfos lists all the known StreamerInfos known to groot.
diff --git a/groot/internal/list-groot-types.go b/groot/internal/list-groot-types.go
index 5efc38be9..496467e0f 100644
--- a/groot/internal/list-groot-types.go
+++ b/groot/internal/list-groot-types.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 // list-groot-types lists all the groot types registered with the rtypes factory.
diff --git a/groot/internal/rcompress/notcompressible_test.go b/groot/internal/rcompress/notcompressible_test.go
index e38415591..1ef951785 100644
--- a/groot/internal/rcompress/notcompressible_test.go
+++ b/groot/internal/rcompress/notcompressible_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !race
 // +build !race
 
 package rcompress
diff --git a/groot/internal/rcompress/rcompress_test.go b/groot/internal/rcompress/rcompress_test.go
index 567076a86..7c937e5d3 100644
--- a/groot/internal/rcompress/rcompress_test.go
+++ b/groot/internal/rcompress/rcompress_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !race
 // +build !race
 
 package rcompress_test
diff --git a/groot/riofs/gendata/gen-bitset-tree.go b/groot/riofs/gendata/gen-bitset-tree.go
index e899875b0..d3ac0f82e 100644
--- a/groot/riofs/gendata/gen-bitset-tree.go
+++ b/groot/riofs/gendata/gen-bitset-tree.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/riofs/gendata/gen-dir.go b/groot/riofs/gendata/gen-dir.go
index 65a83713e..9b86c92ac 100644
--- a/groot/riofs/gendata/gen-dir.go
+++ b/groot/riofs/gendata/gen-dir.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // Copyright ©2018 The go-hep Authors. All rights reserved.
diff --git a/groot/riofs/gendata/gen-evnt-tree.go b/groot/riofs/gendata/gen-evnt-tree.go
index 73d9f652d..fef7e658a 100644
--- a/groot/riofs/gendata/gen-evnt-tree.go
+++ b/groot/riofs/gendata/gen-evnt-tree.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // Copyright ©2018 The go-hep Authors. All rights reserved.
diff --git a/groot/riofs/gendata/gen-flat-tree.go b/groot/riofs/gendata/gen-flat-tree.go
index 3fa01cdb9..405caf299 100644
--- a/groot/riofs/gendata/gen-flat-tree.go
+++ b/groot/riofs/gendata/gen-flat-tree.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/riofs/gendata/gen-join-trees.go b/groot/riofs/gendata/gen-join-trees.go
index a06121737..048f27841 100644
--- a/groot/riofs/gendata/gen-join-trees.go
+++ b/groot/riofs/gendata/gen-join-trees.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/riofs/gendata/gen-map-tree.go b/groot/riofs/gendata/gen-map-tree.go
index 223186fa3..2147845cb 100644
--- a/groot/riofs/gendata/gen-map-tree.go
+++ b/groot/riofs/gendata/gen-map-tree.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/riofs/gendata/gen-multi-leaves-tree.go b/groot/riofs/gendata/gen-multi-leaves-tree.go
index b1eaa589c..d5c7810f3 100644
--- a/groot/riofs/gendata/gen-multi-leaves-tree.go
+++ b/groot/riofs/gendata/gen-multi-leaves-tree.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/riofs/gendata/gen-ndim-slice.go b/groot/riofs/gendata/gen-ndim-slice.go
index 499f9a162..ce2aa756d 100644
--- a/groot/riofs/gendata/gen-ndim-slice.go
+++ b/groot/riofs/gendata/gen-ndim-slice.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/riofs/gendata/gen-ndim.go b/groot/riofs/gendata/gen-ndim.go
index 8fb8811c1..18a436147 100644
--- a/groot/riofs/gendata/gen-ndim.go
+++ b/groot/riofs/gendata/gen-ndim.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/groot/riofs/gendata/gen-small-evnt-tree.go b/groot/riofs/gendata/gen-small-evnt-tree.go
index 19a37b13a..2e839c841 100644
--- a/groot/riofs/gendata/gen-small-evnt-tree.go
+++ b/groot/riofs/gendata/gen-small-evnt-tree.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // Copyright ©2018 The go-hep Authors. All rights reserved.
diff --git a/groot/rtree/rfunc/gen-rfuncs.go b/groot/rtree/rfunc/gen-rfuncs.go
index c1e6ca9af..c4b84de9e 100644
--- a/groot/rtree/rfunc/gen-rfuncs.go
+++ b/groot/rtree/rfunc/gen-rfuncs.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/hbook/rootcnv/testdata/gen-2d-data.go b/hbook/rootcnv/testdata/gen-2d-data.go
index 56fac6c1c..1122db29a 100644
--- a/hbook/rootcnv/testdata/gen-2d-data.go
+++ b/hbook/rootcnv/testdata/gen-2d-data.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/hbook/rootcnv/testdata/make-hbook.go b/hbook/rootcnv/testdata/make-hbook.go
index e6506f31b..9ca10fbc6 100644
--- a/hbook/rootcnv/testdata/make-hbook.go
+++ b/hbook/rootcnv/testdata/make-hbook.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/heppdt/gen-tabledata.go b/heppdt/gen-tabledata.go
index 7caeef5d1..c5e96b9b8 100644
--- a/heppdt/gen-tabledata.go
+++ b/heppdt/gen-tabledata.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 // gen-tabledata generates tabledata.go
diff --git a/hplot/cmd/iplot/main.go b/hplot/cmd/iplot/main.go
index 670b20609..dcaaba43b 100644
--- a/hplot/cmd/iplot/main.go
+++ b/hplot/cmd/iplot/main.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !cross_compile
 // +build !cross_compile
 
 package main
diff --git a/hplot/hplot_gen.go b/hplot/hplot_gen.go
index a5aa6e969..c1f35bf04 100644
--- a/hplot/hplot_gen.go
+++ b/hplot/hplot_gen.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build tools
 // +build tools
 
 package hplot
diff --git a/pawgo/app.go b/pawgo/app.go
index 27f036cf8..af60986f3 100644
--- a/pawgo/app.go
+++ b/pawgo/app.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !cross_compile
 // +build !cross_compile
 
 package main
diff --git a/pawgo/app_xcomp.go b/pawgo/app_xcomp.go
index b2e5314cb..18caa180b 100644
--- a/pawgo/app_xcomp.go
+++ b/pawgo/app_xcomp.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build cross_compile
 // +build cross_compile
 
 package main
diff --git a/pawgo/gen.hsimple.rio.go b/pawgo/gen.hsimple.rio.go
index 2654b4ad2..a006fbaae 100644
--- a/pawgo/gen.hsimple.rio.go
+++ b/pawgo/gen.hsimple.rio.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/pawgo/wmgr.go b/pawgo/wmgr.go
index aec6254fb..3333fccfb 100644
--- a/pawgo/wmgr.go
+++ b/pawgo/wmgr.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !cross_compile
 // +build !cross_compile
 
 package main
diff --git a/pawgo/wmgr_xcomp.go b/pawgo/wmgr_xcomp.go
index d1226e79e..89276239c 100644
--- a/pawgo/wmgr_xcomp.go
+++ b/pawgo/wmgr_xcomp.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build cross_compile
 // +build cross_compile
 
 package main
diff --git a/rio/testdata/gen-runhdr.go b/rio/testdata/gen-runhdr.go
index f95e2734d..d4e8d4dbd 100644
--- a/rio/testdata/gen-runhdr.go
+++ b/rio/testdata/gen-runhdr.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/sio/testdata/gen-runhdr.go b/sio/testdata/gen-runhdr.go
index 8a120d3bf..cd9968cd4 100644
--- a/sio/testdata/gen-runhdr.go
+++ b/sio/testdata/gen-runhdr.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/version.go b/version.go
index 2db355913..6e6609663 100644
--- a/version.go
+++ b/version.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.12
 // +build go1.12
 
 package hep
diff --git a/version_example_test.go b/version_example_test.go
index cd69e02cb..28106e73a 100644
--- a/version_example_test.go
+++ b/version_example_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.12
 // +build go1.12
 
 package hep_test
diff --git a/version_test.go b/version_test.go
index 8f70e24d9..ce7ed7df2 100644
--- a/version_test.go
+++ b/version_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build go1.12
 // +build go1.12
 
 package hep
diff --git a/xrootd/bind_test.go b/xrootd/bind_test.go
index 7891c0be6..80ba91c15 100644
--- a/xrootd/bind_test.go
+++ b/xrootd/bind_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !ci
 // +build !ci
 
 package xrootd
diff --git a/xrootd/go_server_test.go b/xrootd/go_server_test.go
index 945014fcb..3ad888b7f 100644
--- a/xrootd/go_server_test.go
+++ b/xrootd/go_server_test.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build xrootd_test_with_go_server
 // +build xrootd_test_with_go_server
 
 package client // import "go-hep.org/x/hep/xrootd/client"
diff --git a/xrootd/xrdproto/auth/krb5/krb5_unix.go b/xrootd/xrdproto/auth/krb5/krb5_unix.go
index e045f552b..2805f1a5f 100644
--- a/xrootd/xrdproto/auth/krb5/krb5_unix.go
+++ b/xrootd/xrdproto/auth/krb5/krb5_unix.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !windows
 // +build !windows
 
 package krb5
diff --git a/xrootd/xrdproto/auth/krb5/krb5_windows.go b/xrootd/xrdproto/auth/krb5/krb5_windows.go
index 42f95386f..c288e202c 100644
--- a/xrootd/xrdproto/auth/krb5/krb5_windows.go
+++ b/xrootd/xrdproto/auth/krb5/krb5_windows.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build windows
 // +build windows
 
 package krb5
diff --git a/xrootd/xrdproto/auth/unix/lookupgid_unix.go b/xrootd/xrdproto/auth/unix/lookupgid_unix.go
index 1c4d31088..7ceb49ba2 100644
--- a/xrootd/xrdproto/auth/unix/lookupgid_unix.go
+++ b/xrootd/xrdproto/auth/unix/lookupgid_unix.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !windows
 // +build !windows
 
 package unix // import "go-hep.org/x/hep/xrootd/xrdproto/auth/unix"
diff --git a/xrootd/xrdproto/auth/unix/lookupgid_windows.go b/xrootd/xrdproto/auth/unix/lookupgid_windows.go
index 9579c2280..f048c4230 100644
--- a/xrootd/xrdproto/auth/unix/lookupgid_windows.go
+++ b/xrootd/xrdproto/auth/unix/lookupgid_windows.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build windows
 // +build windows
 
 package unix // import "go-hep.org/x/hep/xrootd/xrdproto/auth/unix"
diff --git a/xrootd/xrdproto/gen-marshal.go b/xrootd/xrdproto/gen-marshal.go
index d630e29db..719f9877e 100644
--- a/xrootd/xrdproto/gen-marshal.go
+++ b/xrootd/xrdproto/gen-marshal.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build ignore
 // +build ignore
 
 package main