diff --git a/embassy-stm32/src/i2c/v2.rs b/embassy-stm32/src/i2c/v2.rs
index c93d23291..80d8fc0c7 100644
--- a/embassy-stm32/src/i2c/v2.rs
+++ b/embassy-stm32/src/i2c/v2.rs
@@ -1,7 +1,4 @@
-use crate::gpio::AnyPin;
-use crate::gpio::Pin;
-use crate::i2c::{Error, Instance, SclPin, SdaPin};
-use crate::time::Hertz;
+use core::cmp;
 use core::marker::PhantomData;
 use embassy::util::Unborrow;
 use embassy_extras::unborrow;
@@ -9,13 +6,14 @@ use embedded_hal::blocking::i2c::Read;
 use embedded_hal::blocking::i2c::Write;
 use embedded_hal::blocking::i2c::WriteRead;
 
-use crate::pac::i2c;
-use crate::pac::i2c::I2c as I2cTrait;
-use core::cmp;
-
+use crate::gpio::AnyPin;
+use crate::gpio::Pin;
+use crate::i2c::{Error, Instance, SclPin, SdaPin};
 use crate::pac::gpio::vals::{Afr, Moder, Ot};
 use crate::pac::gpio::Gpio;
-use crate::pac::regs::gpio_v1::vals::Cnf;
+use crate::pac::i2c;
+use crate::pac::i2c::I2c as I2cTrait;
+use crate::time::Hertz;
 
 pub struct I2c<'d, T: Instance> {
     //peri: T,
diff --git a/embassy-stm32/src/pwr/h7.rs b/embassy-stm32/src/pwr/h7.rs
index 939e93eb2..3d83b5e85 100644
--- a/embassy-stm32/src/pwr/h7.rs
+++ b/embassy-stm32/src/pwr/h7.rs
@@ -1,5 +1,5 @@
-use crate::pac::peripherals;
 use crate::pac::{PWR, RCC, SYSCFG};
+use crate::peripherals;
 
 /// Voltage Scale
 ///
diff --git a/embassy-stm32/src/rcc/h7/mod.rs b/embassy-stm32/src/rcc/h7/mod.rs
index 26d9f0bb9..fbf864bf6 100644
--- a/embassy-stm32/src/rcc/h7/mod.rs
+++ b/embassy-stm32/src/rcc/h7/mod.rs
@@ -3,9 +3,9 @@ use core::marker::PhantomData;
 use embassy::util::Unborrow;
 
 use crate::fmt::{assert, panic};
-use crate::pac::peripherals;
 use crate::pac::rcc::vals::Timpre;
 use crate::pac::{DBGMCU, RCC, SYSCFG};
+use crate::peripherals;
 use crate::pwr::{Power, VoltageScale};
 use crate::time::Hertz;
 
diff --git a/embassy-stm32/src/rcc/l0/mod.rs b/embassy-stm32/src/rcc/l0/mod.rs
index 0cf3c2cb7..f911f7fbd 100644
--- a/embassy-stm32/src/rcc/l0/mod.rs
+++ b/embassy-stm32/src/rcc/l0/mod.rs
@@ -1,5 +1,5 @@
 use crate::pac;
-use crate::pac::peripherals::{self, RCC};
+use crate::peripherals::{self, RCC};
 use crate::rcc::{set_freqs, Clocks};
 use crate::time::Hertz;
 use crate::time::U32Ext;
diff --git a/embassy-stm32/src/sdmmc/v2.rs b/embassy-stm32/src/sdmmc/v2.rs
index 8e6f3d43d..e432ca9a3 100644
--- a/embassy-stm32/src/sdmmc/v2.rs
+++ b/embassy-stm32/src/sdmmc/v2.rs
@@ -11,9 +11,9 @@ use futures::future::poll_fn;
 use sdio_host::{BusWidth, CardCapacity, CardStatus, CurrentState, SDStatus, CID, CSD, OCR, SCR};
 
 use crate::fmt::*;
+use crate::interrupt::Interrupt;
 use crate::pac;
 use crate::pac::gpio::Gpio;
-use crate::pac::interrupt::Interrupt;
 use crate::pac::sdmmc::Sdmmc as RegBlock;
 use crate::time::Hertz;
 
@@ -1472,10 +1472,10 @@ where
 macro_rules! impl_sdmmc {
     ($inst:ident) => {
         impl crate::sdmmc::sealed::Instance for peripherals::$inst {
-            type Interrupt = interrupt::$inst;
+            type Interrupt = crate::interrupt::$inst;
 
             fn inner() -> crate::sdmmc::SdmmcInner {
-                const INNER: crate::sdmmc::SdmmcInner = crate::sdmmc::SdmmcInner($inst);
+                const INNER: crate::sdmmc::SdmmcInner = crate::sdmmc::SdmmcInner(crate::pac::$inst);
                 INNER
             }
 
diff --git a/stm32-data b/stm32-data
index c5db875ec..64220ffdb 160000
--- a/stm32-data
+++ b/stm32-data
@@ -1 +1 @@
-Subproject commit c5db875ec2ce8568cfac018ecbdf288fc4b63ba0
+Subproject commit 64220ffdbf55b802f063ab209cdd7a788c95ca57