-/* $OpenBSD: includes.h,v 1.14 2001/01/29 01:58:16 niklas Exp $ */
+/* $OpenBSD: includes.h,v 1.17 2002/01/26 16:44:22 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
#include "config.h"
-#include "bsd-nextstep.h"
+#include "openbsd-compat/bsd-nextstep.h"
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
#include <sys/resource.h>
-#ifndef HAVE_CYGWIN
#include <netinet/tcp.h>
-#endif
#include <arpa/inet.h>
#include <stdio.h>
#include <time.h>
#include <dirent.h>
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
#ifdef HAVE_GETOPT_H
-#include <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
+#endif
#if defined(HAVE_NETDB_H)
# include <netdb.h>
-#endif
+#endif
#ifdef HAVE_ENDIAN_H
# include <endian.h>
#endif
#ifdef HAVE_UTIME_H
# include <utime.h>
#endif
-#ifdef HAVE_VIS_H
-# include <vis.h>
-#endif
#include "version.h"
-#include "openbsd-compat.h"
-#include "bsd-cygwin_util.h"
+#include "openbsd-compat/openbsd-compat.h"
+#include "openbsd-compat/bsd-cygwin_util.h"
#include "entropy.h"
#endif /* INCLUDES_H */