diff --git a/.travis.yml b/.travis.yml
index 2e7f548a..7ea11e76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,6 +81,10 @@ matrix:
     # QEMU based targets that compile in an emulator
     - env: TARGET=x86_64-unknown-freebsd
 
+    - env: TARGET=wasm32-unknown-unknown
+      install: rustup target add $TARGET
+      script: cargo build --no-default-features --target $TARGET --release
+
     - name: "Shellcheck"
       install: true
       script:
diff --git a/README.md b/README.md
index a19a56ee..1aba6474 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@
 libc
 ====
 
-A Rust library with native bindings to the types and functions commonly found on
-various systems, including libc.
+Rust wrapper over the system's `libc`.
 
 [![Build Status](https://travis-ci.org/rust-lang/libc.svg?branch=master)](https://travis-ci.org/rust-lang/libc)
 [![Build status](https://ci.appveyor.com/api/projects/status/github/rust-lang/libc?svg=true)](https://ci.appveyor.com/project/rust-lang-libs/libc)
diff --git a/src/lib.rs b/src/lib.rs
index 646e00c9..bea11024 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -120,18 +120,17 @@
     )
 )]
 #![cfg_attr(not(feature = "use_std"), no_std)]
+// FIXME: this crate is empty for wasm32-unknown-unknown
+#![cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))]
 
 #[cfg(all(not(cross_platform_docs), feature = "use_std"))]
 extern crate std as core;
 
 #[macro_use]
 mod macros;
+
 mod dox;
 
-/*
- * `c_void` should be defined for all targets except wasm.
- */
-#[cfg(not(all(target_arch = "wasm32", not(target_os = "emscripten"))))]
 cfg_if! {
     if #[cfg(core_cvoid)] {
         pub use core::ffi::c_void;
@@ -150,176 +149,166 @@ cfg_if! {
     }
 }
 
-cfg_if! {
-    if #[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))] {
-        // empty ...
-    } else if #[cfg(target_os = "switch")] {
-        // On the Switch, we only define some useful universal types for
-        // convenience. Those can be found in the switch.rs file.
-    } else {
-        pub type int8_t = i8;
-        pub type int16_t = i16;
-        pub type int32_t = i32;
-        pub type int64_t = i64;
-        pub type uint8_t = u8;
-        pub type uint16_t = u16;
-        pub type uint32_t = u32;
-        pub type uint64_t = u64;
+pub type int8_t = i8;
+pub type int16_t = i16;
+pub type int32_t = i32;
+pub type int64_t = i64;
+pub type uint8_t = u8;
+pub type uint16_t = u16;
+pub type uint32_t = u32;
+pub type uint64_t = u64;
 
-        pub type c_schar = i8;
-        pub type c_uchar = u8;
-        pub type c_short = i16;
-        pub type c_ushort = u16;
-        pub type c_int = i32;
-        pub type c_uint = u32;
-        pub type c_float = f32;
-        pub type c_double = f64;
-        pub type c_longlong = i64;
-        pub type c_ulonglong = u64;
-        pub type intmax_t = i64;
-        pub type uintmax_t = u64;
+pub type c_schar = i8;
+pub type c_uchar = u8;
+pub type c_short = i16;
+pub type c_ushort = u16;
+pub type c_int = i32;
+pub type c_uint = u32;
+pub type c_float = f32;
+pub type c_double = f64;
+pub type c_longlong = i64;
+pub type c_ulonglong = u64;
+pub type intmax_t = i64;
+pub type uintmax_t = u64;
 
-        pub type size_t = usize;
-        pub type ptrdiff_t = isize;
-        pub type intptr_t = isize;
-        pub type uintptr_t = usize;
-        pub type ssize_t = isize;
+pub type size_t = usize;
+pub type ptrdiff_t = isize;
+pub type intptr_t = isize;
+pub type uintptr_t = usize;
+pub type ssize_t = isize;
 
-        pub enum FILE {}
-        pub enum fpos_t {} // TODO: fill this out with a struct
+pub enum FILE {}
+pub enum fpos_t {} // TODO: fill this out with a struct
 
-        pub const INT_MIN: c_int = -2147483648;
-        pub const INT_MAX: c_int = 2147483647;
+pub const INT_MIN: c_int = -2147483648;
+pub const INT_MAX: c_int = 2147483647;
 
-        extern {
-            pub fn isalnum(c: c_int) -> c_int;
-            pub fn isalpha(c: c_int) -> c_int;
-            pub fn iscntrl(c: c_int) -> c_int;
-            pub fn isdigit(c: c_int) -> c_int;
-            pub fn isgraph(c: c_int) -> c_int;
-            pub fn islower(c: c_int) -> c_int;
-            pub fn isprint(c: c_int) -> c_int;
-            pub fn ispunct(c: c_int) -> c_int;
-            pub fn isspace(c: c_int) -> c_int;
-            pub fn isupper(c: c_int) -> c_int;
-            pub fn isxdigit(c: c_int) -> c_int;
-            pub fn tolower(c: c_int) -> c_int;
-            pub fn toupper(c: c_int) -> c_int;
+extern "C" {
+    pub fn isalnum(c: c_int) -> c_int;
+    pub fn isalpha(c: c_int) -> c_int;
+    pub fn iscntrl(c: c_int) -> c_int;
+    pub fn isdigit(c: c_int) -> c_int;
+    pub fn isgraph(c: c_int) -> c_int;
+    pub fn islower(c: c_int) -> c_int;
+    pub fn isprint(c: c_int) -> c_int;
+    pub fn ispunct(c: c_int) -> c_int;
+    pub fn isspace(c: c_int) -> c_int;
+    pub fn isupper(c: c_int) -> c_int;
+    pub fn isxdigit(c: c_int) -> c_int;
+    pub fn tolower(c: c_int) -> c_int;
+    pub fn toupper(c: c_int) -> c_int;
 
-            #[cfg_attr(all(target_os = "macos", target_arch = "x86"),
-                       link_name = "fopen$UNIX2003")]
-            pub fn fopen(filename: *const c_char,
-                         mode: *const c_char) -> *mut FILE;
-            #[cfg_attr(all(target_os = "macos", target_arch = "x86"),
-                       link_name = "freopen$UNIX2003")]
-            pub fn freopen(filename: *const c_char, mode: *const c_char,
-                           file: *mut FILE) -> *mut FILE;
-            pub fn fflush(file: *mut FILE) -> c_int;
-            pub fn fclose(file: *mut FILE) -> c_int;
-            pub fn remove(filename: *const c_char) -> c_int;
-            pub fn rename(oldname: *const c_char, newname: *const c_char) -> c_int;
-            pub fn tmpfile() -> *mut FILE;
-            pub fn setvbuf(stream: *mut FILE,
-                           buffer: *mut c_char,
-                           mode: c_int,
-                           size: size_t) -> c_int;
-            pub fn setbuf(stream: *mut FILE, buf: *mut c_char);
-            pub fn getchar() -> c_int;
-            pub fn putchar(c: c_int) -> c_int;
-            pub fn fgetc(stream: *mut FILE) -> c_int;
-            pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE) -> *mut c_char;
-            pub fn fputc(c: c_int, stream: *mut FILE) -> c_int;
-            #[cfg_attr(all(target_os = "macos", target_arch = "x86"),
-                       link_name = "fputs$UNIX2003")]
-            pub fn fputs(s: *const c_char, stream: *mut FILE)-> c_int;
-            pub fn puts(s: *const c_char) -> c_int;
-            pub fn ungetc(c: c_int, stream: *mut FILE) -> c_int;
-            pub fn fread(ptr: *mut c_void,
-                         size: size_t,
-                         nobj: size_t,
-                         stream: *mut FILE)
-                         -> size_t;
-            #[cfg_attr(all(target_os = "macos", target_arch = "x86"),
-                       link_name = "fwrite$UNIX2003")]
-            pub fn fwrite(ptr: *const c_void,
-                          size: size_t,
-                          nobj: size_t,
-                          stream: *mut FILE)
-                          -> size_t;
-            pub fn fseek(stream: *mut FILE, offset: c_long, whence: c_int) -> c_int;
-            pub fn ftell(stream: *mut FILE) -> c_long;
-            pub fn rewind(stream: *mut FILE);
-            #[cfg_attr(target_os = "netbsd", link_name = "__fgetpos50")]
-            pub fn fgetpos(stream: *mut FILE, ptr: *mut fpos_t) -> c_int;
-            #[cfg_attr(target_os = "netbsd", link_name = "__fsetpos50")]
-            pub fn fsetpos(stream: *mut FILE, ptr: *const fpos_t) -> c_int;
-            pub fn feof(stream: *mut FILE) -> c_int;
-            pub fn ferror(stream: *mut FILE) -> c_int;
-            pub fn perror(s: *const c_char);
-            pub fn atoi(s: *const c_char) -> c_int;
-            #[cfg_attr(all(target_os = "macos", target_arch = "x86"),
-                       link_name = "strtod$UNIX2003")]
-            pub fn strtod(s: *const c_char, endp: *mut *mut c_char) -> c_double;
-            pub fn strtol(s: *const c_char,
-                          endp: *mut *mut c_char, base: c_int) -> c_long;
-            pub fn strtoul(s: *const c_char, endp: *mut *mut c_char,
-                           base: c_int) -> c_ulong;
-            pub fn calloc(nobj: size_t, size: size_t) -> *mut c_void;
-            pub fn malloc(size: size_t) -> *mut c_void;
-            pub fn realloc(p: *mut c_void, size: size_t) -> *mut c_void;
-            pub fn free(p: *mut c_void);
-            pub fn abort() -> !;
-            pub fn exit(status: c_int) -> !;
-            pub fn _exit(status: c_int) -> !;
-            pub fn atexit(cb: extern fn()) -> c_int;
-            #[cfg_attr(all(target_os = "macos", target_arch = "x86"),
-                       link_name = "system$UNIX2003")]
-            pub fn system(s: *const c_char) -> c_int;
-            pub fn getenv(s: *const c_char) -> *mut c_char;
+    #[cfg_attr(
+        all(target_os = "macos", target_arch = "x86"),
+        link_name = "fopen$UNIX2003"
+    )]
+    pub fn fopen(filename: *const c_char, mode: *const c_char) -> *mut FILE;
+    #[cfg_attr(
+        all(target_os = "macos", target_arch = "x86"),
+        link_name = "freopen$UNIX2003"
+    )]
+    pub fn freopen(filename: *const c_char, mode: *const c_char, file: *mut FILE) -> *mut FILE;
+    pub fn fflush(file: *mut FILE) -> c_int;
+    pub fn fclose(file: *mut FILE) -> c_int;
+    pub fn remove(filename: *const c_char) -> c_int;
+    pub fn rename(oldname: *const c_char, newname: *const c_char) -> c_int;
+    pub fn tmpfile() -> *mut FILE;
+    pub fn setvbuf(stream: *mut FILE, buffer: *mut c_char, mode: c_int, size: size_t) -> c_int;
+    pub fn setbuf(stream: *mut FILE, buf: *mut c_char);
+    pub fn getchar() -> c_int;
+    pub fn putchar(c: c_int) -> c_int;
+    pub fn fgetc(stream: *mut FILE) -> c_int;
+    pub fn fgets(buf: *mut c_char, n: c_int, stream: *mut FILE) -> *mut c_char;
+    pub fn fputc(c: c_int, stream: *mut FILE) -> c_int;
+    #[cfg_attr(
+        all(target_os = "macos", target_arch = "x86"),
+        link_name = "fputs$UNIX2003"
+    )]
+    pub fn fputs(s: *const c_char, stream: *mut FILE) -> c_int;
+    pub fn puts(s: *const c_char) -> c_int;
+    pub fn ungetc(c: c_int, stream: *mut FILE) -> c_int;
+    pub fn fread(ptr: *mut c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
+    #[cfg_attr(
+        all(target_os = "macos", target_arch = "x86"),
+        link_name = "fwrite$UNIX2003"
+    )]
+    pub fn fwrite(ptr: *const c_void, size: size_t, nobj: size_t, stream: *mut FILE) -> size_t;
+    pub fn fseek(stream: *mut FILE, offset: c_long, whence: c_int) -> c_int;
+    pub fn ftell(stream: *mut FILE) -> c_long;
+    pub fn rewind(stream: *mut FILE);
+    #[cfg_attr(target_os = "netbsd", link_name = "__fgetpos50")]
+    pub fn fgetpos(stream: *mut FILE, ptr: *mut fpos_t) -> c_int;
+    #[cfg_attr(target_os = "netbsd", link_name = "__fsetpos50")]
+    pub fn fsetpos(stream: *mut FILE, ptr: *const fpos_t) -> c_int;
+    pub fn feof(stream: *mut FILE) -> c_int;
+    pub fn ferror(stream: *mut FILE) -> c_int;
+    pub fn perror(s: *const c_char);
+    pub fn atoi(s: *const c_char) -> c_int;
+    #[cfg_attr(
+        all(target_os = "macos", target_arch = "x86"),
+        link_name = "strtod$UNIX2003"
+    )]
+    pub fn strtod(s: *const c_char, endp: *mut *mut c_char) -> c_double;
+    pub fn strtol(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_long;
+    pub fn strtoul(s: *const c_char, endp: *mut *mut c_char, base: c_int) -> c_ulong;
+    pub fn calloc(nobj: size_t, size: size_t) -> *mut c_void;
+    pub fn malloc(size: size_t) -> *mut c_void;
+    pub fn realloc(p: *mut c_void, size: size_t) -> *mut c_void;
+    pub fn free(p: *mut c_void);
+    pub fn abort() -> !;
+    pub fn exit(status: c_int) -> !;
+    pub fn _exit(status: c_int) -> !;
+    pub fn atexit(cb: extern "C" fn()) -> c_int;
+    #[cfg_attr(
+        all(target_os = "macos", target_arch = "x86"),
+        link_name = "system$UNIX2003"
+    )]
+    pub fn system(s: *const c_char) -> c_int;
+    pub fn getenv(s: *const c_char) -> *mut c_char;
 
