[gedit] Follow GLib/GTK+ best practices for the order of includes

From: Robert Roth <robertroth src gnome org>
To: commits-list gnome org
Cc:
Subject: [gedit] Follow GLib/GTK+ best practices for the order of includes
Date: Wed, 15 Oct 2014 17:53:46 +0000 (UTC)
commit 039d243c90a9765e319bd2e4f84e5e11a5053444
Author: Robert Roth <robert roth off gmail com>
Date:   Wed Oct 15 09:04:13 2014 +0300

    Follow GLib/GTK+ best practices for the order of includes
    
    Refactored includes to follow the glib best practices:
    * config.h (if required)
    * own module header file
    * system header files
    * required headers from current project
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735887

 gedit/gedit-app-activatable.c           |    1 +
 gedit/gedit-app-osx.c                   |    5 +++--
 gedit/gedit-app.c                       |    3 ++-
 gedit/gedit-close-confirmation-dialog.c |    3 ++-
 gedit/gedit-commands-documents.c        |    3 ++-
 gedit/gedit-commands-edit.c             |    3 ++-
 gedit/gedit-commands-file-print.c       |    3 ++-
 gedit/gedit-commands-file.c             |    3 ++-
 gedit/gedit-commands-help.c             |    3 ++-
 gedit/gedit-commands-search.c           |    3 ++-
 gedit/gedit-commands-view.c             |    3 ++-
 gedit/gedit-debug.c                     |    3 ++-
 gedit/gedit-document.c                  |    3 ++-
 gedit/gedit-documents-panel.c           |    3 ++-
 gedit/gedit-encoding-items.c            |    5 +++--
 gedit/gedit-file-chooser-dialog-gtk.c   |    3 ++-
 gedit/gedit-file-chooser-dialog-osx.c   |    3 ++-
 gedit/gedit-highlight-mode-dialog.c     |    3 ++-
 gedit/gedit-highlight-mode-selector.c   |    3 ++-
 gedit/gedit-history-entry.c             |    4 ++--
 gedit/gedit-history-entry.h             |    1 +
 gedit/gedit-io-error-info-bar.c         |    5 +++--
 gedit/gedit-menu-extension.c            |    2 +-
 gedit/gedit-menu-stack-switcher.c       |    3 ++-
 gedit/gedit-message-bus.c               |    3 ++-
 gedit/gedit-metadata-manager.c          |    5 ++++-
 gedit/gedit-multi-notebook.c            |    1 +
 gedit/gedit-notebook-popup-menu.c       |    4 +++-
 gedit/gedit-notebook-stack-switcher.c   |    3 ++-
 gedit/gedit-notebook.c                  |    3 ++-
 gedit/gedit-open-document-selector.c    |    3 ++-
 gedit/gedit-plugins-engine.c            |    3 ++-
 gedit/gedit-preferences-dialog.c        |    3 ++-
 gedit/gedit-print-job.c                 |    3 ++-
 gedit/gedit-print-preview.c             |    4 ++--
 gedit/gedit-progress-info-bar.c         |    4 ++--
 gedit/gedit-recent.c                    |    3 ++-
 gedit/gedit-replace-dialog.c            |    3 ++-
 gedit/gedit-settings.c                  |    4 +++-
 gedit/gedit-statusbar.c                 |    4 +++-
 gedit/gedit-tab-label.c                 |    4 +++-
 gedit/gedit-tab.c                       |    3 ++-
 gedit/gedit-utils.c                     |   10 +++++-----
 gedit/gedit-view-activatable.c          |    1 +
 gedit/gedit-view-frame.c                |   11 ++++++-----
 gedit/gedit-view.c                      |    5 ++---
 gedit/gedit-window-activatable.c        |    4 +++-
 gedit/gedit-window.c                    |    3 ++-
 gedit/gedit.c                           |   10 +++++-----
 49 files changed, 113 insertions(+), 65 deletions(-)
---
diff --git a/gedit/gedit-app-activatable.c b/gedit/gedit-app-activatable.c
index d7e2e1b..fe93c9a 100644
--- a/gedit/gedit-app-activatable.c
+++ b/gedit/gedit-app-activatable.c
@@ -24,6 +24,7 @@
 #endif
 
 #include "gedit-app-activatable.h"
