diff --git a/plat/fvp/aarch64/bl1_plat_helpers.S b/plat/fvp/aarch64/bl1_plat_helpers.S
index 69fb14b..64f230d 100644
--- a/plat/fvp/aarch64/bl1_plat_helpers.S
+++ b/plat/fvp/aarch64/bl1_plat_helpers.S
@@ -30,7 +30,7 @@
 
 #include <arch.h>
 #include <platform.h>
-#include <gic.h>
+#include <gic_v2.h>
 #include <asm_macros.S>
 #include "../drivers/pwrc/fvp_pwrc.h"
 
diff --git a/plat/fvp/plat_gic.c b/plat/fvp/plat_gic.c
index 8929172..be892ac 100644
--- a/plat/fvp/plat_gic.c
+++ b/plat/fvp/plat_gic.c
@@ -31,7 +31,8 @@
 #include <stdint.h>
 #include <arch_helpers.h>
 #include <platform.h>
-#include <gic.h>
+#include <gic_v2.h>
+#include <gic_v3.h>
 #include <debug.h>
 
 
diff --git a/plat/fvp/plat_pm.c b/plat/fvp/plat_pm.c
index 2a414c9..4359638 100644
--- a/plat/fvp/plat_pm.c
+++ b/plat/fvp/plat_pm.c
@@ -38,7 +38,7 @@
 #include <bl31.h>
 #include <bakery_lock.h>
 #include <cci400.h>
-#include <gic.h>
+#include <gic_v2.h>
 /* Only included for error codes */
 #include <psci.h>
 #include "drivers/pwrc/fvp_pwrc.h"