[gnome-disk-utility/new-ui] Include correct i18n headers

[David Zeuthen <davidz src gnome org>]

commit a7b447c15dd7e9b5eef73da6592c092b8a735776
Author: David Zeuthen <davidz redhat com>
Date:   Wed Dec 2 14:39:32 2009 -0500

    Include correct i18n headers

 src/format-tool/gdu-format-progress-dialog.c    |    2 +-
 src/format-tool/gdu-format-tool.c               |    2 +-
 src/gdu-gtk/gdu-add-component-linux-md-dialog.c |    5 +++--
 src/gdu-gtk/gdu-ata-smart-dialog.c              |    3 ++-
 src/gdu-gtk/gdu-button-element.c                |    2 +-
 src/gdu-gtk/gdu-button-table.c                  |    2 +-
 src/gdu-gtk/gdu-confirmation-dialog.c           |    5 +++--
 src/gdu-gtk/gdu-create-linux-md-dialog.c        |    2 +-
 src/gdu-gtk/gdu-create-partition-dialog.c       |    2 +-
 src/gdu-gtk/gdu-details-element.c               |    2 +-
 src/gdu-gtk/gdu-details-table.c                 |    2 +-
 src/gdu-gtk/gdu-dialog.c                        |    5 +++--
 src/gdu-gtk/gdu-disk-selection-widget.c         |    2 +-
 src/gdu-gtk/gdu-drive-benchmark-dialog.c        |    3 ++-
 src/gdu-gtk/gdu-edit-filesystem-dialog.c        |    5 +++--
 src/gdu-gtk/gdu-edit-linux-md-dialog.c          |    2 +-
 src/gdu-gtk/gdu-edit-partition-dialog.c         |    5 +++--
 src/gdu-gtk/gdu-error-dialog.c                  |    5 +++--
 src/gdu-gtk/gdu-format-dialog.c                 |    2 +-
 src/gdu-gtk/gdu-gtk.c                           |    5 +++--
 src/gdu-gtk/gdu-partition-dialog.c              |    2 +-
 src/gdu-gtk/gdu-pool-tree-model.c               |    3 ++-
 src/gdu-gtk/gdu-pool-tree-view.c                |    3 ++-
 src/gdu-gtk/gdu-size-widget.c                   |    2 +-
 src/gdu-gtk/gdu-spinner.c                       |    5 ++---
 src/gdu-gtk/gdu-time-label.c                    |    3 ++-
 src/gdu-gtk/gdu-volume-grid.c                   |    4 +++-
 src/gdu/gdu-adapter.c                           |    5 +++--
 src/gdu/gdu-device.c                            |    5 +++--
 src/gdu/gdu-drive.c                             |    5 +++--
 src/gdu/gdu-error.c                             |    3 ++-
 src/gdu/gdu-expander.c                          |    5 +++--
 src/gdu/gdu-hub.c                               |    5 +++--
 src/gdu/gdu-known-filesystem.c                  |    5 +++--
 src/gdu/gdu-linux-md-drive.c                    |    5 +++--
 src/gdu/gdu-pool.c                              |    4 +++-
 src/gdu/gdu-port.c                              |    6 ++++--
 src/gdu/gdu-presentable.c                       |    5 +++--
 src/gdu/gdu-process.c                           |    5 +++--
 src/gdu/gdu-util.c                              |    5 +++--
 src/gdu/gdu-volume-hole.c                       |    5 +++--
 src/gdu/gdu-volume.c                            |    5 +++--
 src/notification/gdu-slow-unmount-dialog.c      |    2 +-
 src/notification/notification-main.c            |    4 ++--
 src/palimpsest/gdu-main.c                       |    5 +++--
 src/palimpsest/gdu-section-drive.c              |    5 +++--
 src/palimpsest/gdu-section-hub.c                |    5 +++--
 src/palimpsest/gdu-section-linux-md-drive.c     |    5 +++--
 src/palimpsest/gdu-section-volumes.c            |    5 +++--
 src/palimpsest/gdu-section.c                    |    5 +++--
 src/palimpsest/gdu-shell.c                      |    5 +++--
 51 files changed, 118 insertions(+), 81 deletions(-)
