diff --git a/.clang-tidy b/.clang-tidy
index 946f2950d8..af31b40103 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -85,6 +85,8 @@ Checks: >-
   -readability-redundant-string-init,
   -readability-uppercase-literal-suffix,
   -readability-use-anyofallof,
+  -readability-named-parameter,
+  -readability-braces-around-statements,
 WarningsAsErrors: '*'
 AnalyzeTemporaryDtors: false
 FormatStyle:     google
diff --git a/esphome/components/zephyr/core.cpp b/esphome/components/zephyr/core.cpp
index 3f44ecdb4b..72ae1d668b 100644
--- a/esphome/components/zephyr/core.cpp
+++ b/esphome/components/zephyr/core.cpp
@@ -3,6 +3,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/sys/reboot.h>
+#include "esphome/core/hal.h"
 
 namespace esphome {
 
diff --git a/esphome/core/optional.h b/esphome/core/optional.h
index 5b96781e63..770b77081e 100644
--- a/esphome/core/optional.h
+++ b/esphome/core/optional.h
@@ -104,7 +104,6 @@ template<typename T> class optional {  // NOLINT
     has_value_ = true;
   }
 
- private:
   bool has_value_{false};  // NOLINT
   value_type value_;       // NOLINT
 };
diff --git a/script/helpers.py b/script/helpers.py
index 27be1aa35d..29377cf65e 100644
--- a/script/helpers.py
+++ b/script/helpers.py
@@ -218,7 +218,7 @@ int main() { return 0;}
                 r"(-O[0-3s]|-g|-std=[^\s]+|-Wall|-Wextra|-Werror|--[^\s]+|-f[^\s]+|-m[^\s]+|-imacros\s*[^\s]+)"
             )
             for match in flag_pattern.findall(command):
-                flags.append(match)
+                flags.append(match.replace("-imacros ", "-imacros"))
             return flags
 
         def transform_to_idedata_format(compile_commands):