diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S
index d35b50a..c04bc18 100644
--- a/bl31/aarch64/bl31_entrypoint.S
+++ b/bl31/aarch64/bl31_entrypoint.S
@@ -31,8 +31,8 @@
 #include <bl_common.h>
 #include <platform.h>
 #include <arch.h>
-#include "cm_macros.S"
 #include <asm_macros.S>
+#include <cm_macros.S>
 
 
 	.globl	bl31_entrypoint
diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S
index d00c1d7..b89a768 100644
--- a/bl31/aarch64/runtime_exceptions.S
+++ b/bl31/aarch64/runtime_exceptions.S
@@ -32,8 +32,8 @@
 #include <runtime_svc.h>
 #include <platform.h>
 #include <context.h>
-#include "asm_macros.S"
-#include "cm_macros.S"
+#include <asm_macros.S>
+#include <cm_macros.S>
 
 	.globl	runtime_exceptions
 	.globl	el3_exit