1 files changed, 4 insertions, 8 deletions

diff --git a/includes.h b/includes.h
index b2e8c1e78..609dd49b8 100644
--- a/includes.h
+++ b/includes.h
@@ -57,15 +57,17 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 
 #include "version.h"
 
+#include "config.h"
+
 #include "helper.h"
 #include "mktemp.h"
 #include "strlcpy.h"
 
-#ifdef HAVE_PAM
+#ifdef HAVE_LIBPAM
 #include <security/pam_appl.h>
 #endif /* HAVE_PAM */
 
-#ifdef HAVE_PWDB
+#ifdef HAVE_LIBPWDB
 #include <pwdb/pwdb_map.h>
 #endif /* HAVE_PWDB */
 
@@ -83,10 +85,4 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
    client program.  Socketpairs do not seem to work on all systems. */
 #define USE_PIPES 1
 
-#ifndef SHUT_RD
-#define SHUT_RD 0 
-#define SHUT_WR 1 
-#define SHUT_RDWR 2 
-#endif /* SHUT_RD */
-
 #endif /* INCLUDES_H */