diff --git a/components/bootloader/Makefile.projbuild b/components/bootloader/Makefile.projbuild
index cf8b05673f..d45cf144e7 100644
--- a/components/bootloader/Makefile.projbuild
+++ b/components/bootloader/Makefile.projbuild
@@ -45,4 +45,7 @@ $(COMPONENT_PATH)/src/sdkconfig: $(PROJECT_PATH)/sdkconfig
 bootloader-flash: $(BOOTLOADER_BIN)
 	$(MAKE) -C $(BOOTLOADER_COMPONENT_PATH)/src flash MAKEFLAGS= V=$(V)
 
+else
+CFLAGS += -D BOOTLOADER_BUILD=1 -I $(IDF_PATH)/components/esp32/include 
+
 endif
diff --git a/components/bootloader/src/Makefile b/components/bootloader/src/Makefile
index 065593ccbf..f30e314a5f 100644
--- a/components/bootloader/src/Makefile
+++ b/components/bootloader/src/Makefile
@@ -11,7 +11,7 @@ COMPONENTS := esptool_py bootloader log
 # IS_BOOTLOADER_BUILD tells the component Makefile.projbuild to be a no-op
 IS_BOOTLOADER_BUILD := 1
 
-#We cannot include the esp32 component directly but we need its includes. This is fixed by
-EXTRA_CFLAGS := -D BOOTLOADER_BUILD=1 -I $(IDF_PATH)/components/esp32/include 
+#We cannot include the esp32 component directly but we need its includes. 
+#This is fixed by adding CFLAGS from Makefile.projbuild
 
 include $(IDF_PATH)/make/project.mk
diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c
index 4bf812238a..cb31fbd462 100644
--- a/components/esp32/cpu_start.c
+++ b/components/esp32/cpu_start.c
@@ -67,7 +67,7 @@ static bool app_cpu_started = false;
 void IRAM_ATTR call_user_start_cpu0()
 {
     //Kill wdt
-    REG_CLR_BIT(RTC_WDTCONFIG0, RTC_CNTL_WDT_FLASHBOOT_MOD_EN);
+    REG_CLR_BIT(RTC_CNTL_WDTCONFIG0_REG, RTC_CNTL_WDT_FLASHBOOT_MOD_EN);
     REG_CLR_BIT(0x6001f048, BIT(14)); //DR_REG_BB_BASE+48
 
     cpu_configure_region_protection();