diff --git a/test/chip.cpp b/test/chip.cpp
index aa3979f..cf1f76d 100644
--- a/test/chip.cpp
+++ b/test/chip.cpp
@@ -1,15 +1,18 @@
+#include <fcntl.h>
+#include <linux/gpio.h>
+
+#include <gpioplus/chip.hpp>
+#include <gpioplus/test/sys.hpp>
+
 #include <cerrno>
 #include <cstdint>
 #include <cstring>
-#include <fcntl.h>
-#include <gmock/gmock.h>
-#include <gpioplus/chip.hpp>
-#include <gpioplus/test/sys.hpp>
-#include <gtest/gtest.h>
-#include <linux/gpio.h>
 #include <memory>
 #include <system_error>
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 namespace gpioplus
 {
 namespace
diff --git a/test/event.cpp b/test/event.cpp
index 3676804..f245747 100644
--- a/test/event.cpp
+++ b/test/event.cpp
@@ -1,16 +1,19 @@
-#include <cerrno>
-#include <cstring>
-#include <gmock/gmock.h>
+#include <linux/gpio.h>
+
 #include <gpioplus/event.hpp>
 #include <gpioplus/test/sys.hpp>
-#include <gtest/gtest.h>
-#include <linux/gpio.h>
+
+#include <cerrno>
+#include <cstring>
 #include <memory>
 #include <optional>
 #include <stdexcept>
 #include <string>
 #include <system_error>
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 namespace gpioplus
 {
 namespace
diff --git a/test/handle.cpp b/test/handle.cpp
index 6370c30..3b24312 100644
--- a/test/handle.cpp
+++ b/test/handle.cpp
@@ -1,16 +1,19 @@
-#include <cerrno>
-#include <cstdint>
-#include <gmock/gmock.h>
+#include <linux/gpio.h>
+
 #include <gpioplus/handle.hpp>
 #include <gpioplus/test/sys.hpp>
-#include <gtest/gtest.h>
-#include <linux/gpio.h>
+
+#include <cerrno>
+#include <cstdint>
 #include <memory>
 #include <stdexcept>
 #include <string>
 #include <system_error>
 #include <vector>
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 namespace gpioplus
 {
 namespace
diff --git a/test/internal/fd.cpp b/test/internal/fd.cpp
index 852c5c6..a909a99 100644
--- a/test/internal/fd.cpp
+++ b/test/internal/fd.cpp
@@ -1,17 +1,20 @@
-#include <cerrno>
-#include <cstring>
 #include <fcntl.h>
-#include <gmock/gmock.h>
-#include <gpioplus/internal/fd.hpp>
-#include <gpioplus/test/sys.hpp>
-#include <gtest/gtest.h>
-#include <memory>
 #include <signal.h>
 #include <sys/prctl.h>
+
+#include <gpioplus/internal/fd.hpp>
+#include <gpioplus/test/sys.hpp>
+
+#include <cerrno>
+#include <cstring>
+#include <memory>
 #include <system_error>
 #include <type_traits>
 #include <utility>
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #ifdef HAVE_GCOV
 // Needed for the abrt test
 extern "C" void __gcov_flush(void);
diff --git a/test/utility/aspeed.cpp b/test/utility/aspeed.cpp
index 90580b5..562ea69 100644
--- a/test/utility/aspeed.cpp
+++ b/test/utility/aspeed.cpp
@@ -1,4 +1,5 @@
 #include <gpioplus/utility/aspeed.hpp>
+
 #include <gtest/gtest.h>
 
 namespace gpioplus