---
diff --git a/src/format-tool/gdu-format-progress-dialog.c b/src/format-tool/gdu-format-progress-dialog.c
index 6d29cda..673496a 100644
--- a/src/format-tool/gdu-format-progress-dialog.c
+++ b/src/format-tool/gdu-format-progress-dialog.c
@@ -19,7 +19,7 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <glib/gi18n.h>
 
 #include <gdu-gtk/gdu-gtk.h>
diff --git a/src/format-tool/gdu-format-tool.c b/src/format-tool/gdu-format-tool.c
index 5bffae3..11cfcb8 100644
--- a/src/format-tool/gdu-format-tool.c
+++ b/src/format-tool/gdu-format-tool.c
@@ -24,9 +24,9 @@
  */
 
 #include "config.h"
+#include <glib/gi18n.h>
 
 #include <glib-object.h>
-#include <glib/gi18n-lib.h>
 #include <glib/gthread.h>
 #include <gio/gio.h>
 #include <gdu/gdu.h>
diff --git a/src/gdu-gtk/gdu-add-component-linux-md-dialog.c b/src/gdu-gtk/gdu-add-component-linux-md-dialog.c
index 8bf8db9..fbfe0c2 100644
--- a/src/gdu-gtk/gdu-add-component-linux-md-dialog.c
+++ b/src/gdu-gtk/gdu-add-component-linux-md-dialog.c
@@ -17,8 +17,9 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <glib/gi18n.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <atasmart.h>
 #include <glib/gstdio.h>
 #include <sys/types.h>
diff --git a/src/gdu-gtk/gdu-ata-smart-dialog.c b/src/gdu-gtk/gdu-ata-smart-dialog.c
index 0f75b64..e77ec15 100644
--- a/src/gdu-gtk/gdu-ata-smart-dialog.c
+++ b/src/gdu-gtk/gdu-ata-smart-dialog.c
@@ -19,8 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include <atasmart.h>
 #include <glib/gstdio.h>
 #include <sys/types.h>
diff --git a/src/gdu-gtk/gdu-button-element.c b/src/gdu-gtk/gdu-button-element.c
index 63f17c4..c00ac53 100644
--- a/src/gdu-gtk/gdu-button-element.c
+++ b/src/gdu-gtk/gdu-button-element.c
@@ -23,8 +23,8 @@
 #define _GNU_SOURCE
 
 #include "config.h"
-
 #include <glib/gi18n-lib.h>
+
 #include <math.h>
 
 #include "gdu-size-widget.h"
diff --git a/src/gdu-gtk/gdu-button-table.c b/src/gdu-gtk/gdu-button-table.c
index dc63d0e..7e81312 100644
--- a/src/gdu-gtk/gdu-button-table.c
+++ b/src/gdu-gtk/gdu-button-table.c
@@ -23,8 +23,8 @@
 #define _GNU_SOURCE
 
 #include "config.h"
-
 #include <glib/gi18n-lib.h>
+
 #include <math.h>
 
 #include "gdu-size-widget.h"
diff --git a/src/gdu-gtk/gdu-confirmation-dialog.c b/src/gdu-gtk/gdu-confirmation-dialog.c
index ff303bf..35891ca 100644
--- a/src/gdu-gtk/gdu-confirmation-dialog.c
+++ b/src/gdu-gtk/gdu-confirmation-dialog.c
@@ -19,8 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <glib/gi18n.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <atasmart.h>
 #include <glib/gstdio.h>
 #include <sys/types.h>
diff --git a/src/gdu-gtk/gdu-create-linux-md-dialog.c b/src/gdu-gtk/gdu-create-linux-md-dialog.c
index e508fcd..1552c19 100644
--- a/src/gdu-gtk/gdu-create-linux-md-dialog.c
+++ b/src/gdu-gtk/gdu-create-linux-md-dialog.c
@@ -23,8 +23,8 @@
 #define _GNU_SOURCE
 
 #include "config.h"
-
 #include <glib/gi18n-lib.h>
+
 #include <math.h>
 
 #include "gdu-create-linux-md-dialog.h"
