diff --git a/src/xrdb.c b/src/xrdb.c
index a722780f60d2a2a26ae5b92efb5bc855ac475ecb..f241a079c4e8b397f42a9c68e638e80e996cce39 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -29,7 +29,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif /* USG5 */
 
 #endif /* 1 */
- 
+
+/* This should be included before the X include files; otherwise, we get
+   warnings about redefining NULL under BSD 4.3.  */
+#include <sys/param.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #if 0
@@ -38,7 +42,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <X11/X.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
-#include <sys/param.h>
 #ifdef VMS
 #include "vms-pwd.h"
 #else
diff --git a/src/xterm.c b/src/xterm.c
index be9f87bac888fd81aff7fe1da2c327e0555bcf9f..1bbdf5782cfc8020d357fc0a2e186c14f33bf012 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -31,7 +31,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "lisp.h"
 
-/* On 4.3 this loses if it comes after xterm.h.  */
+/* On 4.3 these lose if they come after xterm.h.  */
+#include <stdio.h>
 #include <signal.h>
 
 /* This may include sys/types.h, and that somehow loses
@@ -70,7 +71,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "systime.h"
 
 #include <fcntl.h>
-#include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
 #include <setjmp.h>