diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index 9db3a3e2d..4a2719dff 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-19  Pavel Roskin  <proski@gnu.org>
+
+	* gcorba.c: Include "global.h".
+	* gdesktop-init.c: Don't include <libgnome/libgnome.h>.
+	* gprint.c: Likewise.
+	* gdnd.c: Don't include <gdk/gdkprivate.h>.
+	* gmount.c (option_has_user) [!MOUNTED_GETMNTENT1]: Disable,
+	it's usused.
+
 2001-08-12  Pavel Roskin  <proski@gnu.org>
 
 	* gmc-window.c: Remove.
diff --git a/gnome/gcorba.c b/gnome/gcorba.c
index b01cbe851..3adf8d324 100644
--- a/gnome/gcorba.c
+++ b/gnome/gcorba.c
@@ -8,9 +8,10 @@
  */
 
 #include <config.h>
+#include "global.h"
+#include <libgnorba/gnorba.h>
 #include "panel.h"
 #include "../vfs/vfs.h"
-#include <libgnorba/gnorba.h>
 #include "FileManager.h"
 #include "gcorba.h"
 #include "gdesktop.h"
diff --git a/gnome/gdesktop-init.c b/gnome/gdesktop-init.c
index 8ba0161d8..39c21c4eb 100644
--- a/gnome/gdesktop-init.c
+++ b/gnome/gdesktop-init.c
@@ -7,7 +7,6 @@
 
 #include <config.h>
 #include <unistd.h>
-#include <libgnome/libgnome.h>
 #include "x.h"
 #include "main.h"
 #include "util.h"
diff --git a/gnome/gdnd.c b/gnome/gdnd.c
index 0feb47473..adb853902 100644
--- a/gnome/gdnd.c
+++ b/gnome/gdnd.c
@@ -9,7 +9,6 @@
 #include <config.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <gdk/gdkprivate.h>
 #include "global.h"
 #include "x.h"
 #include "file.h"
diff --git a/gnome/gmount.c b/gnome/gmount.c
index 4e9b38894..cd9977b1d 100644
--- a/gnome/gmount.c
+++ b/gnome/gmount.c
@@ -110,6 +110,8 @@ typedef struct {
 
 
 
+#ifdef MOUNTED_GETMNTENT1
+
 static gboolean
 option_has_user (char *str)
 {
@@ -124,10 +126,6 @@ option_has_user (char *str)
 	return FALSE;
 }
 
-
-
-#ifdef MOUNTED_GETMNTENT1
-
 /* Returns whether the mount entry has the owner flag and our euid matches the
  * device file.
  */
@@ -269,7 +267,7 @@ mount_point_to_device (char *mount_point)
 
 
 
-#else
+#else /* !MOUNTED_GETMNTENT1 */
 
 char *
 is_block_device_mountable (char *mount_point)
@@ -294,7 +292,7 @@ mount_point_to_device (char *mount_point)
 {
 	return NULL;
 }
-#endif
+#endif /* !MOUNTED_GETMNTENT1 */
 
 
 
diff --git a/gnome/gprint.c b/gnome/gprint.c
index e21d77d1c..cd9d02a42 100644
--- a/gnome/gprint.c
+++ b/gnome/gprint.c
@@ -6,7 +6,6 @@
  */
 
 #include <config.h>
-#include <libgnome/libgnome.h>
 #include "x.h"
 #include "main.h"
 #include "util.h"