diff --git a/ChangeLog b/ChangeLog
index d8c440355a8..f50cec1cda8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* configure.in: Remove all references to LIBX11_SYSTEM.
+
 2010-03-30  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* configure.in: Remove all references to C_DEBUG_SWITCH.
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 3d942b375e5..a50a2ab6100 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -234,7 +234,6 @@ LD_SWITCH_X_DEFAULT
 LIBS_MACHINE
 LIBS_SYSTEM
 LIBS_TERMCAP
-LIBX11_SYSTEM
 LIBXMU
 LIB_GCC
 LIB_MATH
diff --git a/configure b/configure
index 7d0662ce346..e63b74b8780 100755
--- a/configure
+++ b/configure
@@ -5796,10 +5796,7 @@ configure___ c_switch_machine=C_SWITCH_MACHINE
 #define LIB_X11_LIB -lX11
 #endif
 
-#ifndef LIBX11_SYSTEM
-#define LIBX11_SYSTEM
-#endif
-configure___ LIBX=LIB_X11_LIB LIBX11_SYSTEM
+configure___ LIBX=LIB_X11_LIB
 
 #ifdef UNEXEC
 configure___ unexec=UNEXEC
diff --git a/configure.in b/configure.in
index fc7c0a93235..515b779b52b 100644
--- a/configure.in
+++ b/configure.in
@@ -865,10 +865,7 @@ configure___ c_switch_machine=C_SWITCH_MACHINE
 #define LIB_X11_LIB -lX11
 #endif
 
-#ifndef LIBX11_SYSTEM
-#define LIBX11_SYSTEM
-#endif
-configure___ LIBX=LIB_X11_LIB LIBX11_SYSTEM
+configure___ LIBX=LIB_X11_LIB
 
 #ifdef UNEXEC
 configure___ unexec=UNEXEC
diff --git a/src/ChangeLog b/src/ChangeLog
index aea5701ec9c..08c40c6048c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,24 +1,31 @@
+2010-04-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	Remove all uses of LIBX11_SYSTEM.
+	* Makefile.in (LIBX11_SYSTEM): Remove.
+	* s/msdos.h (LIBX11_SYSTEM): Do not define, define LIBS_SYSTEM
+	instead.
+
 2010-04-01  Eli Zaretskii  <eliz@gnu.org>
 
 	Remove support for DJGPP v1.x (bug#5813).
 
 	* w16select.c (__dpmi_int): Remove DJGPP v1.x compatibility.
-	* s/msdos.h: 
-	* unexec.c (make_hdr, copy_text_and_data): 
-	* sysdep.c (wait_for_termination, sys_subshell): 
+	* s/msdos.h:
+	* unexec.c (make_hdr, copy_text_and_data):
+	* sysdep.c (wait_for_termination, sys_subshell):
 	* msdos.c (dos_set_window_size, msdos_set_cursor_shape)
-	(IT_set_terminal_modes): 
+	(IT_set_terminal_modes):
 	(__write, _rename, gethostname, gettimeofday, alarm, fork, kill)
 	(dos_ttraw, dos_ttcooked, run_msdos_command, abort): Remove DJGPP
 	v1.x code and tests of the value of __DJGPP__.
 	(nice, pause, sigsetmask, sigblock): Remove DJGPP v1.x
 	compatibility code.
 
-	* lread.c: 
-	* gmalloc.c (memalign): 
-	* fileio.c (Fcopy_file, check_executable, Ffile_modes): 
-	* emacs.c (main): 
-	* dosfns.c (init_dosfns): 
+	* lread.c:
+	* gmalloc.c (memalign):
+	* fileio.c (Fcopy_file, check_executable, Ffile_modes):
+	* emacs.c (main):
+	* dosfns.c (init_dosfns):
 	* dired.c (file_name_completion_stat): Remove tests of __DJGPP__.
 
 	* xdisp.c (set_cursor_from_row): Fix cursor positioning when the
diff --git a/src/Makefile.in b/src/Makefile.in
index 53904a3992a..cd5027dc4d8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -284,10 +284,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
 #endif
 	$(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
-#ifndef LIBX11_SYSTEM
-#define LIBX11_SYSTEM
-#endif
-
 #ifndef LIB_X11_LIB
 #define LIB_X11_LIB -lX11
 #endif
@@ -376,7 +372,7 @@ LIBXT=$(LIBW)
 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies
    options for where to find X libraries, but before those libraries.  */
 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
-LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB LIBX11_SYSTEM $(XFT_LIBS)
+LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB $(XFT_LIBS)
 #else /* not HAVE_X11 */
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE
 #endif /* not HAVE_X11 */
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 29fbdab8369..55f546589ec 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -149,7 +149,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
    commentary below, in the non-X branch.  The 140KB number was
    measured on GNU/Linux and on MS-WIndows.  */
 #define SYSTEM_PURESIZE_EXTRA (-170000+140000)
-#define LIBX11_SYSTEM -lxext -lsys
+#define LIBS_SYSTEM -lxext -lsys
 #else
 /* We need a little extra space, see ../../lisp/loadup.el.
    As of 20091024, DOS-specific files use up 62KB of pure space.  But