diff --git a/crates/sel4-microkit/src/defer.rs b/crates/sel4-microkit/base/src/defer.rs
similarity index 100%
rename from crates/sel4-microkit/src/defer.rs
rename to crates/sel4-microkit/base/src/defer.rs
diff --git a/crates/sel4-microkit/src/handler.rs b/crates/sel4-microkit/base/src/handler.rs
similarity index 100%
rename from crates/sel4-microkit/src/handler.rs
rename to crates/sel4-microkit/base/src/handler.rs
diff --git a/crates/sel4-microkit/src/ipc.rs b/crates/sel4-microkit/base/src/ipc.rs
similarity index 98%
rename from crates/sel4-microkit/src/ipc.rs
rename to crates/sel4-microkit/base/src/ipc.rs
index 1ab2539a7..902d4405e 100644
--- a/crates/sel4-microkit/src/ipc.rs
+++ b/crates/sel4-microkit/base/src/ipc.rs
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: BSD-2-Clause
 //
 
-use sel4_microkit_base::MessageInfo;
+use crate::MessageInfo;
 
 use crate::{defer::PreparedDeferredAction, Channel, ProtectionDomain};
 
diff --git a/crates/sel4-microkit/base/src/lib.rs b/crates/sel4-microkit/base/src/lib.rs
index e45bcbab0..d3b6d2643 100644
--- a/crates/sel4-microkit/base/src/lib.rs
+++ b/crates/sel4-microkit/base/src/lib.rs
@@ -8,10 +8,17 @@
 #![feature(used_with_arg)]
 
 mod channel;
+mod defer;
+mod handler;
 mod message;
 mod symbols;
 
+#[doc(hidden)]
+pub mod ipc;
+
 pub use channel::{Channel, IrqAckError, ProtectionDomain};
+pub use defer::{DeferredAction, DeferredActionInterface, DeferredActionSlot};
+pub use handler::{Handler, Infallible, NullHandler};
 pub use message::{
     get_mr, set_mr, with_msg_bytes, with_msg_bytes_mut, with_msg_regs, with_msg_regs_mut,
     MessageInfo, MessageLabel, MessageRegisterValue,
diff --git a/crates/sel4-microkit/src/entry.rs b/crates/sel4-microkit/src/entry.rs
index 62f7c16a6..cec94cd95 100644
--- a/crates/sel4-microkit/src/entry.rs
+++ b/crates/sel4-microkit/src/entry.rs
@@ -10,7 +10,7 @@ use sel4_microkit_base::ipc_buffer_ptr;
 use sel4_panicking::catch_unwind;
 use sel4_panicking_env::abort;
 
-use crate::{handler::Handler, panicking::init_panicking};
+use crate::{panicking::init_panicking, Handler};
 
 #[cfg(target_thread_local)]
 #[no_mangle]
diff --git a/crates/sel4-microkit/src/lib.rs b/crates/sel4-microkit/src/lib.rs
index a31de634d..c6a99c62a 100644
--- a/crates/sel4-microkit/src/lib.rs
+++ b/crates/sel4-microkit/src/lib.rs
@@ -38,19 +38,12 @@ extern crate alloc;
 pub use sel4_microkit_base::*;
 pub use sel4_microkit_macros::protection_domain;
 
-mod defer;
 mod entry;
-mod handler;
 mod heap;
 mod printing;
 
 pub mod panicking;
 
-#[doc(hidden)]
-pub mod ipc;
-
-pub use defer::{DeferredAction, DeferredActionInterface, DeferredActionSlot};
-pub use handler::{Handler, Infallible, NullHandler};
 pub use printing::{debug_print, debug_println};
 
 /// Declares the initialization function, stack size, and, optionally, heap and heap size.