-            pub fn strcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char;
-            pub fn strncpy(dst: *mut c_char, src: *const c_char, n: size_t)
-                           -> *mut c_char;
-            pub fn strcat(s: *mut c_char, ct: *const c_char) -> *mut c_char;
-            pub fn strncat(s: *mut c_char, ct: *const c_char, n: size_t) -> *mut c_char;
-            pub fn strcmp(cs: *const c_char, ct: *const c_char) -> c_int;
-            pub fn strncmp(cs: *const c_char, ct: *const c_char, n: size_t) -> c_int;
-            pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
-            pub fn strchr(cs: *const c_char, c: c_int) -> *mut c_char;
-            pub fn strrchr(cs: *const c_char, c: c_int) -> *mut c_char;
-            pub fn strspn(cs: *const c_char, ct: *const c_char) -> size_t;
-            pub fn strcspn(cs: *const c_char, ct: *const c_char) -> size_t;
-            pub fn strdup(cs: *const c_char) -> *mut c_char;
-            pub fn strpbrk(cs: *const c_char, ct: *const c_char) -> *mut c_char;
-            pub fn strstr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
-            pub fn strlen(cs: *const c_char) -> size_t;
-            pub fn strnlen(cs: *const c_char, maxlen: size_t) -> size_t;
-            #[cfg_attr(all(target_os = "macos", target_arch = "x86"),
-                       link_name = "strerror$UNIX2003")]
-            pub fn strerror(n: c_int) -> *mut c_char;
-            pub fn strtok(s: *mut c_char, t: *const c_char) -> *mut c_char;
-            pub fn strxfrm(s: *mut c_char, ct: *const c_char, n: size_t) -> size_t;
-            pub fn wcslen(buf: *const wchar_t) -> size_t;
-            pub fn wcstombs(dest: *mut c_char, src: *const wchar_t, n: size_t) -> ::size_t;
+    pub fn strcpy(dst: *mut c_char, src: *const c_char) -> *mut c_char;
+    pub fn strncpy(dst: *mut c_char, src: *const c_char, n: size_t) -> *mut c_char;
+    pub fn strcat(s: *mut c_char, ct: *const c_char) -> *mut c_char;
+    pub fn strncat(s: *mut c_char, ct: *const c_char, n: size_t) -> *mut c_char;
+    pub fn strcmp(cs: *const c_char, ct: *const c_char) -> c_int;
+    pub fn strncmp(cs: *const c_char, ct: *const c_char, n: size_t) -> c_int;
+    pub fn strcoll(cs: *const c_char, ct: *const c_char) -> c_int;
+    pub fn strchr(cs: *const c_char, c: c_int) -> *mut c_char;
+    pub fn strrchr(cs: *const c_char, c: c_int) -> *mut c_char;
+    pub fn strspn(cs: *const c_char, ct: *const c_char) -> size_t;
+    pub fn strcspn(cs: *const c_char, ct: *const c_char) -> size_t;
+    pub fn strdup(cs: *const c_char) -> *mut c_char;
+    pub fn strpbrk(cs: *const c_char, ct: *const c_char) -> *mut c_char;
+    pub fn strstr(cs: *const c_char, ct: *const c_char) -> *mut c_char;
+    pub fn strlen(cs: *const c_char) -> size_t;
+    pub fn strnlen(cs: *const c_char, maxlen: size_t) -> size_t;
+    #[cfg_attr(
+        all(target_os = "macos", target_arch = "x86"),
+        link_name = "strerror$UNIX2003"
+    )]
+    pub fn strerror(n: c_int) -> *mut c_char;
+    pub fn strtok(s: *mut c_char, t: *const c_char) -> *mut c_char;
+    pub fn strxfrm(s: *mut c_char, ct: *const c_char, n: size_t) -> size_t;
+    pub fn wcslen(buf: *const wchar_t) -> size_t;
+    pub fn wcstombs(dest: *mut c_char, src: *const wchar_t, n: size_t) -> ::size_t;
 
