Move includes of glib and gtk out or extern C in new cpp files.

gnucash/gnome-utils/dialog-options.cpp

@@ -30,11 +30,12 @@ extern "C"
 
 #include <Account.h> // To include as C++ overriding later indirect includes
 #include <libguile.h>
-extern "C"
-{
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <glib/gi18n.h>
+
+extern "C"
+{
 #include "swig-runtime.h"
 
 #include "gnc-tree-model-budget.h" //FIXME?

gnucash/gnome-utils/gnc-main-window.cpp

@@ -33,15 +33,16 @@
     @author Copyright (C) 2003,2005,2006 David Hampton <hampton@employees.org>
 */
 #include <libguile.h>
-extern "C"
-{
-#include <config.h>
-
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 
+extern "C"
+{
+#include <config.h>
+
+
 #include "gnc-plugin.h"
 #include "gnc-plugin-manager.h"
 #include "gnc-main-window.h"

gnucash/gnome/assistant-hierarchy.cpp

@@ -23,6 +23,10 @@
 \********************************************************************/
 
 #include <libguile.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+
 extern "C"
 {
 #include <config.h>
@@ -32,9 +36,6 @@ extern "C"
 #include <windows.h>
 #endif
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>

gnucash/gnome/business-options-gnome.cpp

@@ -23,13 +23,13 @@
  */
 
 #include <libguile.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 extern "C"
 {
 #include <config.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
 #include "swig-runtime.h"
 #include "guile-mappings.h"
 

gnucash/gnome/dialog-report-column-view.cpp

@@ -22,12 +22,13 @@
  ********************************************************************/
 
 #include <libguile.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
 extern "C"
 {
 #include <config.h>
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
 #include "swig-runtime.h"
 
 #include "dialog-utils.h"

gnucash/gnome/dialog-report-style-sheet.cpp

@@ -23,13 +23,13 @@
  ********************************************************************/
 
 #include <libguile.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 extern "C"
 {
 #include <config.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "dialog-report-style-sheet.h"
 #include "dialog-utils.h"
 #include "gnc-component-manager.h"

gnucash/gnome/gnc-plugin-page-report.cpp

@@ -37,13 +37,14 @@
     @author Copyright (C) 2005 David Hampton <hampton@employees.org>
 */
 #include <libguile.h>
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+
 extern "C"
 {
 #include <config.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
 #include <sys/stat.h>
 #include <errno.h>
 

gnucash/gnome/window-report.cpp

@@ -25,11 +25,12 @@
  *                                                                  *
  ********************************************************************/
 #include <libguile.h>
+#include <glib/gi18n.h>
+
 extern "C"
 {
 #include <config.h>
 
-#include <glib/gi18n.h>
 #include <errno.h>
 #include <sys/stat.h>
 

libgnucash/app-utils/app-utils.i

@@ -21,6 +21,7 @@
 %module sw_app_utils
 %{
 /* Includes the header in the wrapper code */
+#include <glib.h>
 #ifdef __cplusplus
 extern "C"
 {

libgnucash/app-utils/gnc-option-impl.hpp

@@ -42,6 +42,7 @@ extern "C"
 #include <functional>
 #include <variant>
 #include <iostream>
+#include <limits>
 
 #include "gnc-option-uitype.hpp"
 

libgnucash/app-utils/gnc-option.hpp

@@ -24,11 +24,7 @@
 #ifndef GNC_OPTION_HPP_
 #define GNC_OPTION_HPP_
 
-extern "C"
-{
 #include <glib.h>
-}
-
 #include <libguile.h>
 #include <string>
 #include <iostream>

libgnucash/app-utils/test/gtest-gnc-optiondb.cpp

@@ -26,9 +26,10 @@
 #include <gnc-optiondb-impl.hpp>
 #include <gnc-option-ui.hpp>
 #include <kvp-value.hpp>
+#include <glib-2.0/glib.h>
+
 extern "C"
 {
-#include <glib-2.0/glib.h>
 #include <gnc-ui-util.h>
 #include <gnc-session.h>
 }