diff --git a/client/allocdir/alloc_dir_posix.go b/client/allocdir/alloc_dir_unix.go
similarity index 100%
rename from client/allocdir/alloc_dir_posix.go
rename to client/allocdir/alloc_dir_unix.go
diff --git a/client/driver/executor/executor_posix.go b/client/driver/executor/executor_unix.go
similarity index 100%
rename from client/driver/executor/executor_posix.go
rename to client/driver/executor/executor_unix.go
diff --git a/client/driver/logging/syslog_parser.go b/client/driver/logging/syslog_parser_unix.go
similarity index 100%
rename from client/driver/logging/syslog_parser.go
rename to client/driver/logging/syslog_parser_unix.go
diff --git a/client/driver/logging/syslog_parser_test.go b/client/driver/logging/syslog_parser_unix_test.go
similarity index 100%
rename from client/driver/logging/syslog_parser_test.go
rename to client/driver/logging/syslog_parser_unix_test.go
diff --git a/client/driver/logging/syslog_server.go b/client/driver/logging/syslog_server_unix.go
similarity index 100%
rename from client/driver/logging/syslog_server.go
rename to client/driver/logging/syslog_server_unix.go
diff --git a/client/driver/logging/universal_collector.go b/client/driver/logging/universal_collector_unix.go
similarity index 100%
rename from client/driver/logging/universal_collector.go
rename to client/driver/logging/universal_collector_unix.go
diff --git a/client/driver/utils_linux.go b/client/driver/utils_linux.go
deleted file mode 100644
index 693bba6f6..000000000
--- a/client/driver/utils_linux.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package driver
-
-import (
-	"os/exec"
-	"syscall"
-)
-
-// isolateCommand sets the setsid flag in exec.Cmd to true so that the process
-// becomes the process leader in a new session and doesn't receive signals that
-// are sent to the parent process.
-func isolateCommand(cmd *exec.Cmd) {
-	if cmd.SysProcAttr == nil {
-		cmd.SysProcAttr = &syscall.SysProcAttr{}
-	}
-	cmd.SysProcAttr.Setsid = true
-}
diff --git a/client/driver/utils_posix.go b/client/driver/utils_unix.go
similarity index 100%
rename from client/driver/utils_posix.go
rename to client/driver/utils_unix.go