From 7ba1e1aa4cc950e23b116ba37283bf76ace483a5 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Fri, 15 Jun 2001 23:28:07 +0000
Subject: [PATCH] * gdesktop-icon.c: Reorder includes - local after system. *
 gdesktop-prefs.c: Likewise. * gsession.c: Likewise. * gdesktop-init.c:
 Likewise. Include "x.h". * gdnd.c: Likewise. * gprint.c: Likewise.

---
 gnome/ChangeLog        | 7 +++++++
 gnome/gdesktop-icon.c  | 2 +-
 gnome/gdesktop-init.c  | 3 ++-
 gnome/gdesktop-prefs.c | 2 +-
 gnome/gdnd.c           | 3 ++-
 gnome/gprint.c         | 3 ++-
 gnome/gsession.c       | 2 +-
 7 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index 3f1fc1eea..84e01a30f 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,5 +1,12 @@
 2001-06-15  Pavel Roskin  <proski@gnu.org>
 
+	* gdesktop-icon.c: Reorder includes - local after system.
+	* gdesktop-prefs.c: Likewise.
+	* gsession.c: Likewise.
+	* gdesktop-init.c: Likewise. Include "x.h".
+	* gdnd.c: Likewise.
+	* gprint.c: Likewise.
+
 	* gcmd.c (get_nickname): Warning fix - label at the end of
 	`case' statement.
 	(gnome_external_panelize): Likewise.
diff --git a/gnome/gdesktop-icon.c b/gnome/gdesktop-icon.c
index dbb194346..a54ac99e4 100644
--- a/gnome/gdesktop-icon.c
+++ b/gnome/gdesktop-icon.c
@@ -6,12 +6,12 @@
  */
 
 #include <config.h>
-#include "gdesktop.h"
 #include <gnome.h>
 #include <sys/stat.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <gdk/gdkx.h>
+#include "gdesktop.h"
 #include "gdesktop-icon.h"
 #include "dir.h"
 
diff --git a/gnome/gdesktop-init.c b/gnome/gdesktop-init.c
index 5d3b087e2..c32094edb 100644
--- a/gnome/gdesktop-init.c
+++ b/gnome/gdesktop-init.c
@@ -7,9 +7,10 @@
 
 #include <config.h>
 #include <unistd.h>
+#include <libgnome/libgnome.h>
+#include "x.h"
 #include "main.h"
 #include "util.h"
-#include <libgnome/libgnome.h>
 #include "gdesktop.h"
 #include "gdesktop-init.h"
 #include "gprint.h"
diff --git a/gnome/gdesktop-prefs.c b/gnome/gdesktop-prefs.c
index 34a4ad994..5f74204db 100644
--- a/gnome/gdesktop-prefs.c
+++ b/gnome/gdesktop-prefs.c
@@ -6,8 +6,8 @@
  */
 
 #include <config.h>
-#include "gdesktop.h"
 #include <gnome.h>
+#include "gdesktop.h"
 #include "gdesktop-prefs.h"
 
 
diff --git a/gnome/gdnd.c b/gnome/gdnd.c
index cda1fe469..260ecef49 100644
--- a/gnome/gdnd.c
+++ b/gnome/gdnd.c
@@ -9,7 +9,9 @@
 #include <config.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <gdk/gdkprivate.h>
 #include "global.h"
+#include "x.h"
 #include "file.h"
 #include "fileopctx.h"
 #include "main.h"
@@ -17,7 +19,6 @@
 #include "ext.h"
 #include "gscreen.h"
 #include "../vfs/vfs.h"
-#include <gdk/gdkprivate.h>
 #include "gdesktop.h"
 #include "gdnd.h"
 #include "gmain.h"
diff --git a/gnome/gprint.c b/gnome/gprint.c
index 8fa4ce5d9..e21d77d1c 100644
--- a/gnome/gprint.c
+++ b/gnome/gprint.c
@@ -6,9 +6,10 @@
  */
 
 #include <config.h>
+#include <libgnome/libgnome.h>
+#include "x.h"
 #include "main.h"
 #include "util.h"
-#include <libgnome/libgnome.h>
 #include "gdesktop.h"
 #include "gprint.h"
 
diff --git a/gnome/gsession.c b/gnome/gsession.c
index 1029f9ee4..1e8c3b8ec 100644
--- a/gnome/gsession.c
+++ b/gnome/gsession.c
@@ -7,13 +7,13 @@
  */
 
 #include <config.h>
+#include <gnome.h>
 #include "main.h"
 #include "../vfs/vfs.h"
 #include "gcmd.h"
 #include "gmain.h"
 #include "gscreen.h"
 #include "gsession.h"
-#include <gnome.h>
 
 
 /* Whether we are session managed or not */