diff --git a/src/bridge/devmem.c b/src/bridge/devmem.c
index ffb2480..5da8a4c 100644
--- a/src/bridge/devmem.c
+++ b/src/bridge/devmem.c
@@ -1,18 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2018,2019 IBM Corp.
 
-#include "ahb.h"
-#include "ast.h"
-#include "bridge.h"
-#include "compiler.h"
-#include "devmem.h"
-#include "log.h"
-#include "mb.h"
-#include "mmio.h"
-#include "rev.h"
-
-#include "ccan/container_of/container_of.h"
-
 #include <assert.h>
 #include <endian.h>
 #include <errno.h>
@@ -24,6 +12,18 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "ccan/container_of/container_of.h"
+
+#include "ahb.h"
+#include "ast.h"
+#include "bridge.h"
+#include "compiler.h"
+#include "devmem.h"
+#include "log.h"
+#include "mb.h"
+#include "mmio.h"
+#include "rev.h"
+
 #define AST_SOC_IO	0x1e600000
 #define AST_SOC_IO_LEN	0x00200000