-            pub fn memchr(cx: *const c_void, c: c_int, n: size_t) -> *mut c_void;
-            pub fn memcmp(cx: *const c_void, ct: *const c_void, n: size_t) -> c_int;
-            pub fn memcpy(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
-            pub fn memmove(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
-            pub fn memset(dest: *mut c_void, c: c_int, n: size_t) -> *mut c_void;
-        }
+    pub fn memchr(cx: *const c_void, c: c_int, n: size_t) -> *mut c_void;
+    pub fn memcmp(cx: *const c_void, ct: *const c_void, n: size_t) -> c_int;
+    pub fn memcpy(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
+    pub fn memmove(dest: *mut c_void, src: *const c_void, n: size_t) -> *mut c_void;
+    pub fn memset(dest: *mut c_void, c: c_int, n: size_t) -> *mut c_void;
+}
 
-        // These are all inline functions on android, so they end up just being entirely
-        // missing on that platform.
-        #[cfg(not(target_os = "android"))]
-        extern {
-            pub fn abs(i: c_int) -> c_int;
-            pub fn atof(s: *const c_char) -> c_double;
-            pub fn labs(i: c_long) -> c_long;
-            pub fn rand() -> c_int;
-            pub fn srand(seed: c_uint);
-        }
-    }
+// These are all inline functions on android, so they end up just being entirely
+// missing on that platform.
+
+#[cfg(not(target_os = "android"))]
+extern "C" {
+    pub fn abs(i: c_int) -> c_int;
+    pub fn atof(s: *const c_char) -> c_double;
+    pub fn labs(i: c_long) -> c_long;
+    pub fn rand() -> c_int;
+    pub fn srand(seed: c_uint);
 }
 
 cfg_if! {
diff --git a/src/switch.rs b/src/switch.rs
index d47d41b1..240e9380 100644
--- a/src/switch.rs
+++ b/src/switch.rs
@@ -1,34 +1,5 @@
 //! Switch C type definitions
 
-pub type int8_t = i8;
-pub type int16_t = i16;
-pub type int32_t = i32;
-pub type int64_t = i64;
-pub type uint8_t = u8;
-pub type uint16_t = u16;
-pub type uint32_t = u32;
-pub type uint64_t = u64;
-
-pub type c_schar = i8;
-pub type c_uchar = u8;
-pub type c_short = i16;
-pub type c_ushort = u16;
-pub type c_int = i32;
-pub type c_uint = u32;
-pub type c_float = f32;
-pub type c_double = f64;
-pub type c_longlong = i64;
-pub type c_ulonglong = u64;
-pub type intmax_t = i64;
-pub type uintmax_t = u64;
-
-pub type size_t = usize;
-pub type ptrdiff_t = isize;
-pub type intptr_t = isize;
-pub type uintptr_t = usize;
-pub type ssize_t = isize;
-
-// Arch specific
 pub type off_t = i64;
 pub type c_char = u8;
 pub type c_long = i64;