diff --git a/src/bluetooth.rs b/src/bluetooth.rs
index 86d5b0c..c871665 100644
--- a/src/bluetooth.rs
+++ b/src/bluetooth.rs
@@ -1,10 +1,10 @@
-use super::hidreport::HidReport;
-use super::keyboard::Keyboard;
-use super::led::Led;
-use super::protocol::{BleOp, KeyboardOp, LedOp, MacroOp, Message, MsgType, SystemOp};
-use super::serial::bluetooth_usart::BluetoothUsart;
-use super::serial::{DmaUsart, Serial, Transfer};
 use crate::debug::UnwrapLog;
+use crate::hidreport::HidReport;
+use crate::keyboard::Keyboard;
+use crate::led::Led;
+use crate::protocol::{BleOp, KeyboardOp, LedOp, MacroOp, Message, MsgType, SystemOp};
+use crate::serial::bluetooth_usart::BluetoothUsart;
+use crate::serial::{DmaUsart, Serial, Transfer};
 use crate::Threshold;
 
 use core::marker::Unsize;
diff --git a/src/led.rs b/src/led.rs
index fc324f2..9ee78bf 100644
--- a/src/led.rs
+++ b/src/led.rs
@@ -1,9 +1,9 @@
-use super::keymatrix::KeyState;
-use super::protocol::{LedOp, Message, MsgType};
-use super::serial::led_usart::LedUsart;
-use super::serial::{Serial, Transfer};
 use crate::bluetooth::BluetoothMode;
 use crate::keycodes::KeyIndex;
+use crate::keymatrix::KeyState;
+use crate::protocol::{LedOp, Message, MsgType};
+use crate::serial::led_usart::LedUsart;
+use crate::serial::{Serial, Transfer};
 use crate::Threshold;
 
 use core::marker::Unsize;
diff --git a/src/serial/bluetooth_usart.rs b/src/serial/bluetooth_usart.rs
index 53e45c1..8625cb1 100644
--- a/src/serial/bluetooth_usart.rs
+++ b/src/serial/bluetooth_usart.rs
@@ -4,7 +4,7 @@ use hal::gpio::gpioa::{PA1, PA2, PA3};
 use hal::gpio::{Alternate, Input, Output};
 use stm32l1::stm32l151::{RCC, USART2};
 
-use super::DmaUsart;
+use crate::serial::DmaUsart;
 
 pub struct BluetoothUsart {
     pa1: PA1<Output>,
diff --git a/src/serial/led_usart.rs b/src/serial/led_usart.rs
index 3ece291..44f8f2f 100644
--- a/src/serial/led_usart.rs
+++ b/src/serial/led_usart.rs
@@ -1,4 +1,4 @@
-use super::DmaUsart;
+use crate::serial::DmaUsart;
 use hal::dma::dma1::{C2, C3};
 use hal::gpio::gpiob::{PB10, PB11};
 use hal::gpio::{Alternate, Input};
diff --git a/src/serial/mod.rs b/src/serial/mod.rs
index 1a1fc5a..7b6ff5c 100644
--- a/src/serial/mod.rs
+++ b/src/serial/mod.rs
@@ -1,7 +1,7 @@
 pub mod bluetooth_usart;
 pub mod led_usart;
 
-use super::protocol::MsgType;
+use crate::protocol::MsgType;
 use core::marker::Unsize;
 use nb;
 
diff --git a/src/usb/hid.rs b/src/usb/hid.rs
index 8d5eb0a..21a36d8 100644
--- a/src/usb/hid.rs
+++ b/src/usb/hid.rs
@@ -1,4 +1,4 @@
-use super::pma::PMA;
+use crate::usb::pma::PMA;
 use crate::usb::usb_ext::UsbEpExt;
 use stm32l1::stm32l151::USB;