diff --git a/src/new/linux_uapi/linux/can.rs b/src/new/linux_uapi/linux/can.rs
index 887ab869ca707..c8ae6d46a44e8 100644
--- a/src/new/linux_uapi/linux/can.rs
+++ b/src/new/linux_uapi/linux/can.rs
@@ -4,10 +4,6 @@ pub(crate) mod bcm;
 pub(crate) mod j1939;
 pub(crate) mod raw;
 
-pub use bcm::*;
-pub use j1939::*;
-pub use raw::*;
-
 use crate::prelude::*;
 
 pub const CAN_EFF_FLAG: canid_t = 0x80000000;
diff --git a/src/new/linux_uapi/linux/can/bcm.rs b/src/new/linux_uapi/linux/can/bcm.rs
index 2cdeb399b31f3..10f67d2db04e9 100644
--- a/src/new/linux_uapi/linux/can/bcm.rs
+++ b/src/new/linux_uapi/linux/can/bcm.rs
@@ -1,4 +1,4 @@
-//! `linux/can/bcm.h`
+//! Header: `linux/can/bcm.h`
 
 pub use crate::linux::can::*;
 
diff --git a/src/new/linux_uapi/linux/can/raw.rs b/src/new/linux_uapi/linux/can/raw.rs
index 1f92a13edbba6..470334bd5d147 100644
--- a/src/new/linux_uapi/linux/can/raw.rs
+++ b/src/new/linux_uapi/linux/can/raw.rs
@@ -1,4 +1,4 @@
-//! `linux/can/raw.h`
+//! Header: `linux/can/raw.h`
 
 pub use crate::linux::can::*;
 
diff --git a/src/new/linux_uapi/linux/keyctl.rs b/src/new/linux_uapi/linux/keyctl.rs
index 2c86df39e190b..cc6527a8a5113 100644
--- a/src/new/linux_uapi/linux/keyctl.rs
+++ b/src/new/linux_uapi/linux/keyctl.rs
@@ -1,6 +1,5 @@
-//! Header: `uapi/linux/keyctl.h`
+//! Header: `linux/keyctl.h`
 
-// linux/keyctl.h
 pub const KEY_SPEC_THREAD_KEYRING: i32 = -1;
 pub const KEY_SPEC_PROCESS_KEYRING: i32 = -2;
 pub const KEY_SPEC_SESSION_KEYRING: i32 = -3;
diff --git a/src/new/linux_uapi/linux/mod.rs b/src/new/linux_uapi/linux/mod.rs
index e264892063807..993394e4370ca 100644
--- a/src/new/linux_uapi/linux/mod.rs
+++ b/src/new/linux_uapi/linux/mod.rs
@@ -1,6 +1,6 @@
-//! The `linux` directory within `include/uapi` in the Linux source tree.
+//! Directory: `linux/`
+//!
+//! <https://github.com/torvalds/linux/tree/master/include/uapi/linux>
 
 pub(crate) mod can;
-pub use can::*;
 pub(crate) mod keyctl;
-pub use keyctl::*;
diff --git a/src/new/linux_uapi/mod.rs b/src/new/linux_uapi/mod.rs
index e0d4e094c435f..8ac3022d16578 100644
--- a/src/new/linux_uapi/mod.rs
+++ b/src/new/linux_uapi/mod.rs
@@ -1,4 +1,3 @@
 //! This directory maps to `include/uapi` in the Linux source tree.
 
 pub(crate) mod linux;
-pub use linux::*;
diff --git a/src/new/mod.rs b/src/new/mod.rs
index 332c7c9001ea5..410c7f5536fb8 100644
--- a/src/new/mod.rs
+++ b/src/new/mod.rs
@@ -14,16 +14,29 @@
 //!
 //! All modules are only crate-public since we don't reexport this structure.
 
+// Libraries available on each platform
 cfg_if! {
     if #[cfg(target_os = "linux")] {
         mod linux_uapi;
-        pub use linux_uapi::*;
+        pub(crate) use linux_uapi::*;
     } else if #[cfg(target_os = "android")] {
         mod bionic;
         pub use bionic::*;
     } else if #[cfg(target_vendor = "apple")] {
         mod apple;
         pub(crate) use apple::*;
+    }
+}
+
+// Headers we export
+cfg_if! {
+    if #[cfg(target_os = "linux")] {
+        pub use linux::can::bcm::*;
+        pub use linux::can::j1939::*;
+        pub use linux::can::raw::*;
+        pub use linux::can::*;
+        pub use linux::keyctl::*;
+    } else if #[cfg(target_vendor = "apple")] {
         pub use signal::*;
     }
 }