+
 #include "gedit-app.h"
 
 /**
diff --git a/gedit/gedit-app-osx.c b/gedit/gedit-app-osx.c
index 43af394..c8f1ea4 100644
--- a/gedit/gedit-app-osx.c
+++ b/gedit/gedit-app-osx.c
@@ -21,12 +21,13 @@
  */
 
 #include "gedit-app-osx.h"
-#include <gedit/gedit-dirs.h>
-#include <gedit/gedit-debug.h>
+
 #include <gdk/gdkquartz.h>
 #include <string.h>
 #include <glib/gi18n.h>
 
+#include "gedit-dirs.h"
+#include "gedit-debug.h"
 #include "gedit-commands.h"
 #include "gedit-recent.h"
 
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index 643667d..c502f09 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -22,6 +22,8 @@
 #include <config.h>
 #endif
 
+#include "gedit-app.h"
+
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -35,7 +37,6 @@
 #include <girepository.h>
 #endif
 
-#include "gedit-app.h"
 #include "gedit-commands.h"
 #include "gedit-notebook.h"
 #include "gedit-debug.h"
diff --git a/gedit/gedit-close-confirmation-dialog.c b/gedit/gedit-close-confirmation-dialog.c
index 5649da0..63308fd 100644
--- a/gedit/gedit-close-confirmation-dialog.c
+++ b/gedit/gedit-close-confirmation-dialog.c
@@ -22,9 +22,10 @@
 #include <config.h>
 #endif
 
+#include "gedit-close-confirmation-dialog.h"
+
 #include <glib/gi18n.h>
 
-#include "gedit-close-confirmation-dialog.h"
 #include <gedit/gedit-app.h>
 #include <gedit/gedit-utils.h>
 #include <gedit/gedit-window.h>
diff --git a/gedit/gedit-commands-documents.c b/gedit/gedit-commands-documents.c
index 12cd342..721cd39 100644
--- a/gedit/gedit-commands-documents.c
+++ b/gedit/gedit-commands-documents.c
@@ -24,9 +24,10 @@
 #include <config.h>
 #endif
 
+#include "gedit-commands.h"
+
 #include <gtk/gtk.h>
 
-#include "gedit-commands.h"
 #include "gedit-window.h"
 #include "gedit-notebook.h"
 #include "gedit-multi-notebook.h"
diff --git a/gedit/gedit-commands-edit.c b/gedit/gedit-commands-edit.c
index 91b6860..948ccd5 100644
--- a/gedit/gedit-commands-edit.c
+++ b/gedit/gedit-commands-edit.c
@@ -24,9 +24,10 @@
 #include <config.h>
 #endif
 
+#include "gedit-commands.h"
+
 #include <gtk/gtk.h>
 
-#include "gedit-commands.h"
 #include "gedit-window.h"
 #include "gedit-debug.h"
 #include "gedit-view.h"
diff --git a/gedit/gedit-commands-file-print.c b/gedit/gedit-commands-file-print.c
index b6af697..03c20c1 100644
--- a/gedit/gedit-commands-file-print.c
+++ b/gedit/gedit-commands-file-print.c
@@ -24,10 +24,11 @@
 #include <config.h>
 #endif
 
+#include "gedit-commands.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "gedit-commands.h"
 #include "gedit-window.h"
 #include "gedit-tab.h"
 #include "gedit-debug.h"
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index d512333..29d9f67 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -24,11 +24,12 @@
 #include <config.h>
 #endif
 
+#include "gedit-commands.h"
+
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include "gedit-commands.h"
 #include "gedit-window.h"
 #include "gedit-window-private.h"
 #include "gedit-notebook.h"
diff --git a/gedit/gedit-commands-help.c b/gedit/gedit-commands-help.c
index ea2fb6b..5fd8030 100644
--- a/gedit/gedit-commands-help.c
+++ b/gedit/gedit-commands-help.c
@@ -24,10 +24,11 @@
 #include <config.h>
 #endif
 
+#include "gedit-commands.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "gedit-commands.h"
 #include "gedit-debug.h"
 #include "gedit-app.h"
 #include "gedit-dirs.h"
diff --git a/gedit/gedit-commands-search.c b/gedit/gedit-commands-search.c
index bccb6cf..8a5a6cc 100644
--- a/gedit/gedit-commands-search.c
+++ b/gedit/gedit-commands-search.c
@@ -25,11 +25,12 @@
 #include <config.h>
 #endif
 