diff --git a/src/gdu-gtk/gdu-create-partition-dialog.c b/src/gdu-gtk/gdu-create-partition-dialog.c
index 4a6d7b4..63e0ca7 100644
--- a/src/gdu-gtk/gdu-create-partition-dialog.c
+++ b/src/gdu-gtk/gdu-create-partition-dialog.c
@@ -24,8 +24,8 @@
  */
 
 #include "config.h"
-
 #include <glib/gi18n-lib.h>
+
 #include <gdu/gdu.h>
 #include <gdu-gtk/gdu-gtk.h>
 
diff --git a/src/gdu-gtk/gdu-details-element.c b/src/gdu-gtk/gdu-details-element.c
index 51f90c7..aa1633a 100644
--- a/src/gdu-gtk/gdu-details-element.c
+++ b/src/gdu-gtk/gdu-details-element.c
@@ -23,8 +23,8 @@
 #define _GNU_SOURCE
 
 #include "config.h"
-
 #include <glib/gi18n-lib.h>
+
 #include <math.h>
 
 #include "gdu-size-widget.h"
diff --git a/src/gdu-gtk/gdu-details-table.c b/src/gdu-gtk/gdu-details-table.c
index 345d8c7..72322b6 100644
--- a/src/gdu-gtk/gdu-details-table.c
+++ b/src/gdu-gtk/gdu-details-table.c
@@ -23,8 +23,8 @@
 #define _GNU_SOURCE
 
 #include "config.h"
-
 #include <glib/gi18n-lib.h>
+
 #include <math.h>
 
 #include "gdu-size-widget.h"
diff --git a/src/gdu-gtk/gdu-dialog.c b/src/gdu-gtk/gdu-dialog.c
index 2c32c63..c069dc5 100644
--- a/src/gdu-gtk/gdu-dialog.c
+++ b/src/gdu-gtk/gdu-dialog.c
@@ -19,8 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <glib/gi18n.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <atasmart.h>
 #include <glib/gstdio.h>
 #include <sys/types.h>
diff --git a/src/gdu-gtk/gdu-disk-selection-widget.c b/src/gdu-gtk/gdu-disk-selection-widget.c
index 3b74f74..1527402 100644
--- a/src/gdu-gtk/gdu-disk-selection-widget.c
+++ b/src/gdu-gtk/gdu-disk-selection-widget.c
@@ -23,8 +23,8 @@
 #define _GNU_SOURCE
 
 #include "config.h"
-
 #include <glib/gi18n-lib.h>
+
 #include <math.h>
 
 #include "gdu-disk-selection-widget.h"
diff --git a/src/gdu-gtk/gdu-drive-benchmark-dialog.c b/src/gdu-gtk/gdu-drive-benchmark-dialog.c
index de6aebe..125d87e 100644
--- a/src/gdu-gtk/gdu-drive-benchmark-dialog.c
+++ b/src/gdu-gtk/gdu-drive-benchmark-dialog.c
@@ -19,8 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include <glib/gstdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/gdu-gtk/gdu-edit-filesystem-dialog.c b/src/gdu-gtk/gdu-edit-filesystem-dialog.c
index c4e9db7..2a040b4 100644
--- a/src/gdu-gtk/gdu-edit-filesystem-dialog.c
+++ b/src/gdu-gtk/gdu-edit-filesystem-dialog.c
@@ -19,8 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <glib/gi18n.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <atasmart.h>
 #include <glib/gstdio.h>
 #include <sys/types.h>
diff --git a/src/gdu-gtk/gdu-edit-linux-md-dialog.c b/src/gdu-gtk/gdu-edit-linux-md-dialog.c
index e2106f7..c6664b9 100644
--- a/src/gdu-gtk/gdu-edit-linux-md-dialog.c
+++ b/src/gdu-gtk/gdu-edit-linux-md-dialog.c
@@ -23,8 +23,8 @@
 #define _GNU_SOURCE
 
 #include "config.h"
-
 #include <glib/gi18n-lib.h>
+
 #include <math.h>
 
 #include "gdu-edit-linux-md-dialog.h"
