* x.h: Remove. Adjust all users. Make sure that global.h is

included instead.  Don't include sys/param.h unconditionally -
rely on global.h taking care of it.
* Makefile.in: Remove x.h.

src/ChangeLog

@@ -1,5 +1,10 @@
 2001-09-03  Pavel Roskin  <proski@gnu.org>
 
+	* x.h: Remove.  Adjust all users.  Make sure that global.h is
+	included instead.  Don't include sys/param.h unconditionally -
+	rely on global.h taking care of it.
+	* Makefile.in: Remove x.h.
+
 	* color.c: Remove unused code.
 	* color.h: Likewise.
 

src/Makefile.in

@@ -44,7 +44,7 @@ HDRS =	color.h file.h mouse.h user.h dialog.h find.h main.h		\
 	hotlist.h layout.h fsusage.h mountlist.h eregex.h complete.h	\
 	myslang.h command.h cmd.h tty.h fs.h panelize.h achown.h	\
 	learn.h listmode.h background.h					\
-	x.h textconf.h i18n.h findme.h popt.h filegui.h keys.h		\
+	textconf.h i18n.h findme.h popt.h filegui.h keys.h		\
 	poptint.h poptalloca.h fileopctx.h treestore.h			\
 	charsets.h selcodepage.h
 

src/achown.c

@@ -19,7 +19,6 @@
 #include <config.h>
 /* Needed for the extern declarations of integer parameters */
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <grp.h>
 #include <pwd.h>

src/background.c

@@ -32,15 +32,12 @@
 #    include <unistd.h>
 #endif
 #include <sys/stat.h>
-#ifdef HAVE_SYS_PARAM_H
-#    include <sys/param.h>
-#endif
 #include <string.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include "tty.h"
-#include "x.h"
+
 #include "global.h"
+#include "tty.h"
 #include "dlg.h"
 #include "widget.h"
 #include "wtools.h"

src/boxes.c

@@ -20,15 +20,15 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include "tty.h"
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <signal.h>
 #include <ctype.h>
+
 #include "global.h"
+#include "tty.h"
 #include "win.h"		/* Our window tools */
 #include "color.h"		/* Color definitions */
 #include "dlg.h"		/* The nice dialog manager */
@@ -47,7 +47,6 @@
 #include "layout.h"		/* for get_nth_panel_name proto */
 #include "fileopctx.h"
 #include "background.h"
-#include "x.h"
 
 #ifdef HAVE_CHARSET
 #include "charsets.h"

src/charsets.c

@@ -7,7 +7,6 @@
 #include <iconv.h>
 
 #include "global.h"
-#include "x.h"
 #include "charsets.h"
 
 int n_codepages = 0;

src/chmod.c

@@ -22,7 +22,6 @@
 #include <errno.h>	/* For errno on SunOS systems	      */
 /* Needed for the extern declarations of integer parameters */
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <grp.h>
 #include <pwd.h>

src/chown.c

@@ -22,7 +22,6 @@
 #include <errno.h>	/* For errno on SunOS systems	      */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <grp.h>
 #include <pwd.h>

src/cmd.c

@@ -31,11 +31,6 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-
-#ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#endif
-
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <string.h>
@@ -54,8 +49,8 @@
 #   include <sys/mman.h>
 #endif
 
-#include "tty.h"
 #include "global.h"
+#include "tty.h"
 #include "dir.h"
 #include "panel.h"
 #include "cmd.h"		/* Our definitions */
@@ -75,14 +70,12 @@
 #include "win.h"		/* do_exit_ca_mode */
 #include "layout.h"		/* get_current/other_type */
 #include "ext.h"		/* regex_command */
-#include "view.h"		/* view */
 #include "key.h"		/* get_key_code */
 #include "help.h"		/* interactive_display */
 #include "boxes.h"		/* cd_dialog */
 #include "color.h"
 #include "user.h"
 #include "setup.h"
-#include "x.h"
 #include "profile.h"
 
 #define MIDNIGHT

src/command.c

@@ -24,9 +24,8 @@
 #include <config.h>
 #include <errno.h>
 #include <string.h>
-#include "tty.h"
-#include "x.h"
 #include "global.h"		/* home_dir */
+#include "tty.h"
 #include "dlg.h"
 #include "widget.h"
 #include "command.h"

src/complete.c

@@ -56,9 +56,8 @@
 #   include <pwd.h>
 #endif
 
