diff --git a/Cargo.toml b/Cargo.toml
index 37a2b38c..ddf68447 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,39 +11,27 @@ documentation = "https://tomaka.github.io/glutin/"
 build = "build.rs"
 
 [dependencies]
-lazy_static = "0.1.10"
+lazy_static = "0.2.0"
 libc = "0.2"
 shared_library = "0.1.0"
 
 [build-dependencies]
 gl_generator = "0.5"
 
-[target.arm-linux-androideabi.dependencies.android_glue]
+[target.'cfg(target_os = "android")'.dependencies.android_glue]
 version = "0.1"
 
-[target.i386-apple-ios.dependencies]
+[target.'cfg(target_os = "ios")'.dependencies]
 objc = "0.2"
 
-[target.x86_64-apple-ios.dependencies]
-objc = "0.2"
-
-[target.aarch64-apple-ios.dependencies]
-objc = "0.2"
-
-[target.armv7s-apple-ios.dependencies]
-objc = "0.2"
-
-[target.armv7-apple-ios.dependencies]
-objc = "0.2"
-
-[target.x86_64-apple-darwin.dependencies]
+[target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2"
 cgl = "0.1"
 cocoa = "0.3.2"
 core-foundation = "0"
 core-graphics = "0.3"
 
-[target.i686-pc-windows-gnu.dependencies]
+[target.'cfg(target_os = "windows")'.dependencies]
 winapi = "0.2"
 shell32-sys = "0.1"
 gdi32-sys = "0.1"
@@ -51,89 +39,9 @@ user32-sys = "~0.1.2"
 kernel32-sys = "0.2"
 dwmapi-sys = "0.1"
 
-[target.i686-pc-windows-msvc.dependencies]
-winapi = "0.2"
-shell32-sys = "0.1"
-gdi32-sys = "0.1"
-user32-sys = "~0.1.2"
-kernel32-sys = "0.2"
-dwmapi-sys = "0.1"
-
-[target.x86_64-pc-windows-gnu.dependencies]
-winapi = "0.2"
-shell32-sys = "0.1"
-gdi32-sys = "0.1"
-user32-sys = "~0.1.2"
-kernel32-sys = "0.2"
-dwmapi-sys = "0.1"
-
-[target.x86_64-pc-windows-msvc.dependencies]
-winapi = "0.2"
-shell32-sys = "0.1"
-gdi32-sys = "0.1"
-user32-sys = "~0.1.2"
-kernel32-sys = "0.2"
-dwmapi-sys = "0.1"
-
-[target.i686-unknown-linux-gnu.dependencies]
-osmesa-sys = "0.0.5"
+[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os="dragonfly", target_os="openbsd"))'.dependencies]
+osmesa-sys = "0.1.0"
 wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
 wayland-kbd = "0.3.3"
 wayland-window = "0.2.2"
-x11-dl = "~2.4"
-
-[target.i586-unknown-linux-gnu.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
-wayland-kbd = "0.3.3"
-wayland-window = "0.2.2"
-x11-dl = "~2.4"
-
-[target.x86_64-unknown-linux-gnu.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
-wayland-kbd = "0.3.3"
-wayland-window = "0.2.2"
-x11-dl = "~2.4"
-
-[target.arm-unknown-linux-gnueabihf.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
-wayland-kbd = "0.3.3"
-wayland-window = "0.2.2"
-x11-dl = "~2.4"
-
-[target.armv7-unknown-linux-gnueabihf.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
-wayland-kbd = "0.3.3"
-wayland-window = "0.2.2"
-x11-dl = "~2.4"
-
-[target.aarch64-unknown-linux-gnu.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
-wayland-kbd = "0.3.3"
-wayland-window = "0.2.2"
-x11-dl = "~2.4"
-
-[target.x86_64-unknown-dragonfly.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
-wayland-kbd = "0.3.3"
-wayland-window = "0.2.2"
-x11-dl = "~2.4"
-
-[target.x86_64-unknown-freebsd.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
-wayland-kbd = "0.3.3"
-wayland-window = "0.2.2"
-x11-dl = "~2.4"
-
-[target.x86_64-unknown-openbsd.dependencies]
-osmesa-sys = "0.0.5"
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
-wayland-kbd = "0.3.3"
-wayland-window = "0.2.2"
-x11-dl = "~2.4"
+x11-dl = "2.4"