diff --git a/lisp/FreeBSD-os.c b/lisp/FreeBSD-os.c
index 85817ee66848c761e34a8ef7f2a00526c78933b0..ed3b636983eb48461721b2e3da9d693fe0c087d2 100644
--- a/lisp/FreeBSD-os.c
+++ b/lisp/FreeBSD-os.c
@@ -12,23 +12,20 @@
  * Much hacked by Paul Werkowski
  * GENCGC support by Douglas Crosher, 1996, 1997.
  *
- * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.c,v 1.11 2005/09/15 18:26:50 rtoy Exp $
+ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.c,v 1.12 2006/05/30 22:42:05 fgilham Exp $
  *
  */
 
-#include <stdio.h>
-#include <sys/param.h>
+#include "os.h"
 #include <sys/file.h>
 #include <errno.h>
 #include "./signal.h"
-#include "os.h"
 #include "arch.h"
 #include "globals.h"
 #include "interrupt.h"
 #include "lispregs.h"
 #include "internals.h"
 
-#include <sys/types.h>
 #include <signal.h>
 /* #include <sys/sysinfo.h> */
 #include <sys/proc.h>
diff --git a/lisp/FreeBSD-os.h b/lisp/FreeBSD-os.h
index 14bfd7ae866eebb460c223738d15beb4af717693..49e8861c0adf5b5252146ba49b387f122687cbf9 100644
--- a/lisp/FreeBSD-os.h
+++ b/lisp/FreeBSD-os.h
@@ -1,6 +1,6 @@
 /*
 
- $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.h,v 1.8 2005/09/15 18:26:50 rtoy Exp $
+ $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.h,v 1.9 2006/05/30 22:42:14 fgilham Exp $
 
  This code was written as part of the CMU Common Lisp project at
  Carnegie Mellon University, and has been placed in the public domain.
@@ -11,10 +11,16 @@
 #define _FREEBSD_OS_H_
 
 #include <osreldate.h>
-#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/uio.h>
 #include <sys/mman.h>
 #include <sys/signal.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #define MAP_ANONYMOUS MAP_ANON
 #define MAP_VARIABLE 0
 
@@ -47,5 +53,6 @@ void os_save_context(void);
 
 #define PROTECTION_VIOLATION_SIGNAL SIGBUS
 
+#undef PAGE_SIZE
 
 #endif /* _FREEBSD_OS_H_ */