-#include "tty.h"
 #include "global.h"
-#include "x.h"
+#include "tty.h"
 #include "win.h"
 #include "color.h"
 #include "dlg.h"

src/dialog.c

@@ -16,13 +16,12 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include "tty.h"
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
 #include <string.h>
 #include "global.h"
-#include "x.h"
+#include "tty.h"
 #include "dialog.h"
 #include "color.h"
 #include "win.h"

src/dir.c

@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include "x.h"
 #include "global.h"
 #include "dir.h"
 #include "dialog.h"

src/dlg.c

@@ -21,10 +21,9 @@
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
-#include "tty.h"
 #include <stdarg.h>
 #include "global.h"
-#include "x.h"
+#include "tty.h"
 #include "menu.h"
 #include "win.h"
 #include "color.h"

src/ext.c

@@ -25,7 +25,6 @@
 # include <io.h>
 #endif
 
-#include "tty.h"
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
@@ -34,6 +33,7 @@
 #include <errno.h>
 
 #include "global.h"
+#include "tty.h"
 #include "user.h"
 #include "main.h"
 #include "dialog.h"
@@ -41,16 +41,12 @@
 #include "view.h"
 #include "main.h"
 #include "../vfs/vfs.h"
-#include "x.h"
 
 #include "cons.saver.h"
 #include "layout.h"
 #ifdef SCO_FLAVOR
 #include <sys/wait.h>
 #endif /* SCO_FLAVOR */
-#ifdef HAVE_GNOME
-#include "gcmd.h"
-#endif
 
 /* If set, we execute the file command to check the file type */
 int use_file_to_check_type = 1;

src/file.c

@@ -65,21 +65,21 @@
 #    include <io.h>
 #endif /* NEEDS_IO_H */
 #include <errno.h>
-#include "tty.h"
 #include <ctype.h>
 #include <string.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <fcntl.h>
 #ifdef SCO_FLAVOR
 #	include <sys/timeb.h>	/* alex: for struct timeb, used in time.h */
 #endif /* SCO_FLAVOR */
 #include <time.h>
 #include <utime.h>
+
 #include "global.h"
+#include "tty.h"
 #include "eregex.h"
 #include "dialog.h"
 #include "setup.h"
@@ -103,8 +103,6 @@
 #include "key.h"
 #include "../vfs/vfs.h"
 
-#include "x.h"
-
 /* }}} */
 
 /* rcsid [] = "$Id$" */

src/filegui.c

@@ -74,13 +74,13 @@
 #   include <unistd.h>
 #endif
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <fcntl.h>
 #ifdef SCO_FLAVOR
 #	include <sys/timeb.h>	/* alex: for struct timeb, used in time.h */
 #endif /* SCO_FLAVOR */
 #include <time.h>
 #include <utime.h>
+
 #include "global.h"
 #include "tty.h"
 #include "eregex.h"
@@ -106,8 +106,6 @@
 #include "key.h"
 #include "../vfs/vfs.h"
 
-#include "x.h"
-
 /* }}} */
 
 /* This structure describes the UI and internal data required by a file

src/find.c

@@ -25,12 +25,11 @@
 #    include <io.h>
 #endif
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <fcntl.h>
 #include <ctype.h>
-#include "tty.h"
-#include "x.h"
+
 #include "global.h"
+#include "tty.h"
 #include "win.h"
 #include "color.h"
 #include "setup.h"

src/fs.h

@@ -6,9 +6,6 @@
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
-#ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#endif
 #include <sys/stat.h>
 
 #ifndef MAXPATHLEN

src/fsusage.c

@@ -21,10 +21,6 @@
 
 #include <sys/types.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #ifdef HAVE_SYS_MOUNT_H
 #include <sys/mount.h>
 #endif
@@ -55,6 +51,7 @@
 #include <sys/statvfs.h>
 #endif
 
+#include "global.h"
 #include "fsusage.h"
 
 

src/help.c

@@ -42,6 +42,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
+
 #include "global.h"
 #include "color.h"
 #include "dialog.h"
@@ -50,7 +51,6 @@
 #include "key.h"	/* For mi_getch() */
 #include "help.h"
 #include "layout.h"		/* keybar_visible */
-#include "x.h"
 #include "dlg.h"		/* For Dlg_head */
 #include "widget.h"		/* For Widget */
 

src/hotlist.c

