diff --git a/dependencies.lock b/dependencies.lock
index a9723d1e..82f1a488 100644
--- a/dependencies.lock
+++ b/dependencies.lock
@@ -3,7 +3,7 @@ dependencies:
     component_hash: null
     source:
       type: idf
-    version: 5.1.1
-manifest_hash: b9761e0028130d307b778c710e5dd39fb3c942d8084ed429d448d938957fb0e6
+    version: 5.2.1
+manifest_hash: 9e4320e6f25503854c6c93bcbfa9b80f780485bcf066bdbad31a820544492538
 target: esp32
 version: 1.0.0
diff --git a/lib/esp-idf b/lib/esp-idf
index b6a66b7d..a322e6bd 160000
--- a/lib/esp-idf
+++ b/lib/esp-idf
@@ -1 +1 @@
-Subproject commit b6a66b7d8c6295765da3cd8df4cef93359f16363
+Subproject commit a322e6bdad4b6675d4597fb2722eea2851ba88cb
diff --git a/lib/libtags/CMakeLists.txt b/lib/libtags/CMakeLists.txt
index 9d9377b7..d8dce988 100644
--- a/lib/libtags/CMakeLists.txt
+++ b/lib/libtags/CMakeLists.txt
@@ -3,3 +3,4 @@ idf_component_register(
   s3m.c tags.c utf16.c vorbis.c wav.c xm.c
   INCLUDE_DIRS .
 )
+target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-array-bounds)
diff --git a/src/audio/audio_converter.cpp b/src/audio/audio_converter.cpp
index 015be6a3..eb1cde80 100644
--- a/src/audio/audio_converter.cpp
+++ b/src/audio/audio_converter.cpp
@@ -19,7 +19,6 @@
 #include "freertos/portmacro.h"
 #include "freertos/projdefs.h"
 #include "i2s_dac.hpp"
-#include "idf_additions.h"
 
 #include "resample.hpp"
 #include "sample.hpp"
diff --git a/src/audio/audio_fsm.cpp b/src/audio/audio_fsm.cpp
index 07737872..424b0eff 100644
--- a/src/audio/audio_fsm.cpp
+++ b/src/audio/audio_fsm.cpp
@@ -31,7 +31,6 @@
 #include "future_fetcher.hpp"
 #include "i2s_audio_output.hpp"
 #include "i2s_dac.hpp"
-#include "idf_additions.h"
 #include "nvs.hpp"
 #include "sample.hpp"
 #include "service_locator.hpp"
diff --git a/src/audio/fatfs_audio_input.cpp b/src/audio/fatfs_audio_input.cpp
index 74c1154b..29d32390 100644
--- a/src/audio/fatfs_audio_input.cpp
+++ b/src/audio/fatfs_audio_input.cpp
@@ -22,7 +22,6 @@
 #include "ff.h"
 #include "freertos/portmacro.h"
 #include "freertos/projdefs.h"
-#include "idf_additions.h"
 #include "readahead_source.hpp"
 #include "span.hpp"
 
diff --git a/src/audio/include/audio_sink.hpp b/src/audio/include/audio_sink.hpp
index 85c23f5c..e11f3ce0 100644
--- a/src/audio/include/audio_sink.hpp
+++ b/src/audio/include/audio_sink.hpp
@@ -11,7 +11,6 @@
 
 #include "esp_heap_caps.h"
 #include "freertos/FreeRTOS.h"
-#include "idf_additions.h"
 
 namespace audio {
 
diff --git a/src/audio/readahead_source.cpp b/src/audio/readahead_source.cpp
index c7b960d2..fe7ac3bd 100644
--- a/src/audio/readahead_source.cpp
+++ b/src/audio/readahead_source.cpp
@@ -17,7 +17,6 @@
 #include "audio_source.hpp"
 #include "codec.hpp"
 #include "freertos/portmacro.h"
-#include "idf_additions.h"
 #include "spi.hpp"
 #include "tasks.hpp"
 #include "types.hpp"
diff --git a/src/drivers/include/haptics.hpp b/src/drivers/include/haptics.hpp
index dfafa2eb..6cfcbb0d 100644
--- a/src/drivers/include/haptics.hpp
+++ b/src/drivers/include/haptics.hpp
@@ -6,10 +6,11 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <initializer_list>
 #include <mutex>
 #include <optional>
+#include <string>
 
 namespace drivers {
 
diff --git a/src/main/main.cpp b/src/main/main.cpp
index ddd9cad0..cf27b132 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
+#include "freertos/FreeRTOS.h"
 #include "freertos/portmacro.h"
 
 #include "i2c.hpp"
diff --git a/tools/cmake/common.cmake b/tools/cmake/common.cmake
index 31d9c8de..65c374ce 100644
--- a/tools/cmake/common.cmake
+++ b/tools/cmake/common.cmake
@@ -45,7 +45,8 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 set(EXTRA_WARNINGS "-Wshadow" "-Wnon-virtual-dtor" "-Wunused"
   "-Woverloaded-virtual" "-Wmisleading-indentation" "-Wduplicated-cond"
   "-Wduplicated-branches" "-Wlogical-op" "-Wnull-dereference"
-  "-Wdouble-promotion" "-Wformat=2" "-Wimplicit-fallthrough")
+  "-Wdouble-promotion" "-Wformat=2" "-Wimplicit-fallthrough"
+  "-Wno-deprecated-enum-enum-conversion" "-Wno-array-bounds")
 
 # Extra build flags that should apply to the entire build. This should mostly
 # just be used to setting flags that our external dependencies requires.