+#include "gedit-commands.h"
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "gedit-commands.h"
 #include "gedit-debug.h"
 #include "gedit-statusbar.h"
 #include "gedit-view-frame.h"
diff --git a/gedit/gedit-commands-view.c b/gedit/gedit-commands-view.c
index 98c1a12..02d3012 100644
--- a/gedit/gedit-commands-view.c
+++ b/gedit/gedit-commands-view.c
@@ -24,9 +24,10 @@
 #include <config.h>
 #endif
 
+#include "gedit-commands.h"
+
 #include <gtk/gtk.h>
 
-#include "gedit-commands.h"
 #include "gedit-debug.h"
 #include "gedit-window.h"
 #include "gedit-highlight-mode-dialog.h"
diff --git a/gedit/gedit-debug.c b/gedit/gedit-debug.c
index 3409926..dc80483 100644
--- a/gedit/gedit-debug.c
+++ b/gedit/gedit-debug.c
@@ -24,9 +24,10 @@
 #include <config.h>
 #endif
 
-#include <stdio.h>
 #include "gedit-debug.h"
 
+#include <stdio.h>
+
 #define ENABLE_PROFILING
 
 #ifdef ENABLE_PROFILING
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index b8a9858..8d3d2c3 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -25,10 +25,11 @@
 #include <config.h>
 #endif
 
+#include "gedit-document.h"
+
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include "gedit-document.h"
 #include "gedit-settings.h"
 #include "gedit-debug.h"
 #include "gedit-utils.h"
diff --git a/gedit/gedit-documents-panel.c b/gedit/gedit-documents-panel.c
index 1f05d71..4be975c 100644
--- a/gedit/gedit-documents-panel.c
+++ b/gedit/gedit-documents-panel.c
@@ -22,9 +22,10 @@
 #include <config.h>
 #endif
 
+#include "gedit-documents-panel.h"
+
 #include <glib/gi18n.h>
 
-#include "gedit-documents-panel.h"
 #include "gedit-debug.h"
 #include "gedit-document.h"
 #include "gedit-multi-notebook.h"
diff --git a/gedit/gedit-encoding-items.c b/gedit/gedit-encoding-items.c
index ae6964b..aee0030 100644
--- a/gedit/gedit-encoding-items.c
+++ b/gedit/gedit-encoding-items.c
@@ -19,11 +19,12 @@
  */
 
 #include "gedit-encoding-items.h"
-#include "gedit-settings.h"
-#include "gedit-utils.h"
 
 #include <glib/gi18n.h>
 
