diff --git a/client/allocdir/alloc_dir_unix.go b/client/allocdir/alloc_dir_unix.go
index d5e4a9296..0e8bdd39a 100644
--- a/client/allocdir/alloc_dir_unix.go
+++ b/client/allocdir/alloc_dir_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 // Functions shared between linux/darwin.
 package allocdir
diff --git a/client/driver/executor/executor_unix.go b/client/driver/executor/executor_unix.go
index 07c688084..7c8ddf724 100644
--- a/client/driver/executor/executor_unix.go
+++ b/client/driver/executor/executor_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package executor
 
diff --git a/client/driver/logging/syslog_parser_unix.go b/client/driver/logging/syslog_parser_unix.go
index 72d73c43d..3cda8bb2e 100644
--- a/client/driver/logging/syslog_parser_unix.go
+++ b/client/driver/logging/syslog_parser_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package logging
 
diff --git a/client/driver/logging/syslog_parser_unix_test.go b/client/driver/logging/syslog_parser_unix_test.go
index 4f1416a1a..aeb1959a8 100644
--- a/client/driver/logging/syslog_parser_unix_test.go
+++ b/client/driver/logging/syslog_parser_unix_test.go
@@ -1,4 +1,4 @@
-// +build !windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package logging
 
diff --git a/client/driver/logging/universal_collector_unix.go b/client/driver/logging/universal_collector_unix.go
index 100696816..1db92fce4 100644
--- a/client/driver/logging/universal_collector_unix.go
+++ b/client/driver/logging/universal_collector_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package logging
 
diff --git a/client/driver/utils_unix.go b/client/driver/utils_unix.go
index ccaaeee1f..474cdcf17 100644
--- a/client/driver/utils_unix.go
+++ b/client/driver/utils_unix.go
@@ -1,4 +1,4 @@
-// +build !linux,!windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package driver