diff --git a/bl31/aarch64/crash_reporting.S b/bl31/aarch64/crash_reporting.S
index cb9110b5fa72ac9135833b8f6b554db8c2150a16..69b7a1c81c8a64386be1075abb25a15caff50126 100644
--- a/bl31/aarch64/crash_reporting.S
+++ b/bl31/aarch64/crash_reporting.S
@@ -31,6 +31,7 @@
 #include <asm_macros.S>
 #include <context.h>
 #include <plat_macros.S>
+#include <platform_def.h>
 
 	.globl	get_crash_stack
 	.globl	dump_state_and_die
diff --git a/plat/juno/aarch64/bl1_plat_helpers.S b/plat/juno/aarch64/bl1_plat_helpers.S
index 16f18a2a2f1bb4acae96e7ae31362076b9d11fe2..785aa15adb4a155f9d74706eab121c3f8a9a19c0 100644
--- a/plat/juno/aarch64/bl1_plat_helpers.S
+++ b/plat/juno/aarch64/bl1_plat_helpers.S
@@ -30,7 +30,7 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#include <platform.h>
+#include "../juno_def.h"
 
 	.globl	platform_get_entrypoint
 	.globl	platform_cold_boot_init
diff --git a/plat/juno/aarch64/plat_common.c b/plat/juno/aarch64/plat_common.c
index 5319fe36edf10200e4d0589d19d90e17e098a62f..b1078d84b9b91a770cafec2fdeecb0f34f416c12 100644
--- a/plat/juno/aarch64/plat_common.c
+++ b/plat/juno/aarch64/plat_common.c
@@ -33,6 +33,7 @@
 #include <bl_common.h>
 #include <mmio.h>
 #include <platform.h>
+#include <platform_def.h>
 #include <xlat_tables.h>
 
 
diff --git a/plat/juno/aarch64/plat_helpers.S b/plat/juno/aarch64/plat_helpers.S
index 9297a607bb0132112b1bdb076dbf7ceeafe7fbbc..e06488e74db2903bf4de922a38e41251055a7185 100644
--- a/plat/juno/aarch64/plat_helpers.S
+++ b/plat/juno/aarch64/plat_helpers.S
@@ -31,7 +31,8 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <bl_common.h>
-#include <platform.h>
+#include <platform_def.h>
+#include "../juno_def.h"
 
 	.globl	plat_report_exception
 	.globl	platform_mem_init
diff --git a/plat/juno/bl1_plat_setup.c b/plat/juno/bl1_plat_setup.c
index badfae4ee5193bca8a5f88038d7a596689cefc25..9f9583d64ff48bf20a54feab3383941e9509b96d 100644
--- a/plat/juno/bl1_plat_setup.c
+++ b/plat/juno/bl1_plat_setup.c
@@ -31,12 +31,14 @@
 #include <arch_helpers.h>
 #include <assert.h>
 #include <bl_common.h>
-#include <bl1.h>
 #include <cci400.h>
 #include <console.h>
 #include <mmio.h>
 #include <platform.h>
+#include <platform_def.h>
 #include <tzc400.h>
+#include "juno_def.h"
+#include "juno_private.h"
 
 /*******************************************************************************
  * Declarations of linker defined symbols which will help us find the layout
diff --git a/plat/juno/bl2_plat_setup.c b/plat/juno/bl2_plat_setup.c
index 8ce09c9cd80b6486061bd2189e3097ef7eb028d9..563f05b372387b70646ad1d54ddc144afa1434d4 100644
--- a/plat/juno/bl2_plat_setup.c
+++ b/plat/juno/bl2_plat_setup.c
@@ -31,12 +31,14 @@
 #include <arch_helpers.h>
 #include <assert.h>
 #include <bl_common.h>
-#include <bl2.h>
 #include <console.h>
 #include <debug.h>
 #include <platform.h>
-#include <scp_bootloader.h>
+#include <platform_def.h>
 #include <string.h>
+#include "juno_def.h"
+#include "juno_private.h"
+#include "scp_bootloader.h"
 
 /*******************************************************************************
  * Declarations of linker defined symbols which will help us find the layout
diff --git a/plat/juno/bl31_plat_setup.c b/plat/juno/bl31_plat_setup.c
index 71861d331134a9cdda1ad0fd717b787591e0f190..008476b6590abd763104c4d5793357634ee7a06e 100644
--- a/plat/juno/bl31_plat_setup.c
+++ b/plat/juno/bl31_plat_setup.c
@@ -33,10 +33,12 @@
 #include <bl31.h>
 #include <bl_common.h>
 #include <console.h>
-#include <mhu.h>
 #include <mmio.h>
 #include <platform.h>
 #include <stddef.h>
+#include "juno_def.h"
+#include "juno_private.h"
+#include "mhu.h"
 
 /*******************************************************************************
  * Declarations of linker defined symbols which will help us find the layout
diff --git a/plat/juno/bl32_plat_setup.c b/plat/juno/bl32_plat_setup.c
index cb76da396dde096dc256eb294191eb551e0efb73..d154add931e2ab147b892f99468fdbd7a8c05ec1 100644
--- a/plat/juno/bl32_plat_setup.c
+++ b/plat/juno/bl32_plat_setup.c
@@ -28,11 +28,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <arch_helpers.h>
 #include <bl_common.h>
-#include <bl32.h>
 #include <console.h>
 #include <platform.h>
+#include "juno_def.h"
+#include "juno_private.h"
 
 /*******************************************************************************
  * Declarations of linker defined symbols which will help us find the layout
diff --git a/plat/juno/mhu.c b/plat/juno/mhu.c
index 7ead09d364be40fe26bb6b070f32e4f8a7e0ae89..4ab407f7b58b190f7a5cc10066cbd902f5d2f882 100644
--- a/plat/juno/mhu.c
+++ b/plat/juno/mhu.c
@@ -30,8 +30,9 @@
 
 #include <arch_helpers.h>
 #include <bakery_lock.h>
-#include <mhu.h>
 #include <mmio.h>
+#include "juno_def.h"
+#include "mhu.h"
 
 /* SCP MHU secure channel registers */
 #define SCP_INTR_S_STAT		0x200
