diff --git a/esp-hal-common/build.rs b/esp-hal-common/build.rs
index 8b142bf9ae1..051ea2cc8af 100644
--- a/esp-hal-common/build.rs
+++ b/esp-hal-common/build.rs
@@ -24,6 +24,8 @@ fn main() {
     //   - 'dac'
     //   - 'gdma'
     //   - 'i2c1'
+    //   - 'i2s'
+    //   - 'mcpwm'
     //   - 'pdma'
     //   - 'rmt'
     //   - 'spi3'
@@ -39,9 +41,11 @@ fn main() {
         vec![
             "esp32",
             "xtensa",
+            "mcpwm",
             "multi_core",
             "dac",
             "i2c1",
+            "i2s",
             "pdma",
             "rmt",
             "spi3",
@@ -56,6 +60,7 @@ fn main() {
             "riscv",
             "single_core",
             "gdma",
+            "i2s",
             "rmt",
             "spi3",
             "systimer",
@@ -69,6 +74,7 @@ fn main() {
             "single_core",
             "dac",
             "i2c1",
+            "i2s",
             "pdma",
             "rmt",
             "spi3",
@@ -83,6 +89,8 @@ fn main() {
             "multi_core",
             "gdma",
             "i2c1",
+            "i2s",
+            "mcpwm",
             "rmt",
             "spi3",
             "systimer",
diff --git a/esp-hal-common/src/lib.rs b/esp-hal-common/src/lib.rs
index 40354fabc16..53971c79d9e 100644
--- a/esp-hal-common/src/lib.rs
+++ b/esp-hal-common/src/lib.rs
@@ -48,7 +48,6 @@ pub use self::{
     timer::Timer,
 };
 
-pub mod sha;
 pub mod analog;
 pub mod clock;
 pub mod delay;
@@ -57,12 +56,10 @@ pub mod dma;
 pub mod embassy;
 pub mod gpio;
 pub mod i2c;
-
-#[cfg(any(esp32c3, esp32s3, esp32, esp32s2))]
+#[cfg(i2s)]
 pub mod i2s;
-
 pub mod ledc;
-#[cfg(any(esp32, esp32s3))]
+#[cfg(mcpwm)]
 pub mod mcpwm;
 #[cfg(usb_otg)]
 pub mod otg_fs;
@@ -73,6 +70,7 @@ pub mod rng;
 pub mod rom;
 pub mod rtc_cntl;
 pub mod serial;
+pub mod sha;
 pub mod spi;
 pub mod system;
 #[cfg(systimer)]