diff --git a/libgnucash/app-utils/test/test-option-util.cpp b/libgnucash/app-utils/test/test-option-util.cpp
index c00f329781..c4b1c0c40b 100644
--- a/libgnucash/app-utils/test/test-option-util.cpp
+++ b/libgnucash/app-utils/test/test-option-util.cpp
@@ -22,11 +22,12 @@
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
  ********************************************************************/
 #include <kvp-frame.hpp>
-#include <gmp.h> 
-extern "C"
-{
+#include <gmp.h>
 #include <config.h>
 #include <glib.h>
+
+extern "C"
+{
 #include <unittest-support.h>
 #include <qofbookslots.h>
 #include "test-engine-stuff.h"
diff --git a/libgnucash/app-utils/test/test-print-queries.cpp b/libgnucash/app-utils/test/test-print-queries.cpp
index 9d6fa5a044..972758ea8d 100644
--- a/libgnucash/app-utils/test/test-print-queries.cpp
+++ b/libgnucash/app-utils/test/test-print-queries.cpp
@@ -18,13 +18,13 @@
  *                                                                  *
 \********************************************************************/
 
+#include <config.h>
+#include <glib.h>
 #include <libguile.h>
+#include "guile-mappings.h"
 
 extern "C"
 {
-#include <config.h>
-#include <glib.h>
-#include "guile-mappings.h"
 
 #include "gnc-engine-guile.h"
 #include "test-engine-stuff.h"
diff --git a/libgnucash/app-utils/test/test-sx.cpp b/libgnucash/app-utils/test/test-sx.cpp
index b635c00d23..c6070d9ab3 100644
--- a/libgnucash/app-utils/test/test-sx.cpp
+++ b/libgnucash/app-utils/test/test-sx.cpp
@@ -18,11 +18,12 @@
  *                                                                  *
 \********************************************************************/
 
+#include <config.h>
+#include <glib.h>
+
 extern "C"
 {
-#include <config.h>
 #include <stdlib.h>
-#include <glib.h>
 #include "SX-book.h"
 #include "gnc-date.h"
 #include "gnc-sx-instance-model.h"