diff --git a/src/ChangeLog b/src/ChangeLog
index 5964d6696..a13f265ad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,16 @@
 2001-06-15  Pavel Roskin  <proski@gnu.org>
 
+	* background.c: Include "x.h".
+	* panelize.c: Likewise.
+	* treestore.c: Likewise.
+	* user.c: Likewise.
+	* util.c: Likewise.
+	* command.c: Reorder includes. Include "x.h".
+	* complete.c: Likewise.
+	* find.c: Likewise.
+	* user.h: Declare user_menu_cmd() inconditionally.
+	* i18n.h [GAVE_GNOME]: Remove code that is now in x.h.
+
 	* tty.h [HAVE_X]: Define beep() to gdk_beep().
 
 2001-06-14  Pavel Roskin  <proski@gnu.org>
diff --git a/src/background.c b/src/background.c
index fb9b18140..ec4e45bb7 100644
--- a/src/background.c
+++ b/src/background.c
@@ -37,6 +37,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include "tty.h"
+#include "x.h"
 #include "global.h"
 #include "dlg.h"
 #include "widget.h"
diff --git a/src/command.c b/src/command.c
index fd73a0160..687792fad 100644
--- a/src/command.c
+++ b/src/command.c
@@ -23,8 +23,9 @@
 
 #include <config.h>
 #include <errno.h>
-#include "tty.h"
 #include <string.h>
+#include "tty.h"
+#include "x.h"
 #include "global.h"		/* home_dir */
 #include "dlg.h"
 #include "widget.h"
diff --git a/src/complete.c b/src/complete.c
index 459db630b..dac99a6d0 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -20,7 +20,6 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include "tty.h"
 #include <stdio.h>
 #include <string.h>
 #ifdef HAVE_UNISTD_H
@@ -57,7 +56,9 @@
 #   include <pwd.h>
 #endif
 
+#include "tty.h"
 #include "global.h"
+#include "x.h"
 #include "win.h"
 #include "color.h"
 #include "dlg.h"
diff --git a/src/find.c b/src/find.c
index 1f6bb142a..35cca888f 100644
--- a/src/find.c
+++ b/src/find.c
@@ -19,7 +19,6 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include "tty.h"
 #include <string.h>
 #include <stdio.h>
 #ifdef NEEDS_IO_H
@@ -29,6 +28,8 @@
 #include <sys/param.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include "tty.h"
+#include "x.h"
 #include "global.h"
 #include "win.h"
 #include "color.h"
diff --git a/src/i18n.h b/src/i18n.h
index ddb89ffe7..0068daf68 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -6,10 +6,7 @@
 #undef ENABLE_NLS
 #endif
 
-#ifdef HAVE_GNOME
-#    define GNOME_REGEX_H
-#    include <gnome.h>
-#else
+#ifndef HAVE_GNOME
 #    ifdef ENABLE_NLS
 #    	 include <libintl.h>
 #    	 define _(String) gettext (String)
@@ -28,6 +25,6 @@
 #    	 define _(String) (String)
 #    	 define N_(String) (String)
 #    endif
-#endif
+#endif /* !HAVE_GNOME */
 
 #endif /* _MC_I18N_H_ */
diff --git a/src/panelize.c b/src/panelize.c
index fa5186723..2db7b46fc 100644
--- a/src/panelize.c
+++ b/src/panelize.c
@@ -37,6 +37,7 @@
 #   include <pwd.h>
 #endif
 #include "tty.h"
+#include "x.h"
 #include "global.h"
 #include "win.h"
 #include "color.h"
diff --git a/src/treestore.c b/src/treestore.c
index 76f2137d0..5302789f7 100644
--- a/src/treestore.c
+++ b/src/treestore.c
@@ -43,6 +43,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "global.h"
+#include "x.h"
 #include "treestore.h"
 #include "../vfs/vfs.h"
 #ifdef NEEDS_IO_H
diff --git a/src/user.c b/src/user.c
index 7c904a795..781954d32 100644
--- a/src/user.c
+++ b/src/user.c
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include "global.h"
+#include "x.h"
 #include "dialog.h"
 #include "color.h"
 #include "dir.h"
diff --git a/src/user.h b/src/user.h
index 9517f102e..771fe2b02 100644
--- a/src/user.h
+++ b/src/user.h
@@ -6,9 +6,9 @@
 #define MIDNIGHT
 #include "../gtkedit/edit-widget.h"
 #undef MIDNIGHT
-void user_menu_cmd (WEdit *edit_widget);
 #endif
 
+void user_menu_cmd (WEdit *edit_widget);
 char *expand_format (char, int);
 int check_format_view (const char *);
 int check_format_var (const char *, char **);
diff --git a/src/util.c b/src/util.c
index 2f69a0a59..649a0a32e 100644
--- a/src/util.c
+++ b/src/util.c
@@ -72,6 +72,7 @@
 #include <regex.h>
 #endif
 #include "global.h"
+#include "x.h"
 #include "profile.h"
 #include "user.h"		/* expand_format */
 #include "main.h"		/* mc_home */