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 a4df172b8f5f7..0e990f6006378 100644
--- a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
+++ b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
@@ -601,7 +601,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;
-// FIXME: enable these again once linux-api-headers are up to date enough on CI.
+// FIXME(linux): 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/gnu/b64/s390x.rs b/src/unix/linux_like/linux/gnu/b64/s390x.rs
index d5ab89a86fc3c..386d464295091 100644
--- a/src/unix/linux_like/linux/gnu/b64/s390x.rs
+++ b/src/unix/linux_like/linux/gnu/b64/s390x.rs
@@ -212,7 +212,7 @@ s! {
 }
 
 s_no_extra_traits! {
-    // FIXME: This is actually a union.
+    // FIXME(union): This is actually a union.
     pub struct fpreg_t {
         pub d: c_double,
         // f: c_float,
diff --git a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
index a0dbb99ed76d9..291d78393fe9d 100644
--- a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
+++ b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
@@ -308,7 +308,7 @@ s_no_extra_traits! {
         pub uc_mcontext: mcontext_t,
         pub uc_sigmask: crate::sigset_t,
         __private: [u8; 512],
-        // FIXME: the shadow stack field requires glibc >= 2.28.
+        // FIXME(linux): the shadow stack field requires glibc >= 2.28.
         // Re-add once we drop compatibility with glibc versions older than
         // 2.28.
         //
@@ -357,7 +357,7 @@ cfg_if! {
                     .field("mxcsr", &self.mxcsr)
                     .field("mxcr_mask", &self.mxcr_mask)
                     .field("st_space", &self.st_space)
-                    // FIXME: .field("xmm_space", &self.xmm_space)
+                    // FIXME(debug): .field("xmm_space", &self.xmm_space)
                     // Ignore padding field
                     .finish()
             }
@@ -663,7 +663,7 @@ pub const PR_SPEC_FORCE_DISABLE: c_uint = 1 << 3;
 pub const PR_SPEC_DISABLE_NOEXEC: c_uint = 1 << 4;
 pub const PR_SPEC_STORE_BYPASS: c_int = 0;
 pub const PR_SPEC_INDIRECT_BRANCH: c_int = 1;
-// FIXME: perharps for later
+// FIXME(linux): perharps for later
 //pub const PR_SPEC_L1D_FLUSH: c_int = 2;
 
 pub const MCL_CURRENT: c_int = 0x0001;
diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
index 4f6da0a6b7dc5..fb1233e5774a6 100644
--- a/src/unix/linux_like/linux/gnu/mod.rs
+++ b/src/unix/linux_like/linux/gnu/mod.rs
@@ -587,7 +587,7 @@ cfg_if! {
                     .field("ut_line", &self.ut_line)
                     .field("ut_id", &self.ut_id)
                     .field("ut_user", &self.ut_user)
-                    // FIXME: .field("ut_host", &self.ut_host)
+                    // FIXME(debug): .field("ut_host", &self.ut_host)
                     .field("ut_exit", &self.ut_exit)
                     .field("ut_session", &self.ut_session)
                     .field("ut_tv", &self.ut_tv)
diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
index f24bc6f3ae422..f17245dfaf43e 100644
--- a/src/unix/linux_like/linux/mod.rs
+++ b/src/unix/linux_like/linux/mod.rs
@@ -76,7 +76,7 @@ pub type sctp_assoc_t = __s32;
 pub type eventfd_t = u64;
 missing! {
     #[cfg_attr(feature = "extra_traits", derive(Debug))]
-    pub enum fpos64_t {} // FIXME: fill this out with a struct
+    pub enum fpos64_t {} // FIXME(linux): fill this out with a struct
 }
 
 e! {
@@ -1836,7 +1836,7 @@ cfg_if! {
                     .field("d_off", &self.d_off)
                     .field("d_reclen", &self.d_reclen)
                     .field("d_type", &self.d_type)
-                    // FIXME: .field("d_name", &self.d_name)
+                    // FIXME(debug): .field("d_name", &self.d_name)
                     .finish()
             }
         }
@@ -1874,7 +1874,7 @@ cfg_if! {
                     .field("d_off", &self.d_off)
                     .field("d_reclen", &self.d_reclen)
                     .field("d_type", &self.d_type)
-                    // FIXME: .field("d_name", &self.d_name)
+                    // FIXME(debug): .field("d_name", &self.d_name)
                     .finish()
             }
         }
@@ -1900,7 +1900,7 @@ cfg_if! {
         impl fmt::Debug for pthread_cond_t {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
                 f.debug_struct("pthread_cond_t")
-                    // FIXME: .field("size", &self.size)
+                    // FIXME(debug): .field("size", &self.size)
                     .finish()
             }
         }
@@ -1922,7 +1922,7 @@ cfg_if! {
         impl fmt::Debug for pthread_mutex_t {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
                 f.debug_struct("pthread_mutex_t")
-                    // FIXME: .field("size", &self.size)
+                    // FIXME(debug): .field("size", &self.size)
                     .finish()
             }
         }
@@ -1944,7 +1944,7 @@ cfg_if! {
         impl fmt::Debug for pthread_rwlock_t {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
                 f.debug_struct("pthread_rwlock_t")
-                    // FIXME: .field("size", &self.size)
+                    // FIXME(debug): .field("size", &self.size)
                     .finish()
             }
         }
diff --git a/src/unix/linux_like/linux/musl/b32/hexagon.rs b/src/unix/linux_like/linux/musl/b32/hexagon.rs
index 61174fbd408da..f58eccca4edb3 100644
--- a/src/unix/linux_like/linux/musl/b32/hexagon.rs
+++ b/src/unix/linux_like/linux/musl/b32/hexagon.rs
@@ -233,7 +233,7 @@ pub const SIGVTALRM: c_int = 26;
 pub const SIGWINCH: c_int = 28;
 pub const SIGXCPU: c_int = 24;
 pub const SIGXFSZ: c_int = 25;
-pub const SIG_SETMASK: c_int = 2; // FIXME check these
+pub const SIG_SETMASK: c_int = 2; // FIXME(musl) check these
 pub const SIG_BLOCK: c_int = 0x000000;
 pub const SIG_UNBLOCK: c_int = 0x01;
 pub const SOCK_DGRAM: c_int = 2;
@@ -286,7 +286,7 @@ pub const SYS_clock_settime: c_int = 112;
 pub const SYS_clone: c_int = 220;
 pub const SYS_close: c_int = 57;
 pub const SYS_connect: c_int = 203;
-pub const SYS_copy_file_range: c_int = -1; // FIXME
+pub const SYS_copy_file_range: c_int = -1; // FIXME(musl)
 pub const SYS_creat: c_int = 1064;
 pub const SYS_delete_module: c_int = 106;
 pub const SYS_dup2: c_int = 1041;
diff --git a/src/unix/linux_like/linux/musl/b64/s390x.rs b/src/unix/linux_like/linux/musl/b64/s390x.rs
index 25f49fc15534d..cb3ec41be7f93 100644
--- a/src/unix/linux_like/linux/musl/b64/s390x.rs
+++ b/src/unix/linux_like/linux/musl/b64/s390x.rs
@@ -63,7 +63,7 @@ s! {
 }
 
 s_no_extra_traits! {
-    // FIXME: This is actually a union.
+    // FIXME(union): This is actually a union.
     pub struct fpreg_t {
         pub d: c_double,
         // f: c_float,
diff --git a/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs b/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs
index b8f659b72392d..ac62582d08b61 100644
--- a/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs
+++ b/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs
@@ -205,7 +205,7 @@ cfg_if! {
                     .field("mxcsr", &self.mxcsr)
                     .field("mxcr_mask", &self.mxcr_mask)
                     .field("st_space", &self.st_space)
-                    // FIXME: .field("xmm_space", &self.xmm_space)
+                    // FIXME(debug): .field("xmm_space", &self.xmm_space)
                     // Ignore padding field
                     .finish()
             }
diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
index 8666218f14a92..97f93bb3dbee3 100644
--- a/src/unix/linux_like/linux/musl/mod.rs
+++ b/src/unix/linux_like/linux/musl/mod.rs
@@ -440,7 +440,7 @@ s_no_extra_traits! {
         pub __reserved: [c_char; 256],
     }
 
-    // FIXME: musl added paddings and adjusted
+    // FIXME(musl): musl added paddings and adjusted
     // layout in 1.2.0 but our CI is still 1.1.24.
     // So, I'm leaving some fields as cfg for now.
     // ref. https://github.com/bminor/musl/commit/
@@ -532,7 +532,7 @@ cfg_if! {
                     .field("totalhigh", &self.totalhigh)
                     .field("freehigh", &self.freehigh)
                     .field("mem_unit", &self.mem_unit)
-                    // FIXME: .field("__reserved", &self.__reserved)
+                    // FIXME(debug): .field("__reserved", &self.__reserved)
                     .finish()
             }
         }
@@ -589,7 +589,7 @@ cfg_if! {
                     .field("ut_line", &self.ut_line)
                     .field("ut_id", &self.ut_id)
                     .field("ut_user", &self.ut_user)
-                    //FIXME: .field("ut_host", &self.ut_host)
+                    //FIXME(debug): .field("ut_host", &self.ut_host)
                     .field("ut_exit", &self.ut_exit)
                     .field("ut_session", &self.ut_session)
                     //.field("__ut_pad2", &self.__ut_pad2)
diff --git a/src/unix/linux_like/linux/uclibc/arm/mod.rs b/src/unix/linux_like/linux/uclibc/arm/mod.rs
index cbeedb51630f4..c237b7e160bbf 100644
--- a/src/unix/linux_like/linux/uclibc/arm/mod.rs
+++ b/src/unix/linux_like/linux/uclibc/arm/mod.rs
@@ -895,7 +895,7 @@ pub const SYS_pwritev2: c_long = 393;
 pub const SYS_pkey_mprotect: c_long = 394;
 pub const SYS_pkey_alloc: c_long = 395;
 pub const SYS_pkey_free: c_long = 396;
-// FIXME: should be a `c_long` too, but a bug slipped in.
+// FIXME(linux): should be a `c_long` too, but a bug slipped in.
 pub const SYS_statx: c_int = 397;
 pub const SYS_pidfd_send_signal: c_long = 424;
 pub const SYS_io_uring_setup: c_long = 425;
diff --git a/src/unix/linux_like/linux/uclibc/x86_64/mod.rs b/src/unix/linux_like/linux/uclibc/x86_64/mod.rs
index e366e3b4c78b4..7ede4d020d6f3 100644
--- a/src/unix/linux_like/linux/uclibc/x86_64/mod.rs
+++ b/src/unix/linux_like/linux/uclibc/x86_64/mod.rs
@@ -142,14 +142,14 @@ s! {
     }
 
     pub struct stack_t {
-        // FIXME
+        // FIXME(ulibc)
         pub ss_sp: *mut c_void,
         pub ss_flags: c_int,
         pub ss_size: size_t,
     }
 
     pub struct statfs {
-        // FIXME
+        // FIXME(ulibc)
         pub f_type: fsword_t,
         pub f_bsize: fsword_t,
         pub f_blocks: crate::fsblkcnt_t,
@@ -195,7 +195,7 @@ s! {
     }
 
     pub struct msghdr {
-        // FIXME
+        // FIXME(ulibc)
         pub msg_name: *mut c_void,
         pub msg_namelen: crate::socklen_t,
         pub msg_iov: *mut crate::iovec,
@@ -206,7 +206,7 @@ s! {
     }
 
     pub struct termios {
-        // FIXME
+        // FIXME(ulibc)
         pub c_iflag: crate::tcflag_t,
         pub c_oflag: crate::tcflag_t,
         pub c_cflag: crate::tcflag_t,
@@ -216,12 +216,12 @@ s! {
     }
 
     pub struct sigset_t {
-        // FIXME
+        // FIXME(ulibc)
         __val: [c_ulong; 16],
     }
 
     pub struct sysinfo {
-        // FIXME
+        // FIXME(ulibc)
         pub uptime: c_long,
         pub loads: [c_ulong; 3],
         pub totalram: c_ulong,
@@ -239,7 +239,7 @@ s! {
     }
 
     pub struct glob_t {
-        // FIXME
+        // FIXME(ulibc)
         pub gl_pathc: size_t,
         pub gl_pathv: *mut *mut c_char,
         pub gl_offs: size_t,
@@ -252,7 +252,7 @@ s! {
     }
 
     pub struct cpu_set_t {
-        // FIXME
+        // FIXME(ulibc)
         #[cfg(target_pointer_width = "32")]
         bits: [u32; 32],
         #[cfg(target_pointer_width = "64")]
@@ -260,7 +260,7 @@ s! {
     }
 
     pub struct fsid_t {
-        // FIXME
+        // FIXME(ulibc)
         __val: [c_int; 2],
     }
 
diff --git a/src/windows/mod.rs b/src/windows/mod.rs
index a92dd98b35f2c..b07b5a98dc49e 100644
--- a/src/windows/mod.rs
+++ b/src/windows/mod.rs
@@ -264,7 +264,7 @@ impl Clone for FILE {
     }
 }
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos_t {} // FIXME: fill this out with a struct
+pub enum fpos_t {} // FIXME(windows): fill this out with a struct
 impl Copy for fpos_t {}
 impl Clone for fpos_t {
     fn clone(&self) -> fpos_t {