diff --git a/nucleus/src/platform/rpi3/mailbox.rs b/nucleus/src/platform/rpi3/mailbox.rs
index a0bb2bd..76eff72 100644
--- a/nucleus/src/platform/rpi3/mailbox.rs
+++ b/nucleus/src/platform/rpi3/mailbox.rs
@@ -20,7 +20,11 @@ use {
         sync::atomic::{compiler_fence, Ordering},
     },
     cortex_a::asm::barrier,
-    tock_registers::{interfaces::*, register_bitfields, registers::*},
+    tock_registers::{
+        interfaces::{Readable, Writeable},
+        register_bitfields,
+        registers::{ReadOnly, WriteOnly},
+    },
 };
 
 /// Public interface to the mailbox.
diff --git a/nucleus/src/platform/rpi3/mini_uart.rs b/nucleus/src/platform/rpi3/mini_uart.rs
index f7359ec..118feb4 100644
--- a/nucleus/src/platform/rpi3/mini_uart.rs
+++ b/nucleus/src/platform/rpi3/mini_uart.rs
@@ -10,7 +10,11 @@ use {
     crate::devices::ConsoleOps,
     cfg_if::cfg_if,
     core::{convert::From, fmt, ops},
-    tock_registers::{interfaces::*, register_bitfields, registers::*},
+    tock_registers::{
+        interfaces::{ReadWriteable, Readable, Writeable},
+        register_bitfields,
+        registers::{ReadOnly, ReadWrite, WriteOnly},
+    },
 };
 
 // Auxiliary mini UART registers
diff --git a/nucleus/src/platform/rpi3/pl011_uart.rs b/nucleus/src/platform/rpi3/pl011_uart.rs
index 97dbb57..557c3cb 100644
--- a/nucleus/src/platform/rpi3/pl011_uart.rs
+++ b/nucleus/src/platform/rpi3/pl011_uart.rs
@@ -17,7 +17,11 @@ use {
     crate::{arch::loop_until, devices::ConsoleOps},
     core::ops,
     snafu::Snafu,
-    tock_registers::{interfaces::*, register_bitfields, registers::*},
+    tock_registers::{
+        interfaces::{Readable, Writeable},
+        register_bitfields,
+        registers::{ReadOnly, ReadWrite, WriteOnly},
+    },
 };
 
 // PL011 UART registers.
diff --git a/nucleus/src/platform/rpi3/power.rs b/nucleus/src/platform/rpi3/power.rs
index 995767d..882d9c8 100644
--- a/nucleus/src/platform/rpi3/power.rs
+++ b/nucleus/src/platform/rpi3/power.rs
@@ -14,7 +14,10 @@ use {
     crate::arch::loop_delay,
     core::ops,
     snafu::Snafu,
-    tock_registers::{interfaces::*, registers::*},
+    tock_registers::{
+        interfaces::{Readable, Writeable},
+        registers::ReadWrite,
+    },
 };
 
 const POWER_BASE: usize = BcmHost::get_peripheral_address() + 0x0010_001C;