diff --git a/.cirrus.yml b/.cirrus.yml
index 3390b8ce3374411af71146b1b040de88d2e0a131..12a8841de7c53f4a0b0c706b13c2f3ed6c64be53 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,7 +1,7 @@
 task:
   name: nightly x86_64-unknown-freebsd-10
   freebsd_instance:
-    image: freebsd-10-4-release-amd64 
+    image: freebsd-10-4-release-amd64
   setup_script:
     - pkg install -y curl
     - curl https://sh.rustup.rs -sSf --output rustup.sh
@@ -11,7 +11,7 @@ task:
   test_script:
     - . $HOME/.cargo/env
     - LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
- 
+
 task:
   name: stable x86_64-unknown-freebsd-11
   freebsd_instance:
@@ -26,7 +26,7 @@ task:
     - . $HOME/.cargo/env
     - LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
     - sh ci/run.sh x86_64-unknown-freebsd
-    
+
 task:
   name: nightly x86_64-unknown-freebsd-12
   freebsd_instance:
diff --git a/ci/azure-master.yml b/ci/azure-master.yml
index d7bcb7c617e80f57fe159005214759089e280931..c61e2b4c2cb2408d4ad1413a69746ecfdc31c705 100644
--- a/ci/azure-master.yml
+++ b/ci/azure-master.yml
@@ -12,7 +12,7 @@ pr: ["master"]
 jobs:
   - job: StyleAndDocs
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-18.04
     steps:
       - template: azure-install-rust.yml
       - script: LIBC_CI=1 sh ci/dox.sh
diff --git a/ci/azure.yml b/ci/azure.yml
index d545e4db6a4c809ad895fa1b19b7923d9fe351f1..0e00c9a08457c7f9602f96196ff859a64f828ec3 100644
--- a/ci/azure.yml
+++ b/ci/azure.yml
@@ -47,7 +47,7 @@ jobs:
         arm-unknown-linux-musleabihf:
           TARGET: arm-unknown-linux-musleabihf
         # Disabled because currently broken, see:
-        # https://github.com/rust-lang/libc/issues/1591         
+        # https://github.com/rust-lang/libc/issues/1591
         # asmjs-unknown-emscripten:
         #  TARGET: asmjs-unknown-emscripten
         i686-linux-android:
@@ -77,7 +77,7 @@ jobs:
         sparc64-unknown-linux-gnu:
           TARGET: sparc64-unknown-linux-gnu
         # Disabled because currently broken, see:
-        # https://github.com/rust-lang/libc/issues/1591         
+        # https://github.com/rust-lang/libc/issues/1591
         # wasm32-unknown-emscripten:
         #  TARGET: wasm32-unknown-emscripten
         x86_64-linux-android:
@@ -89,7 +89,7 @@ jobs:
 
   - job: DockerOSX64
     pool:
-      vmImage: macos-10.14
+      vmImage: macos-10.15
     steps:
       - template: azure-install-rust.yml
       - bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
@@ -114,7 +114,7 @@ jobs:
           ARCH: x86_64
         x86_64-pc-windows-msvc:
           TARGET: x86_64-pc-windows-msvc
-        # Disabled because broken:          
+        # Disabled because broken:
         #  https://github.com/rust-lang/libc/issues/1592
         #i686-pc-windows-gnu:
         #  TARGET: i686-pc-windows-gnu
@@ -125,7 +125,7 @@ jobs:
 
   - job: StyleAndDocs
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-18.04
     steps:
       - template: azure-install-rust.yml
       - script: sh ci/style.sh
@@ -141,7 +141,7 @@ jobs:
   #  dependsOn: BuildChannelsLinux
   #  continueOnError: true
   #  pool:
-  #    vmImage: ubuntu-16.04
+  #    vmImage: ubuntu-18.04
   #  steps:
   #    - template: azure-install-rust.yml
   #    - script: sh ci/semver.sh linux
@@ -151,7 +151,7 @@ jobs:
   #  dependsOn: BuildChannelsOSX
   #  continueOnError: true
   #  pool:
-  #    vmImage: macos-10.14
+  #    vmImage: macos-10.15
   #  steps:
   #    - template: azure-install-rust.yml
   #    - script: sh ci/semver.sh osx
@@ -160,7 +160,7 @@ jobs:
   - job: BuildChannelsLinux
     dependsOn: StyleAndDocs
     pool:
