diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
index cc1b05f5..1857375e 100644
--- a/libcontainer/container_linux.go
+++ b/libcontainer/container_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/container_linux_test.go b/libcontainer/container_linux_test.go
index 01b167c5..3eb6e5af 100644
--- a/libcontainer/container_linux_test.go
+++ b/libcontainer/container_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/factory_linux.go b/libcontainer/factory_linux.go
index 63cf57b0..7d992d23 100644
--- a/libcontainer/factory_linux.go
+++ b/libcontainer/factory_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/factory_linux_test.go b/libcontainer/factory_linux_test.go
index 5d389909..fe34473c 100644
--- a/libcontainer/factory_linux_test.go
+++ b/libcontainer/factory_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/init_linux.go b/libcontainer/init_linux.go
index 985c9250..5bbe2920 100644
--- a/libcontainer/init_linux.go
+++ b/libcontainer/init_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/message_linux.go b/libcontainer/message_linux.go
index 1d4f5033..f10efa36 100644
--- a/libcontainer/message_linux.go
+++ b/libcontainer/message_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/network_linux.go b/libcontainer/network_linux.go
index 12e5800f..aa2be8ff 100644
--- a/libcontainer/network_linux.go
+++ b/libcontainer/network_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/notify_linux.go b/libcontainer/notify_linux.go
index 73a6f594..0ec1a55c 100644
--- a/libcontainer/notify_linux.go
+++ b/libcontainer/notify_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/notify_linux_test.go b/libcontainer/notify_linux_test.go
index 80859c61..cf0f90f4 100644
--- a/libcontainer/notify_linux_test.go
+++ b/libcontainer/notify_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/notify_linux_v2.go b/libcontainer/notify_v2_linux.go
similarity index 99%
rename from libcontainer/notify_linux_v2.go
rename to libcontainer/notify_v2_linux.go
index 8e3d4fd0..821536c8 100644
--- a/libcontainer/notify_linux_v2.go
+++ b/libcontainer/notify_v2_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/process_linux.go b/libcontainer/process_linux.go
index e1649876..ba025812 100644
--- a/libcontainer/process_linux.go
+++ b/libcontainer/process_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go
index 3c3fc0d1..19bc96d5 100644
--- a/libcontainer/rootfs_linux.go
+++ b/libcontainer/rootfs_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/rootfs_linux_test.go b/libcontainer/rootfs_linux_test.go
index 1bfe7c66..e3bfdc50 100644
--- a/libcontainer/rootfs_linux_test.go
+++ b/libcontainer/rootfs_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/seccomp/patchbpf/enosys_linux.go b/libcontainer/seccomp/patchbpf/enosys_linux.go
index ccf929d7..e5f867ec 100644
--- a/libcontainer/seccomp/patchbpf/enosys_linux.go
+++ b/libcontainer/seccomp/patchbpf/enosys_linux.go
@@ -1,4 +1,4 @@
-// +build linux,cgo,seccomp
+// +build cgo,seccomp
 
 package patchbpf
 
diff --git a/libcontainer/seccomp/patchbpf/enosys_linux_test.go b/libcontainer/seccomp/patchbpf/enosys_linux_test.go
index ce5f0254..04328862 100644
--- a/libcontainer/seccomp/patchbpf/enosys_linux_test.go
+++ b/libcontainer/seccomp/patchbpf/enosys_linux_test.go
@@ -1,4 +1,4 @@
-// +build linux,cgo,seccomp
+// +build cgo,seccomp
 
 package patchbpf
 
diff --git a/libcontainer/seccomp/seccomp_linux.go b/libcontainer/seccomp/seccomp_linux.go
index 58cad902..e86d0a95 100644
--- a/libcontainer/seccomp/seccomp_linux.go
+++ b/libcontainer/seccomp/seccomp_linux.go
@@ -1,4 +1,4 @@
-// +build linux,cgo,seccomp
+// +build cgo,seccomp
 
 package seccomp
 
diff --git a/libcontainer/setns_init_linux.go b/libcontainer/setns_init_linux.go
index 89b5609a..09a7d895 100644
--- a/libcontainer/setns_init_linux.go
+++ b/libcontainer/setns_init_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
index 868bbeee..f0d3506e 100644
--- a/libcontainer/specconv/spec_linux.go
+++ b/libcontainer/specconv/spec_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 // Package specconv implements conversion of specifications to libcontainer
 // configurations
 package specconv
diff --git a/libcontainer/specconv/spec_linux_test.go b/libcontainer/specconv/spec_linux_test.go
index 316a21e8..a81090be 100644
--- a/libcontainer/specconv/spec_linux_test.go
+++ b/libcontainer/specconv/spec_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package specconv
 
 import (
diff --git a/libcontainer/standard_init_linux.go b/libcontainer/standard_init_linux.go
index f1e20207..c02f0c45 100644
--- a/libcontainer/standard_init_linux.go
+++ b/libcontainer/standard_init_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/state_linux.go b/libcontainer/state_linux.go
index 3b71a0b0..aa6259b1 100644
--- a/libcontainer/state_linux.go
+++ b/libcontainer/state_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/state_linux_test.go b/libcontainer/state_linux_test.go
index a4558a5b..413626d5 100644
--- a/libcontainer/state_linux_test.go
+++ b/libcontainer/state_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package libcontainer
 
 import (
diff --git a/libcontainer/userns/userns_linux_test.go b/libcontainer/userns/userns_linux_test.go
index 2ddd3ff9..90d9270d 100644
--- a/libcontainer/userns/userns_linux_test.go
+++ b/libcontainer/userns/userns_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package userns
 
 import (
diff --git a/rootless_linux.go b/rootless_linux.go
index 3c210538..ae017033 100644
--- a/rootless_linux.go
+++ b/rootless_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/utils_linux.go b/utils_linux.go
index 8b8d9e57..2dfa63de 100644
--- a/utils_linux.go
+++ b/utils_linux.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (