diff --git a/drivers/arm/gic/v3/gic600_multichip.c b/drivers/arm/gic/v3/gic600_multichip.c
index c62c3f5dd404c1a30c8fa40afbac7d181ff4bcac..ca7c43bf9cbf53d171e6a2ddb9c485465ca01bcc 100644
--- a/drivers/arm/gic/v3/gic600_multichip.c
+++ b/drivers/arm/gic/v3/gic600_multichip.c
@@ -9,13 +9,13 @@
  */
 
 #include <assert.h>
-#include <common/debug.h>
 
-#include <drivers/arm/gicv3.h>
+#include <common/debug.h>
 #include <drivers/arm/gic600_multichip.h>
+#include <drivers/arm/gicv3.h>
 
-#include "gic600_multichip_private.h"
 #include "../common/gic_common_private.h"
+#include "gic600_multichip_private.h"
 
 #warning "GIC-600 Multichip driver is currently experimental and the API may change in future."
 
diff --git a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c
index 4f158ee4d9d4c9b050a384ac4839631d6fb86498..b150b895998bfba1595d32c7aabdd210089e490e 100644
--- a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c
+++ b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c
@@ -6,11 +6,11 @@
 
 #include <platform_def.h>
 
+#include <common/debug.h>
 #include <drivers/arm/css/css_mhu_doorbell.h>
 #include <drivers/arm/css/scmi.h>
 #include <drivers/arm/css/sds.h>
 #include <drivers/arm/gic600_multichip.h>
-#include <common/debug.h>
 #include <lib/mmio.h>
 #include <lib/utils.h>
 #include <plat/arm/common/plat_arm.h>