-      vmImage: ubuntu-16.04
+      vmImage: ubuntu-18.04
     steps:
       - template: azure-install-rust.yml
       - script: LIBC_CI=1 sh ./ci/build.sh
@@ -189,7 +189,7 @@ jobs:
   - job: BuildChannelsOSX
     dependsOn: StyleAndDocs
     pool:
-      vmImage: macos-10.14
+      vmImage: macos-10.15
     steps:
       - template: azure-install-rust.yml
       - script: LIBC_CI=1 sh ./ci/build.sh
diff --git a/ci/emscripten.sh b/ci/emscripten.sh
index acec4ca26f87f7057630fc9a3db3f2c8a550c772..3c2650c316c45ff245bba0ac5845f81241a8d392 100644
--- a/ci/emscripten.sh
+++ b/ci/emscripten.sh
@@ -30,7 +30,7 @@ exit 1
 
 git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable
 cd /emsdk-portable
-# TODO: switch to an upstream install once
+# FIXME: switch to an upstream install once
 # https://github.com/rust-lang/rust/pull/63649 lands
 hide_output ./emsdk install 1.38.42
 ./emsdk activate 1.38.42
diff --git a/ci/run.sh b/ci/run.sh
index a0e48be5bbb6f4e9f6e7d04ca766288d7615574a..3aec98947167bc242982561c0316bdacdb513b85 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -37,7 +37,7 @@ if [ "$QEMU" != "" ]; then
     # plain qcow2 image: just download it
     qemufile="$(echo "${QEMU}" | sed 's/\//__/g')"
     if [ ! -f "${tmpdir}/${qemufile}" ]; then
-      curl --retry 5 "${MIRRORS_URL}/${QEMU}" | \
+      curl --retry 5 "${MIRRORS_URL}/${QEMU}" \
         > "${tmpdir}/${qemufile}"
     fi
   fi
diff --git a/libc-test/build.rs b/libc-test/build.rs
index 57ae4aa19ca9fb7a7800bd21ded1ed0cdb735290..b76e20d95c153cf4c875d57797e4147af98308d8 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -182,6 +182,10 @@ fn test_apple(target: &str) {
             // These OSX constants are removed in Sierra.
             // https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOS10_12/Swift/Darwin.html
             "KERN_KDENABLE_BG_TRACE" | "KERN_KDDISABLE_BG_TRACE" => true,
+            // FIXME: the value has been changed since Catalina (0xffff0000 -> 0x3fff0000).
+            "SF_SETTABLE" => true,
+            // FIXME: the value has been changed since Catalina (VM_FLAGS_RESILIENT_MEDIA is also contained now).
+            "VM_FLAGS_USER_REMAP" => true,
             _ => false,
         }
     });
@@ -199,6 +203,14 @@ fn test_apple(target: &str) {
         }
     });
 
