diff --git a/src/abg-corpus-priv.h b/src/abg-corpus-priv.h
index e65f7c8f..2b42007b 100644
--- a/src/abg-corpus-priv.h
+++ b/src/abg-corpus-priv.h
@@ -29,9 +29,9 @@
 #ifndef __ABG_CORPUS_PRIV_H__
 #define __ABG_CORPUS_PRIV_H__
 
-#include "abg-sptr-utils.h"
-#include "abg-regex.h"
 #include "abg-internal.h"
+#include "abg-regex.h"
+#include "abg-sptr-utils.h"
 
 namespace abigail
 {
diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc
index d9cb158c..9e90b994 100644
--- a/src/abg-corpus.cc
+++ b/src/abg-corpus.cc
@@ -21,23 +21,25 @@
 /// @file
 
 #include "config.h"
+
+#include <algorithm>
+#include <cassert>
 #include <cstdio>
 #include <cstring>
-#include <cassert>
 #include <stdexcept>
-#include <algorithm>
 
 #include "abg-cxx-compat.h"
 #include "abg-internal.h"
+
 // <headers defining libabigail's API go under here>
 ABG_BEGIN_EXPORT_DECLARATIONS
 
-#include "abg-sptr-utils.h"
-#include "abg-ir.h"
 #include "abg-corpus.h"
+#include "abg-ir.h"
 #include "abg-reader.h"
-#include "abg-writer.h"
+#include "abg-sptr-utils.h"
 #include "abg-tools-utils.h"
+#include "abg-writer.h"
 
 #if WITH_ZIP_ARCHIVE
 #include "abg-libzip-utils.h"
diff --git a/src/abg-regex.cc b/src/abg-regex.cc
index 79a89033..cf0663a2 100644
--- a/src/abg-regex.cc
+++ b/src/abg-regex.cc
@@ -24,8 +24,9 @@
 ///
 
 #include <sstream>
-#include "abg-sptr-utils.h"
+
 #include "abg-regex.h"
+#include "abg-sptr-utils.h"
 
 namespace abigail
 {
diff --git a/src/abg-suppression-priv.h b/src/abg-suppression-priv.h
index c37ceff6..0ccfde05 100644
--- a/src/abg-suppression-priv.h
+++ b/src/abg-suppression-priv.h
@@ -29,9 +29,9 @@
 #define __ABG_SUPPRESSION_PRIV_H__
 
 #include "abg-fwd.h"
-#include "abg-suppression.h"
-#include "abg-sptr-utils.h"
 #include "abg-regex.h"
+#include "abg-sptr-utils.h"
+#include "abg-suppression.h"
 
 namespace abigail
 {
diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc
index 34eb9616..8b5712fb 100644
--- a/src/abg-suppression.cc
+++ b/src/abg-suppression.cc
@@ -26,6 +26,7 @@
 /// libabigail.
 
 #include <algorithm>
+
 #include "abg-cxx-compat.h"
 #include "abg-internal.h"