diff --git a/acconfig.h b/acconfig.h
index 0ebc71a..e728227 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -33,7 +33,7 @@
  * Define if you have dlopen() and related routines (dynamic linking
  *  of shared object files). 
  */
-#undef HAVE_DLOPEN 1
+#undef HAVE_DLOPEN
 
 /* Define if your sys_errlist is a const definition */
 #undef HAVE_CONST_SYS_ERRLIST
@@ -45,6 +45,13 @@
    not-very-portable way of looking up external symbols. */
 #undef HAVE_NLIST
 
+#undef _HPUX_SOURCE
+
+#undef hpux
+
+#undef _XOPEN_SOURCE_EXTENDED
+
+#undef socklen_t
 @BOTTOM@
 
 #include "fake/sigact.h"
diff --git a/c/fake/libdl1.c b/c/fake/libdl1.c
index 6260324..8694844 100644
--- a/c/fake/libdl1.c
+++ b/c/fake/libdl1.c
@@ -4,8 +4,8 @@
  * looking up in a NULL open library returns symbols in the current executable
  * (whose name is pointed to by object_file).
  */
-#include <stdlib.h>
 #include "sysdep.h"
+#include <stdlib.h>
 #include <nlist.h>
 #include "../fakec/dlfcn.h"
 #ifdef	USCORE
diff --git a/c/unix/dynamo.c b/c/unix/dynamo.c
index 937688b..9ab5bd1 100644
--- a/c/unix/dynamo.c
+++ b/c/unix/dynamo.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include "sysdep.h"
 #include "scheme48.h"
-#include <dlfcn.h>
+#include "../fake/dlfcn.h"
 
 
 #if	defined(RTLD_NOW)
diff --git a/configure.in b/configure.in
index 5f31ec0..8ee1232 100644
--- a/configure.in
+++ b/configure.in
@@ -220,9 +220,10 @@ AC_INIT(c/scheme48vm.c)
     LDFLAGS="-Wl,-E"
     if test ${CC} = cc; then
       CFLAGS="-Ae -O +Obb1800"
-      AC_DEFINE(_HPUX_SOURCE)
-      AC_DEFINE(hpux)
     fi
+    AC_DEFINE(_HPUX_SOURCE)
+    AC_DEFINE(hpux)
+    AC_DEFINE(_XOPEN_SOURCE_EXTENDED)
   ;;
  
   ## IBM AIX
@@ -294,6 +295,7 @@ AC_INIT(c/scheme48vm.c)
      AC_CHECK_HEADERS(sys/un.h)
      AC_CHECK_HEADERS(crypt.h)	
      AC_CHECK_FUNCS(gettimeofday ftime nlist select setitimer sigaction)
+     AC_CHECK_TYPE(socklen_t, unsigned int)	
      AC_CHECK_FUNC(dlopen, AC_DEFINE(HAVE_DLOPEN),
 			   AC_CHECK_FUNC(nlist, [LIBOBJS="$LIBOBJS c/fake/libdl1.o"],
 						[LIBOBJS="$LIBOBJS c/fake/libdl2.o"]))
diff --git a/scsh/network1.c b/scsh/network1.c
index 02cf7ac..003b1d7 100644
--- a/scsh/network1.c
+++ b/scsh/network1.c
@@ -4,7 +4,7 @@
  * Copyright (c) 1994 by Brian D. Carlstrom
  * Copyright (c) 1994 by Olin Shivers
  */
-
+#include "sysdep.h"
 #include "cstuff.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -20,7 +20,7 @@
 /* Make sure our exports match up w/the implementation: */
 #include "network1.h"
 #include "scheme48.h"
-//extern int h_errno;
+extern int h_errno;
 
 /* to extract a 4 byte long value from a scheme string */