diff --git a/ebpf/aya-ebpf-bindings/build.rs b/ebpf/aya-ebpf-bindings/build.rs
index 1d3bb965..fde2d9e5 100644
--- a/ebpf/aya-ebpf-bindings/build.rs
+++ b/ebpf/aya-ebpf-bindings/build.rs
@@ -9,4 +9,5 @@ fn main() {
         let arch = arch.split_once('-').map_or(&*arch, |x| x.0);
         println!("cargo:rustc-cfg=bpf_target_arch=\"{arch}\"");
     }
+    println!("cargo::rustc-check-cfg=cfg(bpf_target_arch, values(\"x86_64\",\"arm\",\"aarch64\",\"riscv64\"))");
 }
diff --git a/ebpf/aya-ebpf-cty/build.rs b/ebpf/aya-ebpf-cty/build.rs
index 1d3bb965..1488a7f2 100644
--- a/ebpf/aya-ebpf-cty/build.rs
+++ b/ebpf/aya-ebpf-cty/build.rs
@@ -9,4 +9,6 @@ fn main() {
         let arch = arch.split_once('-').map_or(&*arch, |x| x.0);
         println!("cargo:rustc-cfg=bpf_target_arch=\"{arch}\"");
     }
+    println!("cargo::rustc-check-cfg=cfg(bpf_target_arch, values(\"x86_64\",\"arm\",\"aarch64\",\"riscv64\"))");
+    println!("cargo::rustc-check-cfg=cfg(target_arch, values(\"asmjs\",\"nvptx\",\"xtensa\"))");
 }
diff --git a/ebpf/aya-ebpf-cty/src/lib.rs b/ebpf/aya-ebpf-cty/src/lib.rs
index 4a62a0d9..b2530c12 100644
--- a/ebpf/aya-ebpf-cty/src/lib.rs
+++ b/ebpf/aya-ebpf-cty/src/lib.rs
@@ -27,11 +27,8 @@ mod ad {
     #[cfg(bpf_target_arch = "riscv64")]
     pub type c_char = super::c_uchar;
 
-    #[cfg(any(bpf_target_arch = "x86", bpf_target_arch = "x86_64"))]
+    #[cfg(bpf_target_arch = "x86_64")]
     pub type c_char = super::c_schar;
-
-    #[cfg(all(not(bpf_target_arch), host_arch = "aarch64"))]
-    pub type c_char = super::c_uchar;
 }
 
 #[cfg(any(
diff --git a/ebpf/aya-ebpf/build.rs b/ebpf/aya-ebpf/build.rs
index da29a8e4..e087046a 100644
--- a/ebpf/aya-ebpf/build.rs
+++ b/ebpf/aya-ebpf/build.rs
@@ -10,6 +10,8 @@ fn main() {
         let arch = arch.split_once('-').map_or(&*arch, |x| x.0);
         println!("cargo:rustc-cfg=bpf_target_arch=\"{arch}\"");
     }
+    println!("cargo::rustc-check-cfg=cfg(bpf_target_arch, values(\"x86_64\",\"arm\",\"aarch64\",\"riscv64\"))");
+    println!("cargo::rustc-check-cfg=cfg(unstable)");
 }
 
 #[rustversion::nightly]