diff --git a/collector/drbd_linux.go b/collector/drbd_linux.go
index 6815c5f0..4beb31db 100644
--- a/collector/drbd_linux.go
+++ b/collector/drbd_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nodrbd
+
 package collector
 
 import (
diff --git a/collector/filesystem_linux_test.go b/collector/filesystem_linux_test.go
index 973cd144..e4017790 100644
--- a/collector/filesystem_linux_test.go
+++ b/collector/filesystem_linux_test.go
@@ -11,8 +11,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !nofilesystem
-
 package collector
 
 import (
diff --git a/collector/kvm_bsd.go b/collector/kvm_bsd.go
index b4e95e6a..87987363 100644
--- a/collector/kvm_bsd.go
+++ b/collector/kvm_bsd.go
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !nomeminfo
+// +build !nokvm
 // +build freebsd dragonfly
 
 package collector
diff --git a/collector/mountstats_linux.go b/collector/mountstats_linux.go
index 3fa1597e..41020671 100644
--- a/collector/mountstats_linux.go
+++ b/collector/mountstats_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nomountstats
+
 package collector
 
 import (
diff --git a/collector/nfs_linux.go b/collector/nfs_linux.go
index 55f9e191..a540bb30 100644
--- a/collector/nfs_linux.go
+++ b/collector/nfs_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nonfs
+
 package collector
 
 import (
diff --git a/collector/nfsd_linux.go b/collector/nfsd_linux.go
index b6f2f8ee..8cb1e050 100644
--- a/collector/nfsd_linux.go
+++ b/collector/nfsd_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nonfsd
+
 package collector
 
 import (
diff --git a/collector/perf_linux.go b/collector/perf_linux.go
index e452754c..3a2f7394 100644
--- a/collector/perf_linux.go
+++ b/collector/perf_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !noperf
+
 package collector
 
 import (
diff --git a/collector/schedstat_linux.go b/collector/schedstat_linux.go
index d2f04f69..9e5b744d 100644
--- a/collector/schedstat_linux.go
+++ b/collector/schedstat_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !noshedstat
+
 package collector
 
 import (
diff --git a/collector/sysctl_bsd.go b/collector/sysctl_bsd.go
index 3038f415..a671bc2c 100644
--- a/collector/sysctl_bsd.go
+++ b/collector/sysctl_bsd.go
@@ -12,7 +12,7 @@
 // limitations under the License.
 
 // +build freebsd dragonfly openbsd netbsd darwin
-// +build !nomeminfo
+// +build cgo
 
 package collector
 
diff --git a/collector/wifi_linux.go b/collector/wifi_linux.go
index 118e7143..b4b37593 100644
--- a/collector/wifi_linux.go
+++ b/collector/wifi_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nowifi
+
 package collector
 
 import (
diff --git a/collector/xfs_linux.go b/collector/xfs_linux.go
index 77824c53..36dfff50 100644
--- a/collector/xfs_linux.go
+++ b/collector/xfs_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !noxfs
+
 package collector
 
 import (
diff --git a/collector/zfs_freebsd.go b/collector/zfs_freebsd.go
index a625bbc9..92661e43 100644
--- a/collector/zfs_freebsd.go
+++ b/collector/zfs_freebsd.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nozfs
+
 package collector
 
 import (
diff --git a/collector/zfs_linux.go b/collector/zfs_linux.go
index e2c9749a..2449c263 100644
--- a/collector/zfs_linux.go
+++ b/collector/zfs_linux.go
@@ -11,6 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !nozfs
+
 package collector
 
 import (
diff --git a/collector/zfs_solaris.go b/collector/zfs_solaris.go
index bfda64f3..1c0460c1 100644
--- a/collector/zfs_solaris.go
+++ b/collector/zfs_solaris.go
@@ -12,6 +12,7 @@
 // limitations under the License.
 
 // +build solaris
+// +build !nozfs
 
 package collector