+#include "gedit-settings.h"
+#include "gedit-utils.h"
+
 struct _GeditEncodingItem
 {
        const GtkSourceEncoding *encoding;
diff --git a/gedit/gedit-file-chooser-dialog-gtk.c b/gedit/gedit-file-chooser-dialog-gtk.c
index 13dd9a1..ec58b09 100644
--- a/gedit/gedit-file-chooser-dialog-gtk.c
+++ b/gedit/gedit-file-chooser-dialog-gtk.c
@@ -26,11 +26,12 @@
 #include <config.h>
 #endif
 
+#include "gedit-file-chooser-dialog-gtk.h"
+
 #include <string.h>
 
 #include <glib/gi18n.h>
 
-#include "gedit-file-chooser-dialog-gtk.h"
 #include "gedit-encodings-combo-box.h"
 #include "gedit-debug.h"
 #include "gedit-enum-types.h"
diff --git a/gedit/gedit-file-chooser-dialog-osx.c b/gedit/gedit-file-chooser-dialog-osx.c
index 045e22e..8c33393 100644
--- a/gedit/gedit-file-chooser-dialog-osx.c
+++ b/gedit/gedit-file-chooser-dialog-osx.c
@@ -22,11 +22,12 @@
 #include <config.h>
 #endif
 
+#include "gedit-file-chooser-dialog-osx.h"
+
 #import <Cocoa/Cocoa.h>
 #include <gdk/gdkquartz.h>
 #include <glib/gi18n.h>
 
-#include "gedit-file-chooser-dialog-osx.h"
 #include "gedit-encoding-items.h"
 #include "gedit-encodings-dialog.h"
 #include "gedit-utils.h"
diff --git a/gedit/gedit-highlight-mode-dialog.c b/gedit/gedit-highlight-mode-dialog.c
index 1e00452..81ed4d5 100644
--- a/gedit/gedit-highlight-mode-dialog.c
+++ b/gedit/gedit-highlight-mode-dialog.c
@@ -18,9 +18,10 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gtk/gtk.h>
 #include "gedit-highlight-mode-dialog.h"
 
+#include <gtk/gtk.h>
+
 struct _GeditHighlightModeDialogPrivate
 {
        GeditHighlightModeSelector *selector;
diff --git a/gedit/gedit-highlight-mode-selector.c b/gedit/gedit-highlight-mode-selector.c
index a39d4e4..901896d 100644
--- a/gedit/gedit-highlight-mode-selector.c
+++ b/gedit/gedit-highlight-mode-selector.c
@@ -18,10 +18,11 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "gedit-highlight-mode-selector.h"
+
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <string.h>
-#include "gedit-highlight-mode-selector.h"
 
 enum
 {
diff --git a/gedit/gedit-history-entry.c b/gedit/gedit-history-entry.c
index 54da198..d59ea98 100644
--- a/gedit/gedit-history-entry.c
+++ b/gedit/gedit-history-entry.c
@@ -22,12 +22,12 @@
 #include <config.h>
 #endif
 
+#include "gedit-history-entry.h"
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "gedit-history-entry.h"
-
 enum {
        PROP_0,
        PROP_HISTORY_ID,
diff --git a/gedit/gedit-history-entry.h b/gedit/gedit-history-entry.h
index 93135a8..c88b8b5 100644
--- a/gedit/gedit-history-entry.h
+++ b/gedit/gedit-history-entry.h
@@ -21,6 +21,7 @@
 #ifndef __GEDIT_HISTORY_ENTRY_H__
 #define __GEDIT_HISTORY_ENTRY_H__
 
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/gedit/gedit-io-error-info-bar.c b/gedit/gedit-io-error-info-bar.c
index 2645e99..1d8a469 100644
--- a/gedit/gedit-io-error-info-bar.c
+++ b/gedit/gedit-io-error-info-bar.c
@@ -26,17 +26,18 @@
 #include <config.h>
 #endif
 
+#include "gedit-io-error-info-bar.h"
+
 #include <errno.h>
 #include <string.h>
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
+#include <gedit/gedit-encodings-combo-box.h>
 #include "gedit-settings.h"
 #include "gedit-utils.h"
 #include "gedit-document.h"
-#include "gedit-io-error-info-bar.h"
-#include <gedit/gedit-encodings-combo-box.h>
 
 #define MAX_URI_IN_DIALOG_LENGTH 50
 
diff --git a/gedit/gedit-menu-extension.c b/gedit/gedit-menu-extension.c
index 435bb95..384c558 100644
--- a/gedit/gedit-menu-extension.c
+++ b/gedit/gedit-menu-extension.c
@@ -18,8 +18,8 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "gedit-menu-extension.h"
+
 #include <string.h>
 
 static guint last_merge_id = 0;
diff --git a/gedit/gedit-menu-stack-switcher.c b/gedit/gedit-menu-stack-switcher.c
index 2b856aa..6b34bcb 100644
--- a/gedit/gedit-menu-stack-switcher.c
+++ b/gedit/gedit-menu-stack-switcher.c
@@ -22,10 +22,11 @@
 #include <config.h>
 #endif
 
+#include "gedit-menu-stack-switcher.h"
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include "gedit-menu-stack-switcher.h"
 
 struct _GeditMenuStackSwitcherPrivate
 {
diff --git a/gedit/gedit-message-bus.c b/gedit/gedit-message-bus.c
index 29cd406..4ef1d0e 100644
--- a/gedit/gedit-message-bus.c
+++ b/gedit/gedit-message-bus.c
@@ -21,12 +21,13 @@
  */
 
 #include "gedit-message-bus.h"
-#include "gedit-marshal.h"
 
 #include <string.h>
 #include <stdarg.h>
 #include <gobject/gvaluecollector.h>
 
+#include "gedit-marshal.h"
+
 /**
  * GeditMessageCallback:
  * @bus: the #GeditMessageBus on which the message was sent
diff --git a/gedit/gedit-metadata-manager.c b/gedit/gedit-metadata-manager.c
index f051e19..a3e12a7 100644
--- a/gedit/gedit-metadata-manager.c
+++ b/gedit/gedit-metadata-manager.c
@@ -19,11 +19,14 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "gedit-metadata-manager.h"
+
 #include <stdlib.h>
 #include <libxml/xmlreader.h>
+
 #include "gedit-debug.h"
 #include "gedit-dirs.h"
-#include "gedit-metadata-manager.h"
+
 
 /*
 #define GEDIT_METADATA_VERBOSE_DEBUG   1
diff --git a/gedit/gedit-multi-notebook.c b/gedit/gedit-multi-notebook.c
index 00d81bb..3eb2028 100644
--- a/gedit/gedit-multi-notebook.c
+++ b/gedit/gedit-multi-notebook.c
@@ -21,6 +21,7 @@
  */
 
 #include "gedit-multi-notebook.h"
+
 #include "gedit-enum-types.h"
 #include "gedit-marshal.h"
 #include "gedit-settings.h"
diff --git a/gedit/gedit-notebook-popup-menu.c b/gedit/gedit-notebook-popup-menu.c
index 0713c90..58cf78e 100644
--- a/gedit/gedit-notebook-popup-menu.c
+++ b/gedit/gedit-notebook-popup-menu.c
@@ -18,11 +18,13 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "gedit-notebook-popup-menu.h"
+
 #include <glib/gi18n.h>
+
 #include "gedit-app.h"
 #include "gedit-commands.h"
 #include "gedit-multi-notebook.h"
-#include "gedit-notebook-popup-menu.h"
 
 struct _GeditNotebookPopupMenuPrivate
 {
diff --git a/gedit/gedit-notebook-stack-switcher.c b/gedit/gedit-notebook-stack-switcher.c
index a0cc449..8f02439 100644
--- a/gedit/gedit-notebook-stack-switcher.c
+++ b/gedit/gedit-notebook-stack-switcher.c
@@ -22,10 +22,11 @@
 #include <config.h>
 #endif
 
+#include "gedit-notebook-stack-switcher.h"
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include "gedit-notebook-stack-switcher.h"
 
 /*
  * This widget is a rather ugly kludge: it uses a GtkNotebook full of empty
diff --git a/gedit/gedit-notebook.c b/gedit/gedit-notebook.c
index b60f1fc..404f52d 100644
--- a/gedit/gedit-notebook.c
+++ b/gedit/gedit-notebook.c
@@ -31,11 +31,12 @@
 #include <config.h>
 #endif
 
+#include "gedit-notebook.h"
+
 #include <glib-object.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "gedit-notebook.h"
 #include "gedit-tab.h"
 #include "gedit-tab-label.h"
 #include "gedit-window.h"
diff --git a/gedit/gedit-open-document-selector.c b/gedit/gedit-open-document-selector.c
index 2d0d375..33c51aa 100644
--- a/gedit/gedit-open-document-selector.c
+++ b/gedit/gedit-open-document-selector.c
@@ -18,13 +18,14 @@
  * along with gedit. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "gedit-open-document-selector.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 
-#include "gedit-open-document-selector.h"
 #include "gedit-recent.h"
 #include "gedit-utils.h"
 #include "gedit-window.h"
diff --git a/gedit/gedit-plugins-engine.c b/gedit/gedit-plugins-engine.c
index 6cae953..725cb3b 100644
--- a/gedit/gedit-plugins-engine.c
+++ b/gedit/gedit-plugins-engine.c
@@ -23,12 +23,13 @@
 #include <config.h>
 #endif
 
+#include "gedit-plugins-engine.h"
+
 #include <string.h>
 
 #include <glib/gi18n.h>
 #include <girepository.h>
 
-#include "gedit-plugins-engine.h"
 #include "gedit-debug.h"
 #include "gedit-app.h"
 #include "gedit-dirs.h"
diff --git a/gedit/gedit-preferences-dialog.c b/gedit/gedit-preferences-dialog.c
index 648ab83..db71a9a 100644
--- a/gedit/gedit-preferences-dialog.c
+++ b/gedit/gedit-preferences-dialog.c
@@ -23,6 +23,8 @@
 #include <config.h>
 #endif
 
+#include "gedit-preferences-dialog.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -32,7 +34,6 @@
 #include <gtksourceview/gtksource.h>
 #include <libpeas-gtk/peas-gtk.h>
 
-#include "gedit-preferences-dialog.h"
 #include "gedit-utils.h"
 #include "gedit-debug.h"
 #include "gedit-document.h"
diff --git a/gedit/gedit-print-job.c b/gedit/gedit-print-job.c
index 720466d..3027105 100644
--- a/gedit/gedit-print-job.c
+++ b/gedit/gedit-print-job.c
@@ -23,10 +23,11 @@
 #include <config.h>
 #endif
 
+#include "gedit-print-job.h"
+
 #include <glib/gi18n.h>
 #include <gtksourceview/gtksource.h>
 
-#include "gedit-print-job.h"
 #include "gedit-debug.h"
 #include "gedit-print-preview.h"
 #include "gedit-marshal.h"
diff --git a/gedit/gedit-print-preview.c b/gedit/gedit-print-preview.c
index 8b8e84b..24f72ff 100644
--- a/gedit/gedit-print-preview.c
+++ b/gedit/gedit-print-preview.c
@@ -21,6 +21,8 @@
 #include <config.h>
 #endif
 
+#include "gedit-print-preview.h"
+
 #include <math.h>
 #include <stdlib.h>
 #include <glib/gi18n.h>
@@ -29,8 +31,6 @@
 
 #include <cairo-pdf.h>
 
-#include "gedit-print-preview.h"
-
 #define PRINTER_DPI (72.)
 #define TOOLTIP_THRESHOLD 20
 
diff --git a/gedit/gedit-progress-info-bar.c b/gedit/gedit-progress-info-bar.c
index a7de664..5ad7ac2 100644
--- a/gedit/gedit-progress-info-bar.c
+++ b/gedit/gedit-progress-info-bar.c
@@ -22,12 +22,12 @@
 #include <config.h>
 #endif
 
+#include "gedit-progress-info-bar.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#include "gedit-progress-info-bar.h"
-
 enum {
        PROP_0,
        PROP_HAS_CANCEL_BUTTON
diff --git a/gedit/gedit-recent.c b/gedit/gedit-recent.c
index 6dafb0e..4dd783a 100644
--- a/gedit/gedit-recent.c
+++ b/gedit/gedit-recent.c
@@ -20,11 +20,12 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "gedit-recent.h"
+
 #include <gtk/gtk.h>
 #include <gedit/gedit-document.h>
 #include <string.h>
 
-#include "gedit-recent.h"
 #include "gedit-settings.h"
 
 void
diff --git a/gedit/gedit-replace-dialog.c b/gedit/gedit-replace-dialog.c
index 406de55..9c57c1f 100644
--- a/gedit/gedit-replace-dialog.c
+++ b/gedit/gedit-replace-dialog.c
@@ -23,11 +23,12 @@
 #include <config.h>
 #endif
 
+#include "gedit-replace-dialog.h"
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "gedit-replace-dialog.h"
 #include "gedit-history-entry.h"
 #include "gedit-document.h"
 
diff --git a/gedit/gedit-settings.c b/gedit/gedit-settings.c
index 2dcea90..1d38144 100644
--- a/gedit/gedit-settings.c
+++ b/gedit/gedit-settings.c
@@ -25,12 +25,14 @@
 #include <config.h>
 #endif
 
+#include "gedit-settings.h"
+
 #include <string.h>
 #include <gtksourceview/gtksource.h>
+
 #include "gedit-app.h"
 #include "gedit-view.h"
 #include "gedit-window.h"
-#include "gedit-settings.h"
 
 #define GEDIT_SETTINGS_LOCKDOWN_COMMAND_LINE "disable-command-line"
 #define GEDIT_SETTINGS_LOCKDOWN_PRINTING "disable-printing"
diff --git a/gedit/gedit-statusbar.c b/gedit/gedit-statusbar.c
index 1390fe1..7eac5ab 100644
--- a/gedit/gedit-statusbar.c
+++ b/gedit/gedit-statusbar.c
@@ -22,10 +22,12 @@
 #include <config.h>
 #endif
 
+#include "gedit-statusbar.h"
+
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include "gedit-statusbar.h"
+
 #include "gedit-app.h"
 #include "gedit-status-menu-button.h"
 
diff --git a/gedit/gedit-tab-label.c b/gedit/gedit-tab-label.c
index ff8aebd..3c9708e 100644
--- a/gedit/gedit-tab-label.c
+++ b/gedit/gedit-tab-label.c
@@ -22,9 +22,11 @@
 #include <config.h>
 #endif
 
+#include "gedit-tab-label.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include "gedit-tab-label.h"
+
 #include "gedit-small-button.h"
 
 /* Signals */
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index 067538d..0bab29c 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -23,10 +23,11 @@
 #include <config.h>
 #endif
 
+#include "gedit-tab.h"
+
 #include <stdlib.h>
 #include <glib/gi18n.h>
 
-#include "gedit-tab.h"
 #include "gedit-app.h"
 #include "gedit-recent.h"
 #include "gedit-utils.h"
diff --git a/gedit/gedit-utils.c b/gedit/gedit-utils.c
index 8bcb0f4..4448cb4 100644
--- a/gedit/gedit-utils.c
+++ b/gedit/gedit-utils.c
@@ -24,6 +24,8 @@
 #include <config.h>
 #endif
 
+#include "gedit-utils.h"
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -36,11 +38,6 @@
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 
-#include "gedit-utils.h"
-
-#include "gedit-document.h"
-#include "gedit-debug.h"
-
 /* For the workspace/viewport stuff */
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
@@ -54,6 +51,9 @@
 #include <sys/stat.h>
 #endif
 
+#include "gedit-document.h"
+#include "gedit-debug.h"
+
 static void
 widget_get_origin (GtkWidget *widget,
                   gint      *x,
diff --git a/gedit/gedit-view-activatable.c b/gedit/gedit-view-activatable.c
index 999559f..32a4739 100644
--- a/gedit/gedit-view-activatable.c
+++ b/gedit/gedit-view-activatable.c
@@ -23,6 +23,7 @@
 #endif
 
 #include "gedit-view-activatable.h"
+
 #include "gedit-view.h"
 
 /**
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index a5810f7..7c57ee6 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -26,17 +26,18 @@
 #endif
 
 #include "gedit-view-frame.h"
-#include "gedit-window.h"
-#include "gedit-view-holder.h"
-#include "gedit-debug.h"
-#include "gedit-utils.h"
-#include "libgd/gd.h"
 
 #include <gtksourceview/gtksource.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <stdlib.h>
 
+#include "gedit-window.h"
+#include "gedit-view-holder.h"
+#include "gedit-debug.h"
+#include "gedit-utils.h"
+#include "libgd/gd.h"
+
 #define FLUSH_TIMEOUT_DURATION 30 /* in seconds */
 
 #define SEARCH_POPUP_MARGIN 12
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index 5baa8ac..b49a382 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -24,15 +24,14 @@
 #include <config.h>
 #endif
 
+#include "gedit-view.h"
+
 #include <string.h>
 #include <stdlib.h>
-
 #include <gdk/gdkkeysyms.h>
 #include <libpeas/peas-extension-set.h>
-
 #include <glib/gi18n.h>
 
-#include "gedit-view.h"
 #include "gedit-view-activatable.h"
 #include "gedit-plugins-engine.h"
 #include "gedit-debug.h"
diff --git a/gedit/gedit-window-activatable.c b/gedit/gedit-window-activatable.c
index 0f2c7e3..ac58c04 100644
--- a/gedit/gedit-window-activatable.c
+++ b/gedit/gedit-window-activatable.c
@@ -23,9 +23,11 @@
 #endif
 
 #include "gedit-window-activatable.h"
-#include "gedit-window.h"
+
 #include <string.h>
 
+#include "gedit-window.h"
+
 /**
  * SECTION:gedit-window-activatable
  * @short_description: Interface for activatable extensions on windows
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index 77023ff..fd6f128 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -22,6 +22,8 @@
 #include <config.h>
 #endif
 
+#include "gedit-window.h"
+
 #include <time.h>
 #include <sys/types.h>
 #include <string.h>
@@ -29,7 +31,6 @@
 #include <glib/gi18n.h>
 #include <libpeas/peas-extension-set.h>
 
-#include "gedit-window.h"
 #include "gedit-window-private.h"
 #include "gedit-app.h"
 #include "gedit-recent.h"
diff --git a/gedit/gedit.c b/gedit/gedit.c
index 4ada6d3..130b386 100644
--- a/gedit/gedit.c
+++ b/gedit/gedit.c
@@ -22,11 +22,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
-#include <locale.h>
-#include <libintl.h>
-
-#include "gedit-dirs.h"
 #include "gedit-app.h"
 #ifdef OS_OSX
 #include "gedit-app-osx.h"
@@ -38,6 +33,11 @@
 #endif
 #endif
 
+#include <glib.h>
+#include <locale.h>
+#include <libintl.h>
+
+#include "gedit-dirs.h"
 #include "gedit-debug.h"
 
 #ifdef G_OS_WIN32
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]