diff --git a/src/gdu-gtk/gdu-edit-partition-dialog.c b/src/gdu-gtk/gdu-edit-partition-dialog.c
index 18e3c0b..ed32ea3 100644
--- a/src/gdu-gtk/gdu-edit-partition-dialog.c
+++ b/src/gdu-gtk/gdu-edit-partition-dialog.c
@@ -19,8 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <glib/gi18n.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <atasmart.h>
 #include <glib/gstdio.h>
 #include <sys/types.h>
diff --git a/src/gdu-gtk/gdu-error-dialog.c b/src/gdu-gtk/gdu-error-dialog.c
index 6c5993a..b538e24 100644
--- a/src/gdu-gtk/gdu-error-dialog.c
+++ b/src/gdu-gtk/gdu-error-dialog.c
@@ -19,8 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <glib/gi18n.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <atasmart.h>
 #include <glib/gstdio.h>
 #include <sys/types.h>
diff --git a/src/gdu-gtk/gdu-format-dialog.c b/src/gdu-gtk/gdu-format-dialog.c
index 11fe19e..5071021 100644
--- a/src/gdu-gtk/gdu-format-dialog.c
+++ b/src/gdu-gtk/gdu-format-dialog.c
@@ -24,8 +24,8 @@
  */
 
 #include "config.h"
-
 #include <glib/gi18n-lib.h>
+
 #include <gdu/gdu.h>
 #include <gdu-gtk/gdu-gtk.h>
 
diff --git a/src/gdu-gtk/gdu-gtk.c b/src/gdu-gtk/gdu-gtk.c
index dcbde30..c6bd4b6 100644
--- a/src/gdu-gtk/gdu-gtk.c
+++ b/src/gdu-gtk/gdu-gtk.c
@@ -19,10 +19,11 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <glib-object.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 #include <gnome-keyring.h>
 #include <dbus/dbus-glib.h>
 
diff --git a/src/gdu-gtk/gdu-partition-dialog.c b/src/gdu-gtk/gdu-partition-dialog.c
index e384229..7c28892 100644
--- a/src/gdu-gtk/gdu-partition-dialog.c
+++ b/src/gdu-gtk/gdu-partition-dialog.c
@@ -21,8 +21,8 @@
  */
 
 #include "config.h"
-
 #include <glib/gi18n-lib.h>
+
 #include <gdu/gdu.h>
 #include <gdu-gtk/gdu-gtk.h>
 
diff --git a/src/gdu-gtk/gdu-pool-tree-model.c b/src/gdu-gtk/gdu-pool-tree-model.c
index 62f4d89..e00e0c9 100644
--- a/src/gdu-gtk/gdu-pool-tree-model.c
+++ b/src/gdu-gtk/gdu-pool-tree-model.c
@@ -20,8 +20,9 @@
  * Author: David Zeuthen <davidz redhat com>
  */
 
-#include <config.h>
+#include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include <string.h>
 
 #include "gdu-gtk.h"
diff --git a/src/gdu-gtk/gdu-pool-tree-view.c b/src/gdu-gtk/gdu-pool-tree-view.c
index 5ff92f9..2d4f6b0 100644
--- a/src/gdu-gtk/gdu-pool-tree-view.c
+++ b/src/gdu-gtk/gdu-pool-tree-view.c
@@ -20,8 +20,9 @@
  * Author: David Zeuthen <davidz redhat com>
  */
 
-#include <config.h>
+#include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include <string.h>
 
 #include "gdu-pool-tree-view.h"
diff --git a/src/gdu-gtk/gdu-size-widget.c b/src/gdu-gtk/gdu-size-widget.c
index 3f66aba..1d3ba53 100644
--- a/src/gdu-gtk/gdu-size-widget.c
+++ b/src/gdu-gtk/gdu-size-widget.c
@@ -23,8 +23,8 @@
 #define _GNU_SOURCE
 
 #include "config.h"
-
 #include <glib/gi18n-lib.h>
+
 #include <math.h>
 
 #include "gdu-size-widget.h"
diff --git a/src/gdu-gtk/gdu-spinner.c b/src/gdu-gtk/gdu-spinner.c
index 9484631..82da74c 100644
--- a/src/gdu-gtk/gdu-spinner.c
+++ b/src/gdu-gtk/gdu-spinner.c
@@ -21,9 +21,8 @@
  * by Christian Hergert <christian hergert gmail com>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <gtk/gtk.h>
 #include <math.h>
