diff --git a/src/gnc/Session.hpp b/src/gnc/Session.hpp
index efed430618..5087c65e95 100644
--- a/src/gnc/Session.hpp
+++ b/src/gnc/Session.hpp
@@ -25,9 +25,9 @@
 
 // gnucash includes
 #include "config.h" // required by qof/qofutil.h
+#include <glib/gi18n.h>
 extern "C"
 {
-#include <glib/gi18n.h>
 #include "qof.h"
 #include "engine/gnc-hooks.h"
 }
diff --git a/src/gnc/main.cpp b/src/gnc/main.cpp
index b42e85a57a..91c05793ce 100644
--- a/src/gnc/main.cpp
+++ b/src/gnc/main.cpp
@@ -23,14 +23,14 @@
  */
 #include "config.h"
 
-extern "C"
-{
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <libguile.h>
 #include <glib/gi18n.h>
 #include <glib.h>
+extern "C"
+{
 #include "gnc-module/gnc-module.h"
 #include "core-utils/gnc-path.h"
 #include "core-utils/binreloc.h"
@@ -48,12 +48,12 @@ extern "C"
 #include "backend/xml/gnc-backend-xml.h"
 #include "business/business-core/gncBusiness.h"
 #include "business/business-core/xml/gncmod-business-backend-xml.h"
+} // END extern C
 
 #ifdef HAVE_GETTEXT
 #  include <libintl.h>
 #  include <locale.h>
 #endif
-} // END extern C
 
 #include <QApplication>
 #include "mainwindow.hpp"
diff --git a/src/gnc/mainwindow.cpp b/src/gnc/mainwindow.cpp
index fc20bd42b4..fbc990147b 100644
--- a/src/gnc/mainwindow.cpp
+++ b/src/gnc/mainwindow.cpp
@@ -31,9 +31,9 @@
 #include "ui_mainwindow.h"
 
 // gnucash includes
+#include <glib/gi18n.h>
 extern "C"
 {
-#include <glib/gi18n.h>
 #include "qof.h"
 #include "engine/gnc-hooks.h"
 #include "core-utils/gnc-filepath-utils.h"