diff --git a/machine/src/platform/raspberrypi/device_driver/arm/gicv2/gicc.rs b/machine/src/platform/raspberrypi/device_driver/arm/gicv2/gicc.rs
index 8ff73ca..03db041 100644
--- a/machine/src/platform/raspberrypi/device_driver/arm/gicv2/gicc.rs
+++ b/machine/src/platform/raspberrypi/device_driver/arm/gicv2/gicc.rs
@@ -5,7 +5,7 @@
 //! GICC Driver - GIC CPU interface.
 
 use {
-    crate::{bsp::device_driver::common::MMIODerefWrapper, exception},
+    crate::{exception, platform::device_driver::common::MMIODerefWrapper},
     tock_registers::{
         interfaces::{Readable, Writeable},
         register_bitfields, register_structs,
diff --git a/machine/src/platform/raspberrypi/device_driver/arm/gicv2/gicd.rs b/machine/src/platform/raspberrypi/device_driver/arm/gicv2/gicd.rs
index c36c1b9..0ca56b4 100644
--- a/machine/src/platform/raspberrypi/device_driver/arm/gicv2/gicd.rs
+++ b/machine/src/platform/raspberrypi/device_driver/arm/gicv2/gicd.rs
@@ -9,7 +9,7 @@
 
 use {
     crate::{
-        bsp::device_driver::common::MMIODerefWrapper,
+        platform::device_driver::common::MMIODerefWrapper,
         state,
         synchronization::{self, IRQSafeNullLock},
     },
diff --git a/machine/src/platform/raspberrypi/device_driver/arm/gicv2/mod.rs b/machine/src/platform/raspberrypi/device_driver/arm/gicv2/mod.rs
index 6bbd235..e696d4a 100644
--- a/machine/src/platform/raspberrypi/device_driver/arm/gicv2/mod.rs
+++ b/machine/src/platform/raspberrypi/device_driver/arm/gicv2/mod.rs
@@ -80,8 +80,8 @@ mod gicc;
 mod gicd;
 
 use crate::{
-    bsp::{self, cpu::BOOT_CORE_ID, device_driver::common::BoundedUsize},
     cpu, drivers, exception,
+    platform::{self, cpu::BOOT_CORE_ID, device_driver::common::BoundedUsize},
     synchronization::{self, InitStateLock},
 };
 
@@ -139,7 +139,7 @@ impl GICv2 {
 //------------------------------------------------------------------------------
 use synchronization::interface::ReadWriteEx;
 
-impl driver::interface::DeviceDriver for GICv2 {
+impl drivers::interface::DeviceDriver for GICv2 {
     type IRQNumberType = IRQNumber;
 
     fn compatible(&self) -> &'static str {