diff --git a/Cargo.toml b/Cargo.toml
index 25a14779..97888342 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "riscv"
 version = "0.8.0"
+edition = "2021"
 rust-version = "1.59"
 repository = "https://github.com/rust-embedded/riscv"
 authors = ["The RISC-V Team <risc-v@teams.rust-embedded.org>"]
diff --git a/src/interrupt.rs b/src/interrupt.rs
index d43fd987..14fc5d96 100644
--- a/src/interrupt.rs
+++ b/src/interrupt.rs
@@ -1,8 +1,8 @@
 //! Interrupts
 
 // NOTE: Adapted from cortex-m/src/interrupt.rs
+use crate::register::mstatus;
 pub use bare_metal::{CriticalSection, Mutex};
-use register::mstatus;
 
 /// Disables all interrupts
 #[inline]
diff --git a/src/lib.rs b/src/lib.rs
index 5590cd03..f3e58f3c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,10 +15,6 @@
 
 #![no_std]
 
-extern crate bare_metal;
-extern crate bit_field;
-extern crate embedded_hal;
-
 pub mod asm;
 pub mod delay;
 pub mod interrupt;