7 files changed, 64 insertions, 67 deletions

diff --git a/common/Makefile.am.inc b/common/Makefile.am.inc
index e9d57aad..167fd00a 100644
--- a/common/Makefile.am.inc
+++ b/common/Makefile.am.inc
@@ -102,53 +102,53 @@ CLEANFILES += $(nodist_libflatpak_common_la_SOURCES)
 
 libflatpak_common_la_SOURCES = \
 	$(flatpakinclude_HEADERS) \
-	common/flatpak-common-types-private.h \
-	common/flatpak-appdata.c \
 	common/flatpak-appdata-private.h \
-	common/flatpak-auth.c \
+	common/flatpak-appdata.c \
 	common/flatpak-auth-private.h \
-	common/flatpak-bwrap.c \
+	common/flatpak-auth.c \
+	common/flatpak-bundle-ref.c \
 	common/flatpak-bwrap-private.h \
-	common/flatpak-dir.c \
-	common/flatpak-dir-private.h \
-	common/flatpak-run.c \
-	common/flatpak-run-private.h \
-	common/flatpak-context.c \
+	common/flatpak-bwrap.c \
+	common/flatpak-chain-input-stream-private.h \
+	common/flatpak-chain-input-stream.c \
+	common/flatpak-common-types-private.h \
 	common/flatpak-context-private.h \
-	common/flatpak-exports.c \
+	common/flatpak-context.c \
+	common/flatpak-dir-private.h \
+	common/flatpak-dir.c \
+	common/flatpak-error.c \
 	common/flatpak-exports-private.h \
-	common/flatpak-transaction-private.h \
-	common/flatpak-transaction.h \
-	common/flatpak-transaction.c \
-	common/flatpak-utils.c \
-	common/flatpak-utils-http.c \
-	common/flatpak-utils-http-private.h \
-	common/flatpak-utils-private.h \
-	common/flatpak-chain-input-stream.c \
-	common/flatpak-chain-input-stream-private.h \
-	common/flatpak-portal-error.c \
-	common/flatpak-portal-error.h \
-	common/flatpak-json.c \
-	common/flatpak-json-private.h \
-	common/flatpak-json-oci.c \
+	common/flatpak-exports.c \
+	common/flatpak-installation-private.h \
+	common/flatpak-installation.c \
+	common/flatpak-installed-ref-private.h \
+	common/flatpak-installed-ref.c \
+	common/flatpak-instance-private.h \
+	common/flatpak-instance.c \
 	common/flatpak-json-oci-private.h \
-	common/flatpak-oci-registry.c \
+	common/flatpak-json-oci.c \
+	common/flatpak-json-private.h \
+	common/flatpak-json.c \
 	common/flatpak-oci-registry-private.h \
+	common/flatpak-oci-registry.c \
+	common/flatpak-portal-error.c \
+	common/flatpak-portal-error.h \
 	common/flatpak-ref.c \
-	common/flatpak-installed-ref.c \
-	common/flatpak-installed-ref-private.h \
-	common/flatpak-instance-private.h \
-	common/flatpak-remote-ref.c \
-	common/flatpak-remote-ref-private.h \
-	common/flatpak-bundle-ref.c \
-	common/flatpak-related-ref.c \
 	common/flatpak-related-ref-private.h \
+	common/flatpak-related-ref.c \
 	common/flatpak-remote-private.h \
+	common/flatpak-remote-ref-private.h \
+	common/flatpak-remote-ref.c \
 	common/flatpak-remote.c \
-	common/flatpak-error.c \
-	common/flatpak-installation-private.h \
-	common/flatpak-installation.c \
-	common/flatpak-instance.c \
+	common/flatpak-run-private.h \
+	common/flatpak-run.c \
+	common/flatpak-transaction-private.h \
+	common/flatpak-transaction.c \
+	common/flatpak-transaction.h \
+	common/flatpak-utils-http-private.h \
+	common/flatpak-utils-http.c \
+	common/flatpak-utils-private.h \
+	common/flatpak-utils.c \
 	common/valgrind-private.h \
 	$(NULL)
 
diff --git a/common/flatpak-dir-private.h b/common/flatpak-dir-private.h
index 46f59fa8..26ee13b4 100644
--- a/common/flatpak-dir-private.h
+++ b/common/flatpak-dir-private.h
@@ -23,10 +23,9 @@
 
 #include <ostree.h>
 
+#include "flatpak-common-types-private.h"
+#include "flatpak-context-private.h"
 #include "libglnx/libglnx.h"