+    cfg.skip_field(move |struct_, field| {
+        match (struct_, field) {
+            // FIXME: the array size has been changed since macOS 10.15 ([8] -> [7]).
+            ("statfs", "f_reserved") => true,
+            _ => false,
+        }
+    });
+
     cfg.skip_field_type(move |struct_, field| {
         match (struct_, field) {
             // FIXME: actually a union
diff --git a/src/cloudabi/mod.rs b/src/cloudabi/mod.rs
index 71f6ff45ae840173b48436c308797785dad83f7c..77817121d677f72786463c2c9ed3e3943fe18f64 100644
--- a/src/cloudabi/mod.rs
+++ b/src/cloudabi/mod.rs
@@ -120,7 +120,7 @@ impl ::Clone for FILE {
     }
 }
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos_t {} // TODO: fill this out with a struct
+pub enum fpos_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos_t {}
 impl ::Clone for fpos_t {
     fn clone(&self) -> fpos_t {
diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs
index c4467a8eccf154eb14ddf6dc52d76dfdb11ab4f5..a560f7d3027b5a8927ec7415533ed567bddc1ab3 100644
--- a/src/fuchsia/mod.rs
+++ b/src/fuchsia/mod.rs
@@ -109,7 +109,7 @@ impl ::Clone for DIR {
 }
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos64_t {} // TODO: fill this out with a struct
+pub enum fpos64_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos64_t {}
 impl ::Clone for fpos64_t {
     fn clone(&self) -> fpos64_t {
@@ -1416,7 +1416,7 @@ pub const F_SEAL_SHRINK: ::c_int = 0x0002;
 pub const F_SEAL_GROW: ::c_int = 0x0004;
 pub const F_SEAL_WRITE: ::c_int = 0x0008;
 
-// TODO(#235): Include file sealing fcntls once we have a way to verify them.
+// FIXME(#235): Include file sealing fcntls once we have a way to verify them.
 
 pub const SIGTRAP: ::c_int = 5;
 
@@ -1433,7 +1433,7 @@ pub const CLOCK_MONOTONIC_COARSE: ::clockid_t = 6;
 pub const CLOCK_BOOTTIME: ::clockid_t = 7;
 pub const CLOCK_REALTIME_ALARM: ::clockid_t = 8;
 pub const CLOCK_BOOTTIME_ALARM: ::clockid_t = 9;
-// TODO(#247) Someday our Travis shall have glibc 2.21 (released in Sep
+// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
 // 2014.) See also musl/mod.rs
 // pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 // pub const CLOCK_TAI: ::clockid_t = 11;
@@ -2773,7 +2773,7 @@ pub const TIOCINQ: ::c_int = ::FIONREAD;
 pub const RTLD_GLOBAL: ::c_int = 0x100;
 pub const RTLD_NOLOAD: ::c_int = 0x4;
 
-// TODO(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
+// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
 // kernel 3.10).  See also notbsd/mod.rs
 pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 pub const CLOCK_TAI: ::clockid_t = 11;
@@ -3273,7 +3273,7 @@ impl ::Clone for FILE {
     }
 }
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos_t {} // TODO: fill this out with a struct
+pub enum fpos_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos_t {}
 impl ::Clone for fpos_t {
     fn clone(&self) -> fpos_t {
diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs
index 5cbbfe9c80f435492cfd3a2638793788e1b0f430..95adabdf1436da65d00c275d49aaf662c320dd9e 100644
--- a/src/unix/haiku/mod.rs
+++ b/src/unix/haiku/mod.rs
@@ -662,7 +662,7 @@ pub const LC_NUMERIC: ::c_int = 4;
 pub const LC_TIME: ::c_int = 5;
 pub const LC_MESSAGES: ::c_int = 6;
 
-// TODO: Haiku does not have MAP_FILE, but libstd/os.rs requires it
+// FIXME: Haiku does not have MAP_FILE, but libstd/os.rs requires it
 pub const MAP_FILE: ::c_int = 0x00;
 pub const MAP_SHARED: ::c_int = 0x01;
 pub const MAP_PRIVATE: ::c_int = 0x02;
@@ -994,7 +994,7 @@ pub const PTHREAD_MUTEX_NORMAL: ::c_int = 1;
 pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
 pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 3;
 
-pub const FIOCLEX: c_ulong = 0; // TODO: does not exist on Haiku!
+pub const FIOCLEX: c_ulong = 0; // FIXME: does not exist on Haiku!
 
 pub const RUSAGE_CHILDREN: ::c_int = -1;
 
diff --git a/src/unix/linux_like/emscripten/mod.rs b/src/unix/linux_like/emscripten/mod.rs
index ab94d53eaaff0bf8c9853355d397863c98d49872..630cb3afd174c1cc40a7763b6bd2660186bd2fab 100644
--- a/src/unix/linux_like/emscripten/mod.rs
+++ b/src/unix/linux_like/emscripten/mod.rs
@@ -35,7 +35,7 @@ pub type c_ulong = u32;
 pub type nlink_t = u32;
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos64_t {} // TODO: fill this out with a struct
+pub enum fpos64_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos64_t {}
 impl ::Clone for fpos64_t {
     fn clone(&self) -> fpos64_t {
@@ -1287,7 +1287,7 @@ pub const TIOCINQ: ::c_int = ::FIONREAD;
 pub const RTLD_GLOBAL: ::c_int = 0x100;
 pub const RTLD_NOLOAD: ::c_int = 0x4;
 
-// TODO(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
+// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
 // kernel 3.10).  See also linux_like/mod.rs
 pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 pub const CLOCK_TAI: ::clockid_t = 11;
diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
index 90eec93b8d69d449c5fc4f39d984a5719566f43a..0cab514497c456bd23ca2279fba8b170a32e2e0f 100644
--- a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
+++ b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
@@ -695,7 +695,7 @@ pub const HWCAP_SSBS: ::c_ulong = 1 << 28;
 pub const HWCAP_SB: ::c_ulong = 1 << 29;
 pub const HWCAP_PACA: ::c_ulong = 1 << 30;
 pub const HWCAP_PACG: ::c_ulong = 1 << 31;
-// TODO: enable these again once linux-api-headers are up to date enough on CI.
+// FIXME: enable these again once linux-api-headers are up to date enough on CI.
 // See discussion in https://github.com/rust-lang/libc/pull/1638
 //pub const HWCAP2_DCPODP: ::c_ulong = 1 << 0;
 //pub const HWCAP2_SVE2: ::c_ulong = 1 << 1;
diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
index 3e2a9ff7f333db3b1126186db2f520e23db73230..10dd5ec49b403c9b31130cf15dfec29a875887a6 100644
--- a/src/unix/linux_like/linux/mod.rs
+++ b/src/unix/linux_like/linux/mod.rs
@@ -37,7 +37,7 @@ pub type Elf32_Section = u16;
 pub type Elf64_Section = u16;
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos64_t {} // TODO: fill this out with a struct
+pub enum fpos64_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos64_t {}
 impl ::Clone for fpos64_t {
     fn clone(&self) -> fpos64_t {
diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
index 01b2c8ab512a568609396f6e4a08471d6d73afb0..1d0e900f61cd68c736756f31925a014394394584 100644
--- a/src/unix/linux_like/linux/musl/mod.rs
+++ b/src/unix/linux_like/linux/musl/mod.rs
@@ -328,7 +328,7 @@ pub const TCSAFLUSH: ::c_int = 2;
 pub const RTLD_GLOBAL: ::c_int = 0x100;
 pub const RTLD_NOLOAD: ::c_int = 0x4;
 
-// TODO(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
+// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
 // kernel 3.10).  See also linux_like/mod.rs
 pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 pub const CLOCK_TAI: ::clockid_t = 11;
diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
index f9c5ea5d8476a54578717cdc7b4df35c88ee44a6..3c36b68f92998ecdd5bf464acada088f15cb3556 100644
--- a/src/unix/linux_like/mod.rs
+++ b/src/unix/linux_like/mod.rs
@@ -482,7 +482,7 @@ pub const F_SEAL_SHRINK: ::c_int = 0x0002;
 pub const F_SEAL_GROW: ::c_int = 0x0004;
 pub const F_SEAL_WRITE: ::c_int = 0x0008;
 
-// TODO(#235): Include file sealing fcntls once we have a way to verify them.
+// FIXME(#235): Include file sealing fcntls once we have a way to verify them.
 
 pub const SIGTRAP: ::c_int = 5;
 
@@ -499,7 +499,7 @@ pub const CLOCK_MONOTONIC_COARSE: ::clockid_t = 6;
 pub const CLOCK_BOOTTIME: ::clockid_t = 7;
 pub const CLOCK_REALTIME_ALARM: ::clockid_t = 8;
 pub const CLOCK_BOOTTIME_ALARM: ::clockid_t = 9;
-// TODO(#247) Someday our Travis shall have glibc 2.21 (released in Sep
+// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
 // 2014.) See also musl/mod.rs
 // pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 // pub const CLOCK_TAI: ::clockid_t = 11;
diff --git a/src/unix/mod.rs b/src/unix/mod.rs
index e1e9e499c97af79901aa4d86952561137faa7293..6d3ef9443c621e64d074f39ad6ca3e2963f48532 100644
--- a/src/unix/mod.rs
+++ b/src/unix/mod.rs
@@ -365,7 +365,7 @@ impl ::Clone for FILE {
     }
 }
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos_t {} // TODO: fill this out with a struct
+pub enum fpos_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos_t {}
 impl ::Clone for fpos_t {
     fn clone(&self) -> fpos_t {
diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs
index 4ea52e37981c6fd5be0cbab0811e3729eb833eb8..7f66f1b41e8540f87daa1b0463e371d7baef0f3d 100644
--- a/src/unix/redox/mod.rs
+++ b/src/unix/redox/mod.rs
@@ -258,7 +258,7 @@ pub const F_GETLK: ::c_int = 5;
 pub const F_SETLK: ::c_int = 6;
 pub const F_SETLKW: ::c_int = 7;
 
-// TODO: relibc {
+// FIXME: relibc {
 pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void;
 // }
 
@@ -413,7 +413,7 @@ pub const F_GETFD: ::c_int = 1;
 pub const F_SETFD: ::c_int = 2;
 pub const F_GETFL: ::c_int = 3;
 pub const F_SETFL: ::c_int = 4;
-// TODO: relibc {
+// FIXME: relibc {
 pub const F_DUPFD_CLOEXEC: ::c_int = ::F_DUPFD;
 // }
 pub const FD_CLOEXEC: ::c_int = 0x0100_0000;
@@ -435,14 +435,14 @@ pub const O_DIRECTORY: ::c_int = 0x1000_0000;
 pub const O_PATH: ::c_int = 0x2000_0000;
 pub const O_SYMLINK: ::c_int = 0x4000_0000;
 // Negative to allow it to be used as int
-// TODO: Fix negative values missing from includes
+// FIXME: Fix negative values missing from includes
 pub const O_NOFOLLOW: ::c_int = -0x8000_0000;
 
 // netdb.h
 pub const EAI_SYSTEM: ::c_int = -11;
 
 // netinet/in.h
-// TODO: relibc {
+// FIXME: relibc {
 pub const IP_TTL: ::c_int = 2;
 pub const IPV6_UNICAST_HOPS: ::c_int = 16;
 pub const IPV6_MULTICAST_IF: ::c_int = 17;
@@ -460,7 +460,7 @@ pub const IP_DROP_MEMBERSHIP: ::c_int = 36;
 
 // netinet/tcp.h
 pub const TCP_NODELAY: ::c_int = 1;
-// TODO: relibc {
+// FIXME: relibc {
 pub const TCP_KEEPIDLE: ::c_int = 1;
 // }
 
@@ -575,7 +575,7 @@ pub const EXIT_SUCCESS: ::c_int = 0;
 pub const EXIT_FAILURE: ::c_int = 1;
 
 // sys/ioctl.h
-// TODO: relibc {
+// FIXME: relibc {
 pub const FIONBIO: ::c_ulong = 0x5421;
 pub const FIOCLEX: ::c_ulong = 0x5451;
 // }
diff --git a/src/unix/uclibc/mod.rs b/src/unix/uclibc/mod.rs
index 3f779aa6c1bb85e75e1ff7ac599dfe610bd0fbe4..82500d79319cdf867d72cf15a7067b1d039b1cbe 100644
--- a/src/unix/uclibc/mod.rs
+++ b/src/unix/uclibc/mod.rs
@@ -23,7 +23,7 @@ pub type nl_item = ::c_int;
 pub type idtype_t = ::c_uint;
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos64_t {} // TODO: fill this out with a struct
+pub enum fpos64_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos64_t {}
 impl ::Clone for fpos64_t {
     fn clone(&self) -> fpos64_t {
@@ -501,7 +501,7 @@ pub const F_GETLEASE: ::c_int = 1025;
 pub const F_NOTIFY: ::c_int = 1026;
 pub const F_DUPFD_CLOEXEC: ::c_int = 1030;
 
-// TODO(#235): Include file sealing fcntls once we have a way to verify them.
+// FIXME(#235): Include file sealing fcntls once we have a way to verify them.
 
 pub const SIGTRAP: ::c_int = 5;
 
@@ -512,7 +512,7 @@ pub const CLOCK_REALTIME: ::clockid_t = 0;
 pub const CLOCK_MONOTONIC: ::clockid_t = 1;
 pub const CLOCK_PROCESS_CPUTIME_ID: ::clockid_t = 2;
 pub const CLOCK_THREAD_CPUTIME_ID: ::clockid_t = 3;
-// TODO(#247) Someday our Travis shall have glibc 2.21 (released in Sep
+// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
 // 2014.) See also musl/mod.rs
 // pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
 // pub const CLOCK_TAI: ::clockid_t = 11;
diff --git a/src/unix/uclibc/x86_64/align.rs b/src/unix/uclibc/x86_64/align.rs
index 583a278d66a0e457bf1e3ace54378126a765ea44..e2d829b507735d6575ef5ee58eeb4d8645a83398 100644
--- a/src/unix/uclibc/x86_64/align.rs
+++ b/src/unix/uclibc/x86_64/align.rs
@@ -5,7 +5,7 @@ macro_rules! expand_align {
                        repr(align(4)))]
             #[cfg_attr(target_pointer_width = "64",
                        repr(align(8)))]
-            pub struct sem_t { // ToDo
+            pub struct sem_t { // FIXME
                 #[cfg(target_pointer_width = "32")]
                 __size: [::c_char; 16],
                 #[cfg(target_pointer_width = "64")]
@@ -26,12 +26,12 @@ macro_rules! expand_align {
                                target_arch = "s390x",
                                target_arch = "sparc64")),
                        repr(align(8)))]
-            pub struct pthread_mutexattr_t { // ToDo
+            pub struct pthread_mutexattr_t { // FIXME
                 size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
             }
 
             #[repr(align(4))]
-            pub struct pthread_condattr_t { // ToDo
+            pub struct pthread_condattr_t { // FIXME
                 size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
             }
         }
@@ -48,13 +48,13 @@ macro_rules! expand_align {
                                        target_arch = "powerpc")))),
                        repr(align(8)))]
             #[allow(missing_debug_implementations)]
-            pub struct pthread_mutex_t { // ToDo
+            pub struct pthread_mutex_t { // FIXME
                 size: [u8; ::__SIZEOF_PTHREAD_MUTEX_T],
             }
 
             #[repr(align(8))]
             #[allow(missing_debug_implementations)]
-            pub struct pthread_cond_t { // ToDo
+            pub struct pthread_cond_t { // FIXME
                 size: [u8; ::__SIZEOF_PTHREAD_COND_T],
             }
 
@@ -69,7 +69,7 @@ macro_rules! expand_align {
                                    target_arch = "powerpc"))),
                        repr(align(8)))]
             #[allow(missing_debug_implementations)]
-            pub struct pthread_rwlock_t { // ToDo
+            pub struct pthread_rwlock_t { // FIXME
                 size: [u8; ::__SIZEOF_PTHREAD_RWLOCK_T],
             }
         }
diff --git a/src/unix/uclibc/x86_64/mod.rs b/src/unix/uclibc/x86_64/mod.rs
index a8bb0794aa1de40e8b2c603f17f095675f457419..26eca9e7ea09dd48ef666432a7059957255bc447 100644
--- a/src/unix/uclibc/x86_64/mod.rs
+++ b/src/unix/uclibc/x86_64/mod.rs
@@ -147,13 +147,13 @@ s! {
         pub sa_mask: ::sigset_t,
     }
 
-    pub struct stack_t { // ToDo
+    pub struct stack_t { // FIXME
         pub ss_sp: *mut ::c_void,
         pub ss_flags: ::c_int,
         pub ss_size: ::size_t
     }
 
-    pub struct statfs { // ToDo
+    pub struct statfs { // FIXME
         pub f_type: fsword_t,
         pub f_bsize: fsword_t,
         pub f_blocks: ::fsblkcnt_t,
@@ -167,7 +167,7 @@ s! {
         f_spare: [fsword_t; 5],
     }
 
-    pub struct msghdr { // ToDo
+    pub struct msghdr { // FIXME
         pub msg_name: *mut ::c_void,
         pub msg_namelen: ::socklen_t,
         pub msg_iov: *mut ::iovec,
@@ -177,7 +177,7 @@ s! {
         pub msg_flags: ::c_int,
     }
 
-    pub struct termios { // ToDo
+    pub struct termios { // FIXME
         pub c_iflag: ::tcflag_t,
         pub c_oflag: ::tcflag_t,
         pub c_cflag: ::tcflag_t,
@@ -186,11 +186,11 @@ s! {
         pub c_cc: [::cc_t; ::NCCS],
     }
 
-    pub struct sigset_t { // ToDo
+    pub struct sigset_t { // FIXME
         __val: [::c_ulong; 16],
     }
 
-    pub struct sysinfo { // ToDo
+    pub struct sysinfo { // FIXME
         pub uptime: ::c_long,
         pub loads: [::c_ulong; 3],
         pub totalram: ::c_ulong,
@@ -207,7 +207,7 @@ s! {
         pub _f: [::c_char; 0],
     }
 
-    pub struct glob_t { // ToDo
+    pub struct glob_t { // FIXME
         pub gl_pathc: ::size_t,
         pub gl_pathv: *mut *mut c_char,
         pub gl_offs: ::size_t,
@@ -219,19 +219,19 @@ s! {
         __unused5: *mut ::c_void,
     }
 
-    pub struct rlimit64 { // ToDo
+    pub struct rlimit64 { // FIXME
         pub rlim_cur: rlim64_t,
         pub rlim_max: rlim64_t,
     }
 
-    pub struct cpu_set_t { // ToDo
+    pub struct cpu_set_t { // FIXME
         #[cfg(target_pointer_width = "32")]
         bits: [u32; 32],
         #[cfg(target_pointer_width = "64")]
         bits: [u64; 16],
     }
 
-    pub struct fsid_t { // ToDo
+    pub struct fsid_t { // FIXME
         __val: [::c_int; 2],
     }
 }
diff --git a/src/unix/uclibc/x86_64/no_align.rs b/src/unix/uclibc/x86_64/no_align.rs
index 422d78fac25caec31a84677e36839c8b749cffbc..ffa4e523f215b3bbf5844aec85f8c199145d0ff2 100644
--- a/src/unix/uclibc/x86_64/no_align.rs
+++ b/src/unix/uclibc/x86_64/no_align.rs
@@ -1,7 +1,7 @@
 macro_rules! expand_align {
     () => {
         s! {
-            pub struct sem_t { // ToDo
+            pub struct sem_t { // FIXME
                 #[cfg(target_pointer_width = "32")]
                 __size: [::c_char; 16],
                 #[cfg(target_pointer_width = "64")]
@@ -9,7 +9,7 @@ macro_rules! expand_align {
                 __align: [::c_long; 0],
             }
 
-            pub struct pthread_mutex_t { // ToDo
+            pub struct pthread_mutex_t { // FIXME
                 #[cfg(any(target_arch = "mips",
                           target_arch = "arm",
                           target_arch = "powerpc"))]
@@ -21,7 +21,7 @@ macro_rules! expand_align {
                 size: [u8; ::__SIZEOF_PTHREAD_MUTEX_T],
             }
 
-            pub struct pthread_mutexattr_t { // ToDo
+            pub struct pthread_mutexattr_t { // FIXME
                 #[cfg(any(target_arch = "x86_64", target_arch = "powerpc64",
                           target_arch = "mips64", target_arch = "s390x",
                           target_arch = "sparc64"))]
@@ -33,17 +33,17 @@ macro_rules! expand_align {
                 size: [u8; ::__SIZEOF_PTHREAD_MUTEXATTR_T],
             }
 
-            pub struct pthread_cond_t { // ToDo
+            pub struct pthread_cond_t { // FIXME
                 __align: [::c_longlong; 0],
                 size: [u8; ::__SIZEOF_PTHREAD_COND_T],
             }
 
-            pub struct pthread_condattr_t { // ToDo
+            pub struct pthread_condattr_t { // FIXME
                 __align: [::c_int; 0],
                 size: [u8; ::__SIZEOF_PTHREAD_CONDATTR_T],
             }
 
-            pub struct pthread_rwlock_t { // ToDo
+            pub struct pthread_rwlock_t { // FIXME
                 #[cfg(any(target_arch = "mips",
                           target_arch = "arm",
                           target_arch = "powerpc"))]
diff --git a/src/vxworks/mod.rs b/src/vxworks/mod.rs
index f0c11802ec8535c985443d95e46a9b75c7680a24..2ca38d5e2413ba844ced9e32b319769cd494f98a 100755
--- a/src/vxworks/mod.rs
+++ b/src/vxworks/mod.rs
@@ -1009,7 +1009,7 @@ impl ::Clone for FILE {
     }
 }
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos_t {} // TODO: fill this out with a struct
+pub enum fpos_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos_t {}
 impl ::Clone for fpos_t {
     fn clone(&self) -> fpos_t {
diff --git a/src/windows/mod.rs b/src/windows/mod.rs
index 2fe1d01d78963fe4bfacb7c52838fd4d5ee960d8..fcbe0bf7805e007a17cecb9b4a5006f1509d70d3 100644
--- a/src/windows/mod.rs
+++ b/src/windows/mod.rs
@@ -250,7 +250,7 @@ impl ::Clone for FILE {
     }
 }
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos_t {} // TODO: fill this out with a struct
+pub enum fpos_t {} // FIXME: fill this out with a struct
 impl ::Copy for fpos_t {}
 impl ::Clone for fpos_t {
     fn clone(&self) -> fpos_t {