diff --git a/plat/fvp/aarch64/plat_common.c b/plat/fvp/aarch64/plat_common.c
index dd362f0..338141c 100644
--- a/plat/fvp/aarch64/plat_common.c
+++ b/plat/fvp/aarch64/plat_common.c
@@ -30,7 +30,7 @@
 
 #include <assert.h>
 #include <arch_helpers.h>
-#include "debug.h"
+#include <debug.h>
 #include <platform.h>
 #include <xlat_tables.h>
 
diff --git a/plat/fvp/plat_io_storage.c b/plat/fvp/plat_io_storage.c
index 3c34f15..d44a71d 100644
--- a/plat/fvp/plat_io_storage.c
+++ b/plat/fvp/plat_io_storage.c
@@ -30,14 +30,14 @@
 
 #include <assert.h>
 #include <string.h>
-#include "platform.h"
-#include "io_storage.h"
-#include "io_driver.h"
-#include "io_semihosting.h"
-#include "semihosting.h"	/* For FOPEN_MODE_... */
-#include "io_fip.h"
-#include "io_memmap.h"
-#include "debug.h"
+#include <platform.h>
+#include <io_storage.h>
+#include <io_driver.h>
+#include <io_semihosting.h>
+#include <semihosting.h>	/* For FOPEN_MODE_... */
+#include <io_fip.h>
+#include <io_memmap.h>
+#include <debug.h>
 
 /* IO devices */
 static struct io_plat_data io_data;
diff --git a/plat/fvp/plat_security.c b/plat/fvp/plat_security.c
index a60eca3..042eb81 100644
--- a/plat/fvp/plat_security.c
+++ b/plat/fvp/plat_security.c
@@ -29,9 +29,9 @@
  */
 
 #include <assert.h>
-#include "platform.h"
-#include "tzc400.h"
-#include "debug.h"
+#include <platform.h>
+#include <tzc400.h>
+#include <debug.h>
 
 /* Used to improve readability for configuring regions. */
 #define FILTER_SHIFT(filter)	(1 << filter)
diff --git a/plat/fvp/platform.h b/plat/fvp/platform.h
index 01b995b..2024a9b 100644
--- a/plat/fvp/platform.h
+++ b/plat/fvp/platform.h
@@ -35,7 +35,7 @@
 #include <mmio.h>
 #include <psci.h>
 #include <bl_common.h>
-#include "io_storage.h"
+#include <io_storage.h>
 
 
 /*******************************************************************************