diff --git a/lisp/FreeBSD-os.h b/lisp/FreeBSD-os.h
index 3368d205c1858f2e9f40584aa01db1753ec793df..486d30fafe07260e6e21b62c0eba2b30ab26d11f 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.19 2007/12/06 13:51:21 cshapiro Exp $
+ $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.h,v 1.20 2007/12/07 06:54:28 cshapiro 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.
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <ucontext.h>
-#include <libgen.h>
 
 typedef caddr_t os_vm_address_t;
 typedef vm_size_t os_vm_size_t;
diff --git a/lisp/save.c b/lisp/save.c
index a5dbcd2c4893ea35775d7cf528ad90e80ba0913b..cfba286cfb67a7b287f224307028200cba71f667 100644
--- a/lisp/save.c
+++ b/lisp/save.c
@@ -1,6 +1,6 @@
 /*
 
- $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/save.c,v 1.18 2007/08/15 19:01:05 rtoy Exp $
+ $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/save.c,v 1.19 2007/12/07 06:54:28 cshapiro 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.
@@ -27,13 +27,10 @@
 #endif
 
 #ifdef FEATURE_EXECUTABLE
+#include <libgen.h>
 #include "elf.h"
 #endif
 
-#ifdef SOLARIS
-#include "libgen.h"
-#endif
-
 extern int version;
 
 static long