diff --git a/src/gdu-gtk/gdu-time-label.c b/src/gdu-gtk/gdu-time-label.c
index 27d1c67..04c828f 100644
--- a/src/gdu-gtk/gdu-time-label.c
+++ b/src/gdu-gtk/gdu-time-label.c
@@ -19,8 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include <string.h>
 
 #include "gdu-time-label.h"
diff --git a/src/gdu-gtk/gdu-volume-grid.c b/src/gdu-gtk/gdu-volume-grid.c
index 84a773c..de72344 100644
--- a/src/gdu-gtk/gdu-volume-grid.c
+++ b/src/gdu-gtk/gdu-volume-grid.c
@@ -19,8 +19,10 @@
  * 02111-1307, USA.
  */
 
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <math.h>
-#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 #include <X11/XKBlib.h>
diff --git a/src/gdu/gdu-adapter.c b/src/gdu/gdu-adapter.c
index f8ed27b..3f2df48 100644
--- a/src/gdu/gdu-adapter.c
+++ b/src/gdu/gdu-adapter.c
@@ -19,10 +19,11 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c
index a846646..bf5c88c 100644
--- a/src/gdu/gdu-device.c
+++ b/src/gdu/gdu-device.c
@@ -19,10 +19,11 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/src/gdu/gdu-drive.c b/src/gdu/gdu-drive.c
index 96dfea2..5453097 100644
--- a/src/gdu/gdu-drive.c
+++ b/src/gdu/gdu-drive.c
@@ -19,10 +19,11 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 
 #include "gdu-private.h"
diff --git a/src/gdu/gdu-error.c b/src/gdu/gdu-error.c
index 20b00d1..204c00a 100644
--- a/src/gdu/gdu-error.c
+++ b/src/gdu/gdu-error.c
@@ -19,7 +19,8 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
 
 #include <dbus/dbus-glib.h>
 #include <string.h>
diff --git a/src/gdu/gdu-expander.c b/src/gdu/gdu-expander.c
index 83ae243..121b811 100644
--- a/src/gdu/gdu-expander.c
+++ b/src/gdu/gdu-expander.c
@@ -19,10 +19,11 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/src/gdu/gdu-hub.c b/src/gdu/gdu-hub.c
index ce3af4b..3aa42e3 100644
--- a/src/gdu/gdu-hub.c
+++ b/src/gdu/gdu-hub.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n-lib.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 
diff --git a/src/gdu/gdu-known-filesystem.c b/src/gdu/gdu-known-filesystem.c
index df1f98b..92fdedc 100644
--- a/src/gdu/gdu-known-filesystem.c
+++ b/src/gdu/gdu-known-filesystem.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n-lib.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 
diff --git a/src/gdu/gdu-linux-md-drive.c b/src/gdu/gdu-linux-md-drive.c
index bbdf453..f7ffbad 100644
--- a/src/gdu/gdu-linux-md-drive.c
+++ b/src/gdu/gdu-linux-md-drive.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n-lib.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 
 #include "gdu-private.h"
diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c
index 6621468..e95ce76 100644
--- a/src/gdu/gdu-pool.c
+++ b/src/gdu/gdu-pool.c
@@ -19,7 +19,9 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <dbus/dbus-glib.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/gdu/gdu-port.c b/src/gdu/gdu-port.c
index 8a72b98..fd62b59 100644
--- a/src/gdu/gdu-port.c
+++ b/src/gdu/gdu-port.c
@@ -19,10 +19,12 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/src/gdu/gdu-presentable.c b/src/gdu/gdu-presentable.c
index fb1e886..0645a0f 100644
--- a/src/gdu/gdu-presentable.c
+++ b/src/gdu/gdu-presentable.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n-lib.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 
 #include "gdu-presentable.h"
diff --git a/src/gdu/gdu-process.c b/src/gdu/gdu-process.c
index 78d6806..7a73f25 100644
--- a/src/gdu/gdu-process.c
+++ b/src/gdu/gdu-process.c
@@ -19,10 +19,11 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <stdlib.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <time.h>
 #include <gio/gdesktopappinfo.h>
