src/*.c: Reorganize #include directives

16 files changed, 43 insertions, 30 deletions

diff --git a/src/about.c b/src/about.c
index 39e6a7a..63cfaaa 100644
--- a/src/about.c
+++ b/src/about.c
@@ -19,13 +19,14 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "about.h"
+
 #include <string.h>
 
 #include <webkit2/webkit2.h>
 
-#include "about.h"
-#include "application.h"
 #include "about/paths.h"
+#include "application.h"
 
 static GHashTable *
 parse_query_string(gchar *str)
diff --git a/src/application.c b/src/application.c
index f5edc7f..13fba19 100644
--- a/src/application.c
+++ b/src/application.c
@@ -19,15 +19,16 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "application.h"
+
 #include <stdlib.h>
 
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
 
-#include "application.h"
+#include "about.h"
 #include "config.h"
 #include "web-settings.h"
-#include "about.h"
 #include "window.h"
 
 static void
diff --git a/src/back-forward-button-box.c b/src/back-forward-button-box.c
index d95bf41..656c4b6 100644
--- a/src/back-forward-button-box.c
+++ b/src/back-forward-button-box.c
@@ -19,11 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "back-forward-button-box.h"
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
 
-#include "back-forward-button-box.h"
 #include "web-view.h"
 
 struct _MqBackForwardButtonBox {
diff --git a/src/config.c b/src/config.c
index a841141..c4e2bf7 100644
--- a/src/config.c
+++ b/src/config.c
@@ -23,13 +23,13 @@
 #include <config.h>
 #endif
 
-#include <string.h>
+#include "config.h"
+
 #include <stdlib.h>
+#include <string.h>
 
 #include <glib.h>
 
-#include "config.h"
-
 enum type {
 	TYPE_BOOLEAN,
 	TYPE_INTEGER,
diff --git a/src/find-toolbar.c b/src/find-toolbar.c
index 16a8f3f..3ef245b 100644
--- a/src/find-toolbar.c
+++ b/src/find-toolbar.c
@@ -19,11 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "find-toolbar.h"
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
 
-#include "find-toolbar.h"
 #include "web-view.h"
 
 struct _MqFindToolbar {
diff --git a/src/gpl-3-0.c b/src/gpl-3-0.c
index 52c101a..b63c279 100644
--- a/src/gpl-3-0.c
+++ b/src/gpl-3-0.c
@@ -19,10 +19,10 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <glib.h>
-
 #include "gpl-3-0.h"
 
+#include <glib.h>
+
 /*
  * From <https://www.gnu.org/licenses/gpl-3.0-standalone.html>
  *
diff --git a/src/home-button.c b/src/home-button.c
index 3a0a0ab..bc44853 100644
--- a/src/home-button.c
+++ b/src/home-button.c
@@ -19,11 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "home-button.h"
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
 
-#include "home-button.h"
 #include "config.h"
 #include "web-view.h"
 
diff --git a/src/html.c b/src/html.c
index e8f8e4c..9417db9 100644
--- a/src/html.c
+++ b/src/html.c
@@ -19,14 +19,14 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "html.h"
+
 #include <stdarg.h>
 #include <string.h>
 
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include "html.h"
-
 static const gchar *styles =
 	/*
 	 * General styles
diff --git a/src/main-menu.c b/src/main-menu.c
index 88d5622..96c0310 100644
--- a/src/main-menu.c
+++ b/src/main-menu.c
@@ -19,13 +19,14 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "main-menu.h"
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
 
-#include "main-menu.h"
-#include "tab.h"
 #include "find-toolbar.h"
+#include "tab.h"
 #include "web-view.h"
 
 struct _MqMainMenu {
diff --git a/src/navigation-toolbar.c b/src/navigation-toolbar.c
index 3d991be..655b076 100644
--- a/src/navigation-toolbar.c
+++ b/src/navigation-toolbar.c
@@ -19,20 +19,21 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "navigation-toolbar.h"
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
 
-#include "navigation-toolbar.h"
+#include "back-forward-button-box.h"
 #include "config.h"
-#include "tab.h"
 #include "find-toolbar.h"
-#include "web-view.h"
-#include "back-forward-button-box.h"
-#include "stop-reload-button.h"
-#include "uri-entry.h"
 #include "home-button.h"
 #include "main-menu.h"
+#include "stop-reload-button.h"
+#include "tab.h"
+#include "uri-entry.h"
+#include "web-view.h"
 
 struct _MqNavigationToolbar {
 	GtkToolbar     parent_instance;
diff --git a/src/stop-reload-button.c b/src/stop-reload-button.c
index b884773..315a313 100644
--- a/src/stop-reload-button.c
+++ b/src/stop-reload-button.c
@@ -19,11 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "stop-reload-button.h"
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
 
-#include "stop-reload-button.h"
 #include "web-view.h"
 
 struct _MqStopReloadButton {
diff --git a/src/tab.c b/src/tab.c
index f4f11bc..bae726d 100644
--- a/src/tab.c
+++ b/src/tab.c
@@ -19,13 +19,14 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "tab.h"
+
 #include <stdlib.h>
 
 #include <gtk/gtk.h>
 
-#include "tab.h"
-#include "navigation-toolbar.h"
 #include "find-toolbar.h"
+#include "navigation-toolbar.h"
 #include "web-view.h"
 
 static void
diff --git a/src/uri-entry.c b/src/uri-entry.c
index e91492f..1dcf4c9 100644
--- a/src/uri-entry.c
+++ b/src/uri-entry.c
@@ -19,11 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "uri-entry.h"
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
 
-#include "uri-entry.h"
 #include "web-view.h"
 
 struct _MqUriEntry {
diff --git a/src/web-settings.c b/src/web-settings.c
index e8ed669..c6b9c44 100644
--- a/src/web-settings.c
+++ b/src/web-settings.c
@@ -19,9 +19,10 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "web-settings.h"
+
 #include <webkit2/webkit2.h>
 
-#include "web-settings.h"
 #include "config.h"
 
 enum mapping_type {
diff --git a/src/web-view.c b/src/web-view.c
index 9d63894..ca8e98d 100644
--- a/src/web-view.c
+++ b/src/web-view.c
@@ -19,6 +19,8 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "web-view.h"
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -26,9 +28,8 @@
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
 
-#include "web-view.h"
-#include "tab.h"
 #include "config.h"
+#include "tab.h"
 
 struct _MqWebView {
 	WebKitWebView        parent_instance;
diff --git a/src/window.c b/src/window.c
index a5bf6c4..b6821e7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -19,11 +19,12 @@
  * along with Marquee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "window.h"
+
 #include <stdlib.h>
 
 #include <gtk/gtk.h>
 
-#include "window.h"
 #include "application.h"
 #include "tab.h"