diff --git a/components/bootloader_support/component.mk b/components/bootloader_support/component.mk
index 6db815afff..8907c31ae0 100644
--- a/components/bootloader_support/component.mk
+++ b/components/bootloader_support/component.mk
@@ -1,10 +1,10 @@
 COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := include_priv
 
 ifdef IS_BOOTLOADER_BUILD
-# share "private" headers with the bootloader component
-# eventual goal: all functionality that needs this lives in bootloader_support
-COMPONENT_ADD_INCLUDEDIRS += include_priv
+# share "include_bootloader" headers with bootloader main component
+COMPONENT_ADD_INCLUDEDIRS += include_bootloader
+else
+COMPONENT_PRIV_INCLUDEDIRS := include_bootloader
 endif
 
 COMPONENT_SRCDIRS := src
diff --git a/components/bootloader_support/include_priv/bootloader_config.h b/components/bootloader_support/include_bootloader/bootloader_config.h
similarity index 100%
rename from components/bootloader_support/include_priv/bootloader_config.h
rename to components/bootloader_support/include_bootloader/bootloader_config.h
diff --git a/components/bootloader_support/include_priv/bootloader_flash.h b/components/bootloader_support/include_bootloader/bootloader_flash.h
similarity index 100%
rename from components/bootloader_support/include_priv/bootloader_flash.h
rename to components/bootloader_support/include_bootloader/bootloader_flash.h
diff --git a/components/bootloader_support/include_priv/bootloader_init.h b/components/bootloader_support/include_bootloader/bootloader_init.h
similarity index 100%
rename from components/bootloader_support/include_priv/bootloader_init.h
rename to components/bootloader_support/include_bootloader/bootloader_init.h
diff --git a/components/bootloader_support/include_priv/bootloader_random.h b/components/bootloader_support/include_bootloader/bootloader_random.h
similarity index 100%
rename from components/bootloader_support/include_priv/bootloader_random.h
rename to components/bootloader_support/include_bootloader/bootloader_random.h
diff --git a/components/bootloader_support/include_priv/bootloader_sha.h b/components/bootloader_support/include_bootloader/bootloader_sha.h
similarity index 100%
rename from components/bootloader_support/include_priv/bootloader_sha.h
rename to components/bootloader_support/include_bootloader/bootloader_sha.h
diff --git a/components/bootloader_support/include_priv/bootloader_utility.h b/components/bootloader_support/include_bootloader/bootloader_utility.h
similarity index 100%
rename from components/bootloader_support/include_priv/bootloader_utility.h
rename to components/bootloader_support/include_bootloader/bootloader_utility.h
diff --git a/components/bootloader_support/include_priv/flash_qio_mode.h b/components/bootloader_support/include_bootloader/flash_qio_mode.h
similarity index 100%
rename from components/bootloader_support/include_priv/flash_qio_mode.h
rename to components/bootloader_support/include_bootloader/flash_qio_mode.h