--- a/lib-src/emacsserver.c	Mon Aug 13 09:00:04 2007 +0200
+++ b/lib-src/emacsserver.c	Mon Aug 13 09:02:59 2007 +0200
@@ -59,20 +59,15 @@
 #if ! defined (HAVE_SYSVIPC)
 /* BSD code is very different from SYSV IPC code */
 
-#include "../src/sysproc.h" /* Needed for select */
-#ifndef SOCK_STREAM
-/* this is normally included by src/sysproc.h.  might be safe to omit
- * it entirely.  lousy ultrix's sys/socket.h chokes if it's included
- * twice, so we can't include unconditionally.  */
-#include <sys/socket.h>
-#endif
 #include <sys/types.h>
 #include <sys/file.h>
+#include <sys/socket.h>
 #include <sys/signal.h>
 #include <sys/stat.h> /* Needed for chmod, at least on Linux */
 #include <sys/un.h>
 #include <stdio.h>
 #include <errno.h>
+#include "../src/sysproc.h" /* Needed for select */
 
 void
 main ()