@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #ifdef SCO_FLAVOR
 #	include <sys/timeb.h>	/* alex: for struct timeb, used in time.h */
@@ -47,8 +46,9 @@
 #ifdef NEEDS_IO_H
 #    include <io.h>
 #endif
-#include "tty.h"
+
 #include "global.h"
+#include "tty.h"
 #include "win.h"
 #include "color.h"
 #include "dlg.h"

src/info.c

@@ -18,11 +18,11 @@
 
 #include <config.h>
 #include <stdio.h>
-#include "tty.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
+
 #include "global.h"
+#include "tty.h"
 #include "mouse.h"		/* Gpm_Event */
 #include "color.h"
 #include "dlg.h"
@@ -33,7 +33,6 @@
 #include "util.h"		/* size_trunc_len */
 #include "layout.h"
 #include "key.h"		/* is_idle() */
-#include "x.h"
 #include "mountlist.h"
 
 #ifndef VERSION

src/key.c

@@ -33,10 +33,10 @@
 #if HAVE_SYS_SELECT_H
 #   include <sys/select.h>
 #endif
-#include "tty.h"
 #include <ctype.h>
 #include <errno.h>
 #include "global.h"
+#include "tty.h"
 #include "mouse.h"
 #include "key.h"
 #include "main.h"
@@ -57,8 +57,6 @@
 #    include <sys/ioctl.h>
 #endif
 
-#include "x.h"
-
 #define GET_TIME(tv)    (gettimeofday(&tv, (struct timezone *)NULL))
 #define DIF_TIME(t1,t2) ((t2.tv_sec -t1.tv_sec) *1000+ \
 			 (t2.tv_usec-t1.tv_usec)/1000)

src/layout.c

@@ -23,7 +23,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/param.h>		/* Required by tree.h */
 #include <sys/types.h>
 #include <sys/stat.h>
 #if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(HAS_NO_TERMIOS_H)
@@ -40,16 +39,15 @@
 #   include <unistd.h>
 #endif
 #include <signal.h>
-#include "tty.h"
+
 #include "global.h"
+#include "tty.h"
 #include "win.h"
 #include "color.h"
 #include "key.h"
-
 #include "dlg.h"
 #include "widget.h"
 #include "command.h"
-
 #include "dialog.h"		/* For do_refresh() */
 #include "profile.h"		/* For sync_profiles() */
 #include "mouse.h"
@@ -71,8 +69,6 @@
 #define WANT_WIDGETS
 #include "setup.h"		/* For save_setup() */
 
-#include "x.h"
-
 /* "$Id$" */
 
 /* Controls the display of the rotating dash on the verbose mode */

src/learn.c

@@ -25,11 +25,11 @@
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <ctype.h>
-#include "tty.h"
+
 #include "global.h"
+#include "tty.h"
 #include "win.h"
 #include "color.h"
 #include "dlg.h"

src/listmode.c

@@ -29,7 +29,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #ifndef HAS_NO_GRP_PWD_H
 #    include <grp.h>

src/main.c

@@ -33,12 +33,10 @@
 #    include <os2.h>
 #endif
 
-#include "tty.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/param.h>
 
 #include <sys/stat.h>
 
@@ -79,17 +77,19 @@
 #include <fcntl.h>	/* For O_RDWR */
 #include <signal.h>
 
-#ifdef HAVE_CORBA
-#    include <libgnorba/gnorba.h>
+#ifdef NEEDS_IO_H
+#    include <io.h>
 #endif
 
-#include <glib.h>
+#ifdef NEEDS_DRIVE_H
+#    include <drive.h>
+#endif
 
 /* Program include files */
-#include "x.h"
+#include "global.h"
+#include "tty.h"
 #include "dir.h"
 #include "color.h"
-#include "global.h"
 #include "dialog.h"
 #include "menu.h"
 #include "file.h"
@@ -122,34 +122,14 @@
 #include "command.h"
 #include "wtools.h"
 #include "complete.h"		/* For the free_completion */
-#ifndef HAVE_X
-#include "textconf.h"
-#endif
 
 #include "chmod.h"
 #include "chown.h"
 
-#ifdef NEEDS_IO_H
-#    include <io.h>
-#endif
-#ifdef NEEDS_DRIVE_H
-#    include <drive.h>
-#endif
-
 #include "../vfs/vfs.h"
