diff --git a/mount/flags_linux.go b/mount/flags_linux.go
index 19c882f..0bb47d8 100644
--- a/mount/flags_linux.go
+++ b/mount/flags_linux.go
@@ -1,5 +1,3 @@
-// +build amd64
-
 package mount
 
 import (
diff --git a/mount/flags_unsupported.go b/mount/flags_unsupported.go
index e598354..5a14108 100644
--- a/mount/flags_unsupported.go
+++ b/mount/flags_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux,!freebsd linux,!amd64 freebsd,!cgo
+// +build !linux,!freebsd freebsd,!cgo
 
 package mount
 
diff --git a/mount/mounter_linux.go b/mount/mounter_linux.go
index 70b7798..dd4280c 100644
--- a/mount/mounter_linux.go
+++ b/mount/mounter_linux.go
@@ -1,5 +1,3 @@
-// +build amd64
-
 package mount
 
 import (
diff --git a/mount/mounter_unsupported.go b/mount/mounter_unsupported.go
index 06f2ac0..eb93365 100644
--- a/mount/mounter_unsupported.go
+++ b/mount/mounter_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux,!freebsd linux,!amd64 freebsd,!cgo
+// +build !linux,!freebsd freebsd,!cgo
 
 package mount
 
diff --git a/parsers/kernel/uname_linux.go b/parsers/kernel/uname_linux.go
index b29fcc3..8ca814c 100644
--- a/parsers/kernel/uname_linux.go
+++ b/parsers/kernel/uname_linux.go
@@ -1,5 +1,3 @@
-// +build amd64
-
 package kernel
 
 import (
diff --git a/parsers/kernel/uname_unsupported.go b/parsers/kernel/uname_unsupported.go
index 9cd8a1e..00c5422 100644
--- a/parsers/kernel/uname_unsupported.go
+++ b/parsers/kernel/uname_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux
 
 package kernel