diff --git a/plat/st/stm32mp1/platform.mk b/plat/st/stm32mp1/platform.mk
index 8bb7a80..60852c6 100644
--- a/plat/st/stm32mp1/platform.mk
+++ b/plat/st/stm32mp1/platform.mk
@@ -22,8 +22,6 @@
 $(eval $(call add_define,PLAT_PARTITION_MAX_ENTRIES))
 
 PLAT_INCLUDES		:=	-Iplat/st/stm32mp1/include/
-PLAT_INCLUDES		+=	-Iplat/st/stm32mp1/
-PLAT_INCLUDES		+=	-Iinclude/common/tbbr
 
 # Device tree
 STM32_DTB_FILE_NAME	?=	stm32mp157c-ev1.dtb
diff --git a/plat/st/stm32mp1/stm32mp1_def.h b/plat/st/stm32mp1/stm32mp1_def.h
index fb21acc..15f0432 100644
--- a/plat/st/stm32mp1/stm32mp1_def.h
+++ b/plat/st/stm32mp1/stm32mp1_def.h
@@ -11,6 +11,12 @@
 #include <lib/utils_def.h>
 #include <lib/xlat_tables/xlat_tables_defs.h>
 
+#ifndef __ASSEMBLY__
+#include <boot_api.h>
+#include <stm32mp1_dt.h>
+#include <stm32mp1_private.h>
+#endif
+
 /*******************************************************************************
  * STM32MP1 memory map related constants
  ******************************************************************************/