diff --git a/libc-test/build.rs b/libc-test/build.rs
index 67f21a8db3a15..472ef224d9447 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -1989,6 +1989,10 @@ fn test_android(target: &str) {
             // Just pass all these through, no need for a "struct" prefix
             "FILE" | "fd_set" | "Dl_info" | "Elf32_Phdr" | "Elf64_Phdr" => ty.to_string(),
 
+            "__uint128" | "__uint128_t" => "uint128".to_string(),
+
+            "__int128" | "__int128_t" => "int128".to_string(),
+
             t if is_union => format!("union {t}"),
 
             t if t.ends_with("_t") => t.to_string(),
diff --git a/src/primitives.rs b/src/primitives.rs
index 78b14b52ef1f2..a9821f42c748c 100644
--- a/src/primitives.rs
+++ b/src/primitives.rs
@@ -129,12 +129,16 @@ cfg_if! {
         // [0]: https://github.com/rust-lang/rust/issues/54341
 
         /// C `__int128` (a GCC extension that's part of many ABIs)
+        #[deprecated(since = "0.2.172", note = "Use i128 instead.")]
         pub type __int128 = i128;
         /// C `unsigned __int128` (a GCC extension that's part of many ABIs)
+        #[deprecated(since = "0.2.172", note = "Use u128 instead.")]
         pub type __uint128 = u128;
         /// C __int128_t (alternate name for [__int128][])
+        #[deprecated(since = "0.2.172", note = "Use i128 instead.")]
         pub type __int128_t = i128;
         /// C __uint128_t (alternate name for [__uint128][])
+        #[deprecated(since = "0.2.172", note = "Use u128 instead.")]
         pub type __uint128_t = u128;
 
         // NOTE: if you add more platforms to here, you may need to cfg
@@ -181,8 +185,10 @@ cfg_if! {
         )
     ))] {
         /// C `__int128_t`
+        #[deprecated(since = "0.2.172", note = "Use i128 instead.")]
         pub type __int128_t = i128;
         /// C `__uint128_t`
+        #[deprecated(since = "0.2.172", note = "Use ux128 instead.")]
         pub type __uint128_t = u128;
     }
 }
diff --git a/src/unix/bsd/apple/b64/aarch64/mod.rs b/src/unix/bsd/apple/b64/aarch64/mod.rs
index e300b76ae8228..45bab300eb917 100644
--- a/src/unix/bsd/apple/b64/aarch64/mod.rs
+++ b/src/unix/bsd/apple/b64/aarch64/mod.rs
@@ -40,7 +40,7 @@ s! {
     }
 
     pub struct __darwin_arm_neon_state64 {
-        pub __v: [crate::__uint128_t; 32],
+        pub __v: [u128; 32],
         pub __fpsr: u32,
         pub __fpcr: u32,
     }
diff --git a/src/unix/linux_like/android/b64/aarch64/mod.rs b/src/unix/linux_like/android/b64/aarch64/mod.rs
index b678eb8da6aa4..47d7208b0b9ae 100644
--- a/src/unix/linux_like/android/b64/aarch64/mod.rs
+++ b/src/unix/linux_like/android/b64/aarch64/mod.rs
@@ -78,7 +78,7 @@ s! {
     }
 
     pub struct user_fpsimd_struct {
-        pub vregs: [crate::__uint128_t; 32],
+        pub vregs: [u128; 32],
         pub fpsr: u32,
         pub fpcr: u32,
     }
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 b310af8e4e531..6c14313678e0c 100644
--- a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
+++ b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
@@ -220,7 +220,7 @@ s! {
     }
 
     pub struct user_fpsimd_struct {
-        pub vregs: [crate::__uint128_t; 32],
+        pub vregs: [u128; 32],
         pub fpsr: c_uint,
         pub fpcr: c_uint,
     }
diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
index 243247edafc46..1addefbb6af24 100644
--- a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
+++ b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
@@ -122,7 +122,7 @@ s! {
     }
 
     pub struct user_fpsimd_struct {
-        pub vregs: [crate::__uint128_t; 32],
+        pub vregs: [u128; 32],
         pub fpsr: u32,
         pub fpcr: u32,
     }