diff --git a/libcontainer/devices/devices_test.go b/libcontainer/devices/devices_test.go
index 9e52fc4e..50ea78bc 100644
--- a/libcontainer/devices/devices_test.go
+++ b/libcontainer/devices/devices_test.go
@@ -1,3 +1,5 @@
+// +build linux freebsd
+
 package devices
 
 import (
diff --git a/libcontainer/devices/devices_unsupported.go b/libcontainer/devices/devices_unsupported.go
new file mode 100644
index 00000000..1e84033d
--- /dev/null
+++ b/libcontainer/devices/devices_unsupported.go
@@ -0,0 +1,3 @@
+// +build windows
+
+package devices
diff --git a/libcontainer/devices/devices_windows.go b/libcontainer/devices/devices_windows.go
deleted file mode 100644
index b2a9aa34..00000000
--- a/libcontainer/devices/devices_windows.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package devices
-
-import (
-	"github.com/opencontainers/runc/libcontainer/configs"
-)
-
-// TODO Windows. This can be factored out further - Devices are not supported
-// by Windows Containers.
-
-func DeviceFromPath(path, permissions string) (*configs.Device, error) {
-	return nil, nil
-}
-
-func HostDevices() ([]*configs.Device, error) {
-	return nil, nil
-}