-#include <flatpak-common-types-private.h>
-#include <flatpak-context-private.h>
-
 
 /* Version history:
  * The version field was added in flatpak 1.2, anything before is 0.
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 989a2353..b6de890a 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -23,12 +23,13 @@
 
 #include "config.h"
 
-#include <string.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/file.h>
-#include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <utime.h>
 
 #include <glib/gi18n-lib.h>
@@ -39,22 +40,20 @@
 
 #include <gio/gio.h>
 #include <gio/gunixsocketaddress.h>
-#include "libglnx/libglnx.h"
-#include "flatpak-error.h"
 #include <ostree.h>
 
 #ifdef USE_SYSTEM_HELPER
 #include <polkit/polkit.h>
 #endif
 
+#include "flatpak-appdata-private.h"
 #include "flatpak-dir-private.h"
-#include "flatpak-utils-base-private.h"
+#include "flatpak-error.h"
 #include "flatpak-oci-registry-private.h"
 #include "flatpak-ref.h"
 #include "flatpak-run-private.h"
-#include "flatpak-appdata-private.h"
-
-#include "errno.h"
+#include "flatpak-utils-base-private.h"
+#include "libglnx/libglnx.h"
 
 #ifdef HAVE_LIBMALCONTENT
 #include <libmalcontent/malcontent.h>
diff --git a/common/flatpak-installation.c b/common/flatpak-installation.c
index 3edd2fb1..0cf0e46b 100644
--- a/common/flatpak-installation.c
+++ b/common/flatpak-installation.c
@@ -27,19 +27,19 @@
 #include <ostree.h>
 #include <ostree-repo-finder-avahi.h>
 
+#include "flatpak-dir-private.h"
+#include "flatpak-enum-types.h"
+#include "flatpak-error.h"
 #include "flatpak-installation-private.h"
-#include "flatpak-utils-private.h"
 #include "flatpak-installation.h"
 #include "flatpak-installed-ref-private.h"
-#include "flatpak-transaction-private.h"
+#include "flatpak-instance-private.h"
 #include "flatpak-related-ref-private.h"
 #include "flatpak-remote-private.h"
 #include "flatpak-remote-ref-private.h"
-#include "flatpak-enum-types.h"
-#include "flatpak-dir-private.h"
 #include "flatpak-run-private.h"
-#include "flatpak-instance-private.h"
-#include "flatpak-error.h"
+#include "flatpak-transaction-private.h"
+#include "flatpak-utils-private.h"
 
 /**
  * SECTION:flatpak-installation
diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c
index cbb6426a..135e1140 100644
--- a/common/flatpak-transaction.c
+++ b/common/flatpak-transaction.c
@@ -24,11 +24,11 @@
 #include <glib/gi18n-lib.h>
 #include <libsoup/soup.h>
 
-#include "flatpak-transaction-private.h"
+#include "flatpak-auth-private.h"
+#include "flatpak-error.h"
 #include "flatpak-installation-private.h"
+#include "flatpak-transaction-private.h"
 #include "flatpak-utils-private.h"
-#include "flatpak-error.h"
-#include "flatpak-auth-private.h"
 
 /**
  * SECTION:flatpak-transaction
diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
index e72a6910..a1a9316e 100644
--- a/common/flatpak-utils.c
+++ b/common/flatpak-utils.c
@@ -20,14 +20,6 @@
 
 #include "config.h"
 
-#include "flatpak-utils-private.h"
-#include "flatpak-error.h"
-#include "flatpak-dir-private.h"
-#include "flatpak-oci-registry-private.h"
-#include "flatpak-run-private.h"
-#include "flatpak-utils-base-private.h"
-#include "valgrind-private.h"
-
 #include <glib/gi18n-lib.h>
 
 #include <string.h>
@@ -47,10 +39,17 @@
 #include <termios.h>
 
 #include <glib.h>
-#include "libglnx/libglnx.h"
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
 
+#include "flatpak-dir-private.h"
+#include "flatpak-error.h"
+#include "flatpak-oci-registry-private.h"
+#include "flatpak-run-private.h"
+#include "flatpak-utils-base-private.h"
+#include "flatpak-utils-private.h"
+#include "libglnx/libglnx.h"
+#include "valgrind-private.h"
 
 /* This is also here so the common code can report these errors to the lib */
 static const GDBusErrorEntry flatpak_error_entries[] = {
diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c
index a6eeac47..8d11f181 100644
--- a/system-helper/flatpak-system-helper.c
+++ b/system-helper/flatpak-system-helper.c
@@ -36,10 +36,10 @@
 
 #include "flatpak-dbus-generated.h"
 #include "flatpak-dir-private.h"
-#include "flatpak-oci-registry-private.h"
 #include "flatpak-error.h"
-#include "flatpak-utils-private.h"
+#include "flatpak-oci-registry-private.h"
 #include "flatpak-utils-base-private.h"
+#include "flatpak-utils-private.h"
 
 static PolkitAuthority *authority = NULL;
 static FlatpakSystemHelper *helper = NULL;