diff --git a/src/gdu/gdu-util.c b/src/gdu/gdu-util.c
index 73de29e..d157c94 100644
--- a/src/gdu/gdu-util.c
+++ b/src/gdu/gdu-util.c
@@ -19,10 +19,11 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <glib-object.h>
 #include <string.h>
-#include <glib/gi18n-lib.h>
 #include <gnome-keyring.h>
 #include <dbus/dbus-glib.h>
 
diff --git a/src/gdu/gdu-volume-hole.c b/src/gdu/gdu-volume-hole.c
index 484d8c8..b3c5dfe 100644
--- a/src/gdu/gdu-volume-hole.c
+++ b/src/gdu/gdu-volume-hole.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n-lib.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 
diff --git a/src/gdu/gdu-volume.c b/src/gdu/gdu-volume.c
index cb1240a..bf8f9d2 100644
--- a/src/gdu/gdu-volume.c
+++ b/src/gdu/gdu-volume.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n-lib.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 
diff --git a/src/notification/gdu-slow-unmount-dialog.c b/src/notification/gdu-slow-unmount-dialog.c
index 02dea3c..80aeebd 100644
--- a/src/notification/gdu-slow-unmount-dialog.c
+++ b/src/notification/gdu-slow-unmount-dialog.c
@@ -19,7 +19,7 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <glib/gi18n.h>
 
 #include <gdu-gtk/gdu-gtk.h>
diff --git a/src/notification/notification-main.c b/src/notification/notification-main.c
index 5f13e38..18e9672 100644
--- a/src/notification/notification-main.c
+++ b/src/notification/notification-main.c
@@ -19,10 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include <glib/gi18n.h>
 
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
 #include <stdlib.h>
 #include <glib/gstdio.h>
 #include <errno.h>
diff --git a/src/palimpsest/gdu-main.c b/src/palimpsest/gdu-main.c
index fbfbace..76f8bdc 100644
--- a/src/palimpsest/gdu-main.c
+++ b/src/palimpsest/gdu-main.c
@@ -19,11 +19,12 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+#include <glib/gi18n.h>
+
 #include <glib-object.h>
 #include <string.h>
 #include <stdlib.h>
-#include <glib/gi18n.h>
 #include <unique/unique.h>
 
 #include "gdu-shell.h"
diff --git a/src/palimpsest/gdu-section-drive.c b/src/palimpsest/gdu-section-drive.c
index b25ac73..e964caa 100644
--- a/src/palimpsest/gdu-section-drive.c
+++ b/src/palimpsest/gdu-section-drive.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/src/palimpsest/gdu-section-hub.c b/src/palimpsest/gdu-section-hub.c
index ad6fa1f..2709284 100644
--- a/src/palimpsest/gdu-section-hub.c
+++ b/src/palimpsest/gdu-section-hub.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/src/palimpsest/gdu-section-linux-md-drive.c b/src/palimpsest/gdu-section-linux-md-drive.c
index c82bd53..e5155d9 100644
--- a/src/palimpsest/gdu-section-linux-md-drive.c
+++ b/src/palimpsest/gdu-section-linux-md-drive.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/src/palimpsest/gdu-section-volumes.c b/src/palimpsest/gdu-section-volumes.c
index d0e670a..0404b4a 100644
--- a/src/palimpsest/gdu-section-volumes.c
+++ b/src/palimpsest/gdu-section-volumes.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/src/palimpsest/gdu-section.c b/src/palimpsest/gdu-section.c
index a3d0e92..d219971 100644
--- a/src/palimpsest/gdu-section.c
+++ b/src/palimpsest/gdu-section.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/src/palimpsest/gdu-shell.c b/src/palimpsest/gdu-shell.c
index 73b997e..bdbc6a3 100644
--- a/src/palimpsest/gdu-shell.c
+++ b/src/palimpsest/gdu-shell.c
@@ -19,9 +19,10 @@
  * 02111-1307, USA.
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
 #include <glib/gi18n.h>
+
+#include <string.h>
 #include <dbus/dbus-glib.h>
 
 #include <config.h>