diff --git a/src/ChangeLog b/src/ChangeLog
index b10c86281..fd6c8f15c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-15  Pavel Roskin  <proski@gnu.org>
+
+	* cmd.c [HAVE_X]: Disable source routing dialog and panel
+	comparison.
+	* main.c (ctl_x_map): Simplify preprocessor directives.
+
 2001-07-14  Pavel Roskin  <proski@gnu.org>
 
 	* screen.c (panel_keymap) [HAVE_X]: Disable Alt-H - it's not
diff --git a/src/cmd.c b/src/cmd.c
index 29af719ef..e7473d01e 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -742,7 +742,6 @@ void reselect_vfs (void)
     g_free (target);
 }
 #endif /* USE_VFS */
-#endif /* !HAVE_X */
 
 static int compare_files (char *name1, char *name2, long size)
 {
@@ -880,7 +879,6 @@ void compare_dirs_cmd (void)
     }
 }
 
-#ifndef HAVE_X
 void history_cmd (void)
 {
     Listbox *listbox;
@@ -1325,6 +1323,7 @@ char *get_random_hint (void)
     return result;
 }
 
+#ifndef HAVE_X
 #ifdef USE_NETCODE
 
 static char *machine_str = N_(" Enter machine name (F1 for details): ");
@@ -1400,7 +1399,6 @@ void source_routing (void)
 #endif /* HAVE_SETSOCKOPT */
 #endif /* USE_NETCODE */
 
-#ifndef HAVE_X
 #ifdef USE_EXT2FSLIB
 void undelete_cmd (void)
 {
diff --git a/src/main.c b/src/main.c
index 1495e9d0c..fc063dd26 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1750,12 +1750,12 @@ static const key_map ctl_x_map [] = {
     { 'q',          quick_cmd_no_menu },
     { 'h',          add2hotlist_cmd },
     { '!',          external_panelize },
-#if defined(WITH_BACKGROUND) && !defined(HAVE_GNOME)
+#ifdef WITH_BACKGROUND
     { 'j',          jobs_cmd },
-#endif
+#endif /* WITH_BACKGROUND */
 #ifdef HAVE_SETSOCKOPT
     { '%',          source_routing },
-#endif
+#endif /* HAVE_SETSOCKOPT */
     { 0,  0 }
 };