diff --git a/src/task.rs b/src/task.rs
index 252dfa64f..68e47264a 100644
--- a/src/task.rs
+++ b/src/task.rs
@@ -524,13 +524,6 @@ impl<'a> Drop for CriticalSectionGuard<'a> {
     }
 }
 
-#[cfg(any(
-    all(
-        not(any(esp_idf_version_major = "4", esp_idf_version = "5.0")),
-        esp_idf_esp_task_wdt_en
-    ),
-    any(esp_idf_version_major = "4", esp_idf_version = "5.0")
-))]
 pub mod watchdog {
     //! ## Example
     //!
diff --git a/src/uart.rs b/src/uart.rs
index 3b16ba6a0..b9c29ea89 100644
--- a/src/uart.rs
+++ b/src/uart.rs
@@ -217,6 +217,7 @@ pub mod config {
         #[cfg(esp_idf_soc_uart_support_xtal_clk)]
         Crystal,
         /// UART source clock from `XTAL`
+        #[allow(non_camel_case_types)]
         #[cfg(esp_idf_soc_uart_support_pll_f80m_clk)]
         PLL_F80M,
         /// UART source clock from `REF_TICK`
diff --git a/src/ulp.rs b/src/ulp.rs
index f838894ab..c808356ac 100644
--- a/src/ulp.rs
+++ b/src/ulp.rs
@@ -21,15 +21,13 @@ impl Default for SleepTimer {
         esp_idf_ulp_coproc_enabled,
         esp_idf_ulp_coproc_type_fsm
     ),
-    all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled),
+    all(esp32, esp_idf_esp32_ulp_coproc_enabled),
     all(
-        esp_idf_version_major = "4",
         esp32s2,
         esp_idf_esp32s2_ulp_coproc_enabled,
         not(esp_idf_esp32s2_ulp_coproc_riscv)
     ),
     all(
-        esp_idf_version_major = "4",
         esp32s3,
         esp_idf_esp32s3_ulp_coproc_enabled,
         not(esp_idf_esp32s3_ulp_coproc_riscv)
@@ -47,15 +45,13 @@ pub struct Word {
         esp_idf_ulp_coproc_enabled,
         esp_idf_ulp_coproc_type_fsm
     ),
-    all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled),
+    all(esp32, esp_idf_esp32_ulp_coproc_enabled),
     all(
-        esp_idf_version_major = "4",
         esp32s2,
         esp_idf_esp32s2_ulp_coproc_enabled,
         not(esp_idf_esp32s2_ulp_coproc_riscv)
     ),
     all(
-        esp_idf_version_major = "4",
         esp32s3,
         esp_idf_esp32s3_ulp_coproc_enabled,
         not(esp_idf_esp32s3_ulp_coproc_riscv)
@@ -77,49 +73,25 @@ impl Word {
 
 #[cfg(any(
     all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled),
-    all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled),
-    all(
-        esp_idf_version_major = "4",
-        esp32s2,
-        esp_idf_esp32s2_ulp_coproc_enabled
-    ),
-    all(
-        esp_idf_version_major = "4",
-        esp32s3,
-        esp_idf_esp32s3_ulp_coproc_enabled
-    )
+    all(esp32, esp_idf_esp32_ulp_coproc_enabled),
+    all(esp32s2, esp_idf_esp32s2_ulp_coproc_enabled),
+    all(esp32s3, esp_idf_esp32s3_ulp_coproc_enabled)
 ))]
 pub struct UlpDriver<'d>(crate::peripheral::PeripheralRef<'d, ULP>);
 
 #[cfg(any(
     all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled),
-    all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled),
-    all(
-        esp_idf_version_major = "4",
-        esp32s2,
-        esp_idf_esp32s2_ulp_coproc_enabled
-    ),
-    all(
-        esp_idf_version_major = "4",
-        esp32s3,
-        esp_idf_esp32s3_ulp_coproc_enabled
-    )
+    all(esp32, esp_idf_esp32_ulp_coproc_enabled),
+    all(esp32s2, esp_idf_esp32s2_ulp_coproc_enabled),
+    all(esp32s3, esp_idf_esp32s3_ulp_coproc_enabled)
 ))]
 unsafe impl<'d> Send for UlpDriver<'d> {}
 
 #[cfg(any(
     all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled),
-    all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled),
-    all(
-        esp_idf_version_major = "4",
-        esp32s2,
-        esp_idf_esp32s2_ulp_coproc_enabled
-    ),
-    all(
-        esp_idf_version_major = "4",
-        esp32s3,
-        esp_idf_esp32s3_ulp_coproc_enabled
-    )
+    all(esp32, esp_idf_esp32_ulp_coproc_enabled),
+    all(esp32s2, esp_idf_esp32s2_ulp_coproc_enabled),
+    all(esp32s3, esp_idf_esp32s3_ulp_coproc_enabled)
 ))]
 impl<'d> UlpDriver<'d> {
     pub fn new(
@@ -196,15 +168,13 @@ impl<'d> UlpDriver<'d> {
         esp_idf_ulp_coproc_enabled,
         esp_idf_ulp_coproc_type_fsm
     ),
-    all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled),
+    all(esp32, esp_idf_esp32_ulp_coproc_enabled),
     all(
-        esp_idf_version_major = "4",
         esp32s2,
         esp_idf_esp32s2_ulp_coproc_enabled,
         not(esp_idf_esp32s2_ulp_coproc_riscv)
     ),
     all(
-        esp_idf_version_major = "4",
         esp32s3,
         esp_idf_esp32s3_ulp_coproc_enabled,
         not(esp_idf_esp32s3_ulp_coproc_riscv)
@@ -305,17 +275,15 @@ impl<'d> UlpDriver<'d> {
         not(esp_idf_ulp_coproc_type_fsm)
     ),
     all(
-        esp_idf_version_major = "4",
         esp32s2,
         esp_idf_esp32s2_ulp_coproc_enabled,
         esp_idf_esp32s2_ulp_coproc_riscv
     ),
     all(
-        esp_idf_version_major = "4",
         esp32s3,
         esp_idf_esp32s3_ulp_coproc_enabled,
         esp_idf_esp32s3_ulp_coproc_riscv
-    )
+    ),
 ))]
 impl<'d> UlpDriver<'d> {
     pub unsafe fn load(&mut self, program: &[u8]) -> Result<(), esp_idf_sys::EspError> {
@@ -364,17 +332,9 @@ crate::impl_peripheral!(ULP);
 
 #[cfg(any(
     all(not(esp_idf_version_major = "4"), esp_idf_ulp_coproc_enabled),
-    all(esp_idf_version_major = "4", esp32, esp_idf_esp32_ulp_coproc_enabled),
-    all(
-        esp_idf_version_major = "4",
-        esp32s2,
-        esp_idf_esp32s2_ulp_coproc_enabled
-    ),
-    all(
-        esp_idf_version_major = "4",
-        esp32s3,
-        esp_idf_esp32s3_ulp_coproc_enabled
-    )
+    all(esp32, esp_idf_esp32_ulp_coproc_enabled),
+    all(esp32s2, esp_idf_esp32s2_ulp_coproc_enabled),
+    all(esp32s3, esp_idf_esp32s3_ulp_coproc_enabled)
 ))]
 impl ULP {
     const RTC_SLOW_MEM: u32 = 0x5000_0000_u32;