diff --git a/plat/juno/plat_gic.c b/plat/juno/plat_gic.c
index 7758b7625cdc05bcb9ebde5169fa3551888ea0c2..2de6a5c3506b1293dea99e0a76da410e77cb48c5 100644
--- a/plat/juno/plat_gic.c
+++ b/plat/juno/plat_gic.c
@@ -34,6 +34,8 @@
 #include <gic_v2.h>
 #include <interrupt_mgmt.h>
 #include <platform.h>
+#include "juno_def.h"
+#include "juno_private.h"
 
 
 /* Value used to initialise Non-Secure irq priorities four at a time */
diff --git a/plat/juno/plat_io_storage.c b/plat/juno/plat_io_storage.c
index c16a48713e53037478784cc0735107bc90d2da0c..16259afe126e04a381dbd53f2950b959afdb9995 100644
--- a/plat/juno/plat_io_storage.c
+++ b/plat/juno/plat_io_storage.c
@@ -37,6 +37,7 @@
 #include <io_fip.h>
 #include <io_memmap.h>
 #include <debug.h>
+#include "juno_def.h"
 
 /* IO devices */
 static io_plat_data_t io_data;
diff --git a/plat/juno/plat_pm.c b/plat/juno/plat_pm.c
index 87b9d8cff54f21b06e82ba858eaebaaae4a4b87d..6c2ec232a60908c06425a28af95197198e9591bb 100644
--- a/plat/juno/plat_pm.c
+++ b/plat/juno/plat_pm.c
@@ -31,8 +31,11 @@
 #include <arch_helpers.h>
 #include <cci400.h>
 #include <platform.h>
+#include <platform_def.h>
 #include <psci.h>
-#include <scpi.h>
+#include "juno_def.h"
+#include "juno_private.h"
+#include "scpi.h"
 
 int pm_on(unsigned long mpidr,
 		   unsigned long sec_entrypoint,
diff --git a/plat/juno/plat_topology.c b/plat/juno/plat_topology.c
index 4bc58ba7e2560e66eabd15774373ec3574e7330b..39d4dabc652f6cfcfd9f1bafc71a6f86be1cb4b0 100644
--- a/plat/juno/plat_topology.c
+++ b/plat/juno/plat_topology.c
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <platform.h>
+#include <platform_def.h>
 #include <psci.h>
 
 unsigned int plat_get_aff_count(unsigned int aff_lvl, unsigned long mpidr)
diff --git a/plat/juno/scp_bootloader.c b/plat/juno/scp_bootloader.c
index 9d0e608ab6ee4ae88ca9561c4dfde8888d2944b5..a6d25d49bf956f8ce1390a402559e396125bfb88 100644
--- a/plat/juno/scp_bootloader.c
+++ b/plat/juno/scp_bootloader.c
@@ -29,10 +29,11 @@
  */
 
 #include <arch_helpers.h>
-#include <mhu.h>
 #include <platform.h>
-#include <scp_bootloader.h>
-#include <scpi.h>
+#include "juno_def.h"
+#include "mhu.h"
+#include "scp_bootloader.h"
+#include "scpi.h"
 
 /* Boot commands sent from AP -> SCP */
 #define BOOT_CMD_START	0x01
diff --git a/plat/juno/scpi.c b/plat/juno/scpi.c
index 6b7d9a7da980ac923893aee7f12ca5ee52b99d25..6af13baba4b426d018d6b17d8ffeb282d0a5c622 100644
--- a/plat/juno/scpi.c
+++ b/plat/juno/scpi.c
@@ -29,9 +29,10 @@
  */
 
 #include <arch_helpers.h>
-#include <mhu.h>
 #include <platform.h>
-#include <scpi.h>
+#include "juno_def.h"
+#include "mhu.h"
+#include "scpi.h"
 
 #define MHU_SECURE_SCP_TO_AP_PAYLOAD	(MHU_SECURE_BASE+0x0080)
 #define MHU_SECURE_AP_TO_SCP_PAYLOAD	(MHU_SECURE_BASE+0x0280)