Finish the glib 2.67 fixes for CI tests.

libgnucash/app-utils/test/test-print-parse-amount.cpp

@@ -18,6 +18,9 @@
  *                                                                  *
 \********************************************************************/
 
+#include <glib.h>
+#include <glib/gprintf.h>
+
 extern "C"
 {
 #include <config.h>
@@ -30,9 +33,6 @@ extern "C"
 #include <unittest-support.h>
 }
 
-#include <glib.h>
-#include <glib/gprintf.h>
-
 static void
 test_num_print_info (gnc_numeric n, GNCPrintAmountInfo print_info, int line)
 {

libgnucash/app-utils/test/test-scm-query-string.cpp

@@ -22,11 +22,10 @@
 #include <glib.h>
 #include "guile-mappings.h"
 #include <libguile.h>
-#include "gnc-engine-guile.h"
 
 extern "C"
 {
-
+#include "gnc-engine-guile.h"
 #include "gnc-guile-utils.h"
 #include "test-engine-stuff.h"
 #include "test-stuff.h"

libgnucash/backend/xml/test/test-xml2-is-file.cpp

@@ -22,10 +22,9 @@ extern "C"
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include "test-engine-stuff.h"
 }
 
+#include "test-engine-stuff.h"
 #include "io-gncxml-v2.h"
 #include "test-file-stuff.h"
 #include "test-stuff.h"

libgnucash/engine/test-core/test-engine-stuff.h

@@ -24,11 +24,11 @@
 
 #ifndef TEST_ENGINE_STUFF_H
 #define TEST_ENGINE_STUFF_H
+#include <glib.h>
 #ifdef __cplusplus
 extern "C"
 {
 #endif
-#include <glib.h>
 #include <stdlib.h>
 #include <stdint.h>