+/* $OpenBSD: includes.h,v 1.15 2001/06/08 15:25:40 markus Exp $ */
+
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
#include "config.h"
-#include "next-posix.h"
+#include "openbsd-compat/bsd-nextstep.h"
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
#include <sys/resource.h>
+#include <sys/utsname.h>
-#ifndef HAVE_CYGWIN
#include <netinet/tcp.h>
-#endif
#include <arpa/inet.h>
-#include <netdb.h>
#include <stdio.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
-#include <termios.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <grp.h>
#include <time.h>
#include <dirent.h>
-#ifdef HAVE_CYGWIN
-#include <getopt.h>
-#endif
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#ifdef HAVE_GETOPT_H
+# include <getopt.h>
+#endif
+#ifndef HAVE_GETOPT_OPTRESET
+#define getopt(ac, av, o) BSDgetopt(ac, av, o)
+#endif
#ifdef HAVE_BSTRING_H
# include <bstring.h>
-#endif
+#endif
+#if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \
+ defined(GLOB_HAS_GL_MATCHC)
+# include <glob.h>
+#endif
#ifdef HAVE_NETGROUP_H
# include <netgroup.h>
-#endif
-#if defined(HAVE_NETDB_H) && !defined(HAVE_NEXT)
-/* Next includes this as part of another header */
+#endif
+#if defined(HAVE_NETDB_H)
# include <netdb.h>
-#endif
+#endif
#ifdef HAVE_ENDIAN_H
# include <endian.h>
#endif
#ifdef HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h>
#endif
-
+#ifdef HAVE_UTIME_H
+# include <utime.h>
+#endif
#include "version.h"
-
-/* OpenBSD function replacements */
-#include "openbsd-compat.h"
-
-/* Entropy collection */
+#include "openbsd-compat/openbsd-compat.h"
+#include "openbsd-compat/bsd-cygwin_util.h"
#include "entropy.h"
-/* Define this to be the path of the xauth program. */
-#ifndef XAUTH_PATH
-#define XAUTH_PATH "/usr/X11R6/bin/xauth"
-#endif /* XAUTH_PATH */
-
-/* Define this to be the path of the rsh program. */
-#ifndef _PATH_RSH
-#define _PATH_RSH "/usr/bin/rsh"
-#endif /* _PATH_RSH */
-
-/*
- * Define this to use pipes instead of socketpairs for communicating with the
- * client program. Socketpairs do not seem to work on all systems.
- */
-/* #define USE_PIPES 1 */
-
-#ifdef HAVE_CYGWIN
-#define open binary_open
-#define pipe binary_pipe
-extern int binary_open();
-extern int binary_pipe();
-#endif
-
-#endif /* INCLUDES_H */
+#endif /* INCLUDES_H */