-#include "../vfs/extfs.h"
 
 #include "popt.h"
 
-#ifdef HAVE_GNOME
-#include "gcorba.h"
-#include "gmain.h"
-#include "gsession.h"
-#ifdef HAVE_GNOME_WINDOW_ICON
-#    include <libgnomeui/gnome-window-icon.h>
-#endif
-#endif
-
 /* "$Id$" */
 
 /* When the modes are active, left_panel, right_panel and tree_panel */

src/mountlist.c

@@ -34,10 +34,6 @@ void free (void *ptr);
 #include <strings.h>
 #endif
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
@@ -96,6 +92,7 @@ void free (void *ptr);
 #include <sys/fsys.h>
 #endif
 
+#include "global.h"
 #include "mountlist.h"
 #include "fsusage.h"
 #include "util.h"

src/option.c

@@ -21,11 +21,11 @@
 #include <stdio.h>
 /* Needed for the extern declarations of integer parameters */
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
+
 #include "global.h"
 #include "tty.h"
 #include "win.h"

src/panelize.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #ifdef HAVE_SYS_WAIT_H
 #   include <sys/wait.h>
@@ -39,9 +38,8 @@
 
 /* Needed for the extern declarations of integer parameters */
 #define DIR_H_INCLUDE_HANDLE_DIRENT
-#include "tty.h"
-#include "x.h"
 #include "global.h"
+#include "tty.h"
 #include "win.h"
 #include "color.h"
 #include "dlg.h"

src/screen.c

@@ -19,15 +19,15 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include "tty.h"
-#include <sys/param.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>	/* For chdir(), readlink() and getwd()/getcwd() */
 #endif
+
 #include "global.h"
+#include "tty.h"
 #include "dir.h"
 #include "panel.h"
 #include "color.h"
@@ -45,13 +45,10 @@
 #include "profile.h"
 #include "widget.h"
 #include "../vfs/vfs.h"
-#include "../vfs/extfs.h"
 #ifdef NEEDS_DRIVE_H
 # include "drive.h"
 #endif
 
-#include "x.h"
-
 #define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) )
 
 /* If true, show the mini-info on the panel */

src/setup.c

@@ -18,11 +18,11 @@
 #include <config.h>
 #include <sys/types.h>		/* Needed to include local .h files */
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <string.h>
-#include "tty.h"
 #include <stdio.h>
+
 #include "global.h"
+#include "tty.h"
 #include "dir.h"
 #include "panel.h"
 #include "main.h"
@@ -40,11 +40,6 @@
 #include "win.h"		/* lookup_key */
 #include "cmd.h"
 #include "file.h"
-#include "x.h"
-
-#ifdef HAVE_GNOME
-#    include "gdesktop.h"
-#endif
 
 #ifndef PORT_LIST_MODE_NAME
 #     define PORT_LIST_MODE_NAME "list_mode"

src/subshell.c

@@ -43,8 +43,6 @@
 #	include <sys/time.h>	/* select(), gettimeofday(), etc.     */
 #endif /* SCO_FLAVOR */
 #include <sys/stat.h>	/* Required by dir.h & panel.h below  */
-#include <sys/param.h>	/* Required by panel.h below	      */
-#include "tty.h"
 
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>	/* For pipe, fork, setsid, access etc */
@@ -78,12 +76,13 @@
 #   include <unix.h>	/* exec*() from <process.h> */
 #endif
 
+#include "global.h"	/* For home_dir			      */
+#include "tty.h"
 #include "dir.h"	/* Required by panel.h below	      */
 #include "util.h"	/* Required by panel.h		      */
 #include "panel.h"	/* For WPanel and current_panel	      */
 #include "dialog.h"	/* For query_dialog()		      */
 #include "main.h"	/* For cpanel, quit & init_sigchld()  */
-#include "global.h"	/* For home_dir			      */
 #include "cons.saver.h"	/* For handle_console(), etc.	      */
 #include "key.h"	/* XCTRL and ALT macros		      */
 #include "subshell.h"

src/textconf.c

@@ -1,12 +1,11 @@
 /* Print features specific for this build */
 
 #include <config.h>
-#include <sys/param.h>
 #include <stdio.h>
 #include <glib.h>
-#include "i18n.h"
+
+#include "global.h"
 #include "cmd.h"
