#include <errno.h>
#include <fcntl.h>
-#include "includes.h"
+#include "openbsd.h"
#include "doas.h"
static void __dead
#define KEEPENV 0x2
#define PERSIST 0x4
#define NOLOG 0x8
+
+#ifdef USE_PAM
+void pamauth(const char *, const char *, int, int, int);
+#endif
+
+#ifdef USE_SHADOW
+void shadowauth(const char *, int);
+#endif
+
+#ifdef USE_TIMESTAMP
+int timestamp_open(int *, int);
+int timestamp_set(int, int);
+int timestamp_clear(void);
+#endif
#include <errno.h>
#include <pwd.h>
+#include "openbsd.h"
#include "doas.h"
-#include "includes.h"
const char *formerpath;
+++ /dev/null
-#ifndef INCLUDES_H
-#define INCLUDES_H
-
-#include "openbsd.h"
-
-#ifdef USE_PAM
-void pamauth(const char *, const char *, int, int, int);
-#endif
-
-#ifdef USE_SHADOW
-void shadowauth(const char *, int);
-#endif
-
-#ifdef USE_TIMESTAMP
-int timestamp_open(int *, int);
-int timestamp_set(int, int);
-int timestamp_clear(void);
-#endif
-
-#endif /* INCLUDES_H */
#ifndef _READPASSPHRASE_H_
#define _READPASSPHRASE_H_
-#include "includes.h"
-
#ifndef HAVE_READPASSPHRASE
#define RPP_ECHO_OFF 0x00 /* Turn off echo (default). */
#include <security/pam_appl.h>
-#include "includes.h"
+#include "openbsd.h"
+#include "doas.h"
#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX _POSIX_HOST_NAME_MAX
#include <unistd.h>
#include "openbsd.h"
+#include "doas.h"
#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX _POSIX_HOST_NAME_MAX
#include <time.h>
#include <unistd.h>
-#include "includes.h"
+#include "openbsd.h"
+#include "doas.h"
#ifndef TIMESTAMP_DIR
# define TIMESTAMP_DIR "/run/doas"