Cleanups

Sort #includes a bit better, and don't include platform-specific
headers in gio.h.

gio/gcredentials.c

@@ -23,10 +23,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <gobject/gvaluecollector.h>
-
-#include "gcredentials.h"
-#include "gioerror.h"
 
 #ifdef __linux__
 #define __USE_GNU
@@ -36,6 +32,11 @@
 #include <string.h>
 #endif
 
+#include <gobject/gvaluecollector.h>
+
+#include "gcredentials.h"
+#include "gioerror.h"
+
 #include "glibintl.h"
 #include "gioalias.h"
 

gio/gdbus-tool.c

@@ -22,11 +22,11 @@
 
 #include "config.h"
 
+#include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 #include <gio/gio.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #include <gi18n.h>
 

gio/gdbusauth.c

@@ -22,11 +22,14 @@
 
 #include "config.h"
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #include "gdbusauth.h"
+
 #include "gdbusauthmechanismanon.h"
 #include "gdbusauthmechanismexternal.h"
 #include "gdbusauthmechanismsha1.h"
-
 #include "gdbusauthobserver.h"
 
 #include "gdbuserror.h"
@@ -36,16 +39,14 @@
 #include "gdbusprivate.h"
 
 #ifdef G_OS_UNIX
-#include <gio/gunixconnection.h>
+#include "gunixconnection.h"
 #include "gunixcredentialsmessage.h"
-#include <sys/types.h>
-#include <sys/socket.h>
 #endif
 
 #include "glibintl.h"
 #include "gioalias.h"
 
-#define DEBUG_ENABLED 1
+#define DEBUG_ENABLED 0
 
 static void
 debug_print (const gchar *message, ...)

gio/gdbusauthmechanismexternal.c

@@ -23,17 +23,16 @@
 #include "config.h"
 
 #include <string.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include "gdbusauthmechanismexternal.h"
 #include "gcredentials.h"
 #include "gdbuserror.h"
 #include "gioenumtypes.h"
 
-#ifdef G_OS_UNIX
-#include <sys/types.h>
-#include <unistd.h>
-#endif
-
 #include "glibintl.h"
 #include "gioalias.h"
 

gio/gdbusauthmechanismsha1.c

@@ -23,6 +23,14 @@
 #include "config.h"
 
 #include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <glib/gstdio.h>
 
 #include "gdbusauthmechanismsha1.h"
 #include "gcredentials.h"
@@ -30,16 +38,6 @@
 #include "gioenumtypes.h"
 #include "gioerror.h"
 
-#ifdef G_OS_UNIX
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#endif
-
-#include <errno.h>
-
-#include <glib/gstdio.h>
-
 #include "glibintl.h"
 #include "gioalias.h"
 

gio/gdbusconnection.c

@@ -101,6 +101,10 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include "gdbusauth.h"
 #include "gdbusutils.h"
@@ -121,10 +125,8 @@
 #include "gsimpleasyncresult.h"
 
 #ifdef G_OS_UNIX
-#include <gio/gunixconnection.h>
+#include "gunixconnection.h"
-#include <gio/gunixfdmessage.h>
+#include "gunixfdmessage.h"
-#include <unistd.h>
-#include <sys/types.h>
 #endif
 
 #include "glibintl.h"

gio/gdbusmessage.c

@@ -23,6 +23,12 @@
 #include "config.h"
 
 #include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include "gdbusutils.h"
 #include "gdbusmessage.h"
@@ -39,11 +45,6 @@
 
 #ifdef G_OS_UNIX
 #include "gunixfdlist.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
 #endif
 
 #include "glibintl.h"

gio/gdbusprivate.c

@@ -24,11 +24,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-
+#ifdef HAVE_UNISTD_H
-#ifdef G_OS_UNIX
-#include <gio/gunixconnection.h>
-#include <gio/gunixfdmessage.h>
-#include "gunixcredentialsmessage.h"
 #include <unistd.h>
 #endif
 
@@ -45,9 +41,9 @@
 #include "gsocketcontrolmessage.h"
 
 #ifdef G_OS_UNIX
-#include <unistd.h>
 #include "gunixfdmessage.h"
 #include "gunixconnection.h"
+#include "gunixcredentialsmessage.h"
 #endif
 
 #include "glibintl.h"

gio/gdbusproxywatching.c

@@ -31,7 +31,6 @@
 #include "gdbuserror.h"
 #include "gdbusprivate.h"
 #include "gdbusproxy.h"
-#include "gdbusnamewatching.h"
 #include "gcancellable.h"
 
 #include "glibintl.h"

gio/gdbusserver.c

@@ -25,6 +25,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include "giotypes.h"
 #include "gdbusaddress.h"
@@ -39,7 +42,6 @@
 #include "gsocketservice.h"
 
 #ifdef G_OS_UNIX
-#include <unistd.h>
 #include "gunixsocketaddress.h"
 #endif
 

gio/gio.h

@@ -110,7 +110,6 @@
 #include <gio/gdbusmethodinvocation.h>
 #include <gio/gdbusserver.h>
 #include <gio/gcredentials.h>
-#include <gio/gunixcredentialsmessage.h>
 #include <gio/gdbusauthobserver.h>
 
 #undef __GIO_GIO_H_INSIDE__