-#include "textconf.h"
 
 static const char * const features [] =  {
     N_("Edition: "),

src/treestore.c

@@ -36,19 +36,18 @@
 #include <unistd.h>
 #endif
 #include <fcntl.h>
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <string.h>
-#include "global.h"
-#include "x.h"
-#include "treestore.h"
-#include "../vfs/vfs.h"
 #ifdef NEEDS_IO_H
 #   include <io.h>
 #endif
+
+#include "global.h"
+#include "treestore.h"
+#include "../vfs/vfs.h"
 #include "profile.h"
 #include "setup.h"
 

src/user.c

@@ -20,13 +20,13 @@
 #ifdef NEEDS_IO_H
 #    include <io.h>
 #endif
-#include "tty.h"
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+
 #include "global.h"
-#include "x.h"
+#include "tty.h"
 #include "dialog.h"
 #include "color.h"
 #include "dir.h"

src/util.c

@@ -36,7 +36,6 @@
 #ifndef SCO_FLAVOR
 #	include <sys/time.h>	/* alex: sys/select.h defines struct timeval */
 #endif /* SCO_FLAVOR */
-#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdarg.h>
@@ -64,19 +63,18 @@
 #  include <sys/ioctl.h>
 #endif
 
-#include "mountlist.h"
-
 #if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
 #include <rx.h>
 #else
 #include <regex.h>
 #endif
+
 #include "global.h"
-#include "x.h"
 #include "profile.h"
 #include "main.h"		/* mc_home */
 #include "cmd.h"		/* guess_message_value */
 #include "../vfs/vfs.h"
+#include "mountlist.h"
 
 #ifdef HAVE_CHARSET
 #include "charsets.h"

src/utilunix.c

@@ -31,7 +31,6 @@
 #include <signal.h>		/* my_system */
 #include <limits.h>		/* INT_MAX */
 #include <sys/time.h>		/* select: timeout */
-#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdarg.h>
@@ -61,12 +60,12 @@
 #ifdef __QNX__
 #   include <unix.h>		/* exec*() from <process.h> */
 #endif
+
 #include "global.h"
 #include "fsusage.h"
 #include "mountlist.h"
 #include "dialog.h"		/* message() */
 #include "../vfs/vfs.h"		/* mc_read() */
-#include "x.h"
 
 struct sigaction startup_handler;
 

src/view.c

@@ -46,11 +46,14 @@
 #include <ctype.h>	/* For toupper() */
 #include <errno.h>
 #include <limits.h>
-#include <sys/param.h>
+#if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
+#    include <rx.h>
+#else
+#    include <regex.h>
+#endif
 
 #include "global.h"
 #include "tty.h"
-#include "x.h"
 #include "cmd.h"		/* For view_other_cmd */
 #include "dlg.h"		/* Needed by widget.h */
 #include "widget.h"		/* Needed for buttonbar_new */
@@ -62,11 +65,6 @@
 #include "layout.h"
 #include "setup.h"
 #include "wtools.h"		/* For query_set_sel() */
-#if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
-#    include <rx.h>
-#else
-#    include <regex.h>
-#endif
 #include "../vfs/vfs.h"
 #include "dir.h"
 #include "panel.h" /* Needed for current_panel and other_panel */

src/widget.c

@@ -31,9 +31,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "tty.h"
 #include <ctype.h>
 #include "global.h"
+#include "tty.h"
 #include "color.h"
 #include "mouse.h"
 #include "dlg.h"
@@ -41,7 +41,6 @@
 #include "win.h"
 #include "complete.h"
 #include "key.h"		/* XCTRL and ALT macros  */
-#include "x.h"
 #include "profile.h"	/* for history loading and saving */
 
 #ifndef HAVE_X

src/wtools.c

@@ -33,9 +33,10 @@
 #include <config.h>
 #include <string.h>
 #include <stdio.h>
-#include "tty.h"
 #include <stdarg.h>
+
 #include "global.h"
+#include "tty.h"
 #include "win.h"
 #include "color.h"
 #include "mouse.h"
@@ -46,7 +47,6 @@
 #include "key.h"	/* For mi_getch() */
 #include "dialog.h"	/* For do_refresh() */
 #include "complete.h"   /* INPUT_COMPLETE_CD */
-#include "x.h"
 
 /* }}} */
 

src/x.h

@@ -1,6 +0,0 @@
-#ifndef __X_H
-#define __X_H
-
-#include "global.h"
-
-#endif /* __X_H */