From a5cef637ae9baaca3dfc1cad110dba58b44696d0 Mon Sep 17 00:00:00 2001
From: "Tom A. Wagner" <tom.a.wagner@protonmail.com>
Date: Thu, 23 Jul 2026 13:14:45 +0200
Subject: [PATCH] fix(esp_https_ota): Add missing requirement to
 `bootloader_support` component

The `esp_https_ota.h` header includes `bootloader_common.h` from the
`bootloader_support` component, but the components CMakeLists.txt does not
depend on the `bootloader_support` component.
This causes compilation to fail when the header is included, unless the
component that the header belongs already depends on `bootloader_support`.

As the header is only needed in the `esp_https_ota.c` source file,
add a `PRIV_REQUIRES` for `bootloader_support` and move the include into the
.c file.
---
 components/esp_https_ota/CMakeLists.txt          | 2 +-
 components/esp_https_ota/include/esp_https_ota.h | 1 -
 components/esp_https_ota/src/esp_https_ota.c     | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/esp_https_ota/CMakeLists.txt b/components/esp_https_ota/CMakeLists.txt
index b65b8f7963d..4bddeec5c21 100644
--- a/components/esp_https_ota/CMakeLists.txt
+++ b/components/esp_https_ota/CMakeLists.txt
@@ -8,6 +8,6 @@ idf_component_register(SRCS "src/esp_https_ota.c"
                     INCLUDE_DIRS "include"
                     REQUIRES esp_http_client esp_bootloader_format esp_app_format
                              esp_event esp_partition
-                    PRIV_REQUIRES log app_update efuse)
+                    PRIV_REQUIRES log app_update bootloader_support efuse)
 
 idf_define_esp_err_codes(HEADERS include/esp_https_ota.h)
diff --git a/components/esp_https_ota/include/esp_https_ota.h b/components/esp_https_ota/include/esp_https_ota.h
index 7fc150cadaf..49d8996c9b7 100644
--- a/components/esp_https_ota/include/esp_https_ota.h
+++ b/components/esp_https_ota/include/esp_https_ota.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <esp_http_client.h>
-#include <bootloader_common.h>
 #include "esp_app_desc.h"
 #include "esp_bootloader_desc.h"
 #include <sdkconfig.h>
diff --git a/components/esp_https_ota/src/esp_https_ota.c b/components/esp_https_ota/src/esp_https_ota.c
index 5f2a017b986..a283f0fe8ce 100644
--- a/components/esp_https_ota/src/esp_https_ota.c
+++ b/components/esp_https_ota/src/esp_https_ota.c
@@ -7,6 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <bootloader_common.h>
 #include <esp_https_ota.h>
 #include <esp_log.h>
 #include <esp_ota_ops.h>