diff --git a/daemon/logdrivers.go b/daemon/logdrivers_linux.go
similarity index 100%
rename from daemon/logdrivers.go
rename to daemon/logdrivers_linux.go
diff --git a/daemon/logdrivers_windows.go b/daemon/logdrivers_windows.go
new file mode 100644
index 0000000000..5dcbe718c6
--- /dev/null
+++ b/daemon/logdrivers_windows.go
@@ -0,0 +1,7 @@
+package daemon
+
+// Importing packages here only to make sure their init gets called and
+// therefore they register themselves to the logdriver factory.
+import (
+	_ "github.com/docker/docker/daemon/logger/jsonfilelog"
+)
diff --git a/daemon/logger/journald/journald.go b/daemon/logger/journald/journald.go
index 5dd0fe1951..7aa28f0d08 100644
--- a/daemon/logger/journald/journald.go
+++ b/daemon/logger/journald/journald.go
@@ -1,3 +1,5 @@
+// +build linux
+
 package journald
 
 import (
diff --git a/daemon/logger/journald/journald_unsupported.go b/daemon/logger/journald/journald_unsupported.go
new file mode 100644
index 0000000000..110833c23b
--- /dev/null
+++ b/daemon/logger/journald/journald_unsupported.go
@@ -0,0 +1,3 @@
+// +build !linux
+
+package journald
diff --git a/daemon/logger/syslog/syslog.go b/daemon/logger/syslog/syslog.go
index ca38d37f7f..6a6377f833 100644
--- a/daemon/logger/syslog/syslog.go
+++ b/daemon/logger/syslog/syslog.go
@@ -1,3 +1,5 @@
+// +build linux
+
 package syslog
 
 import (
diff --git a/daemon/logger/syslog/syslog_unsupported.go b/daemon/logger/syslog/syslog_unsupported.go
new file mode 100644
index 0000000000..50cc51b657
--- /dev/null
+++ b/daemon/logger/syslog/syslog_unsupported.go
@@ -0,0 +1,3 @@
+// +build !linux
+
+package syslog