5 files changed, 7 insertions, 5 deletions
diff --git a/server/confdb/confdb.c b/server/confdb/confdb.c
index fcb4c8ab..6c5554b7 100644
--- a/server/confdb/confdb.c
+++ b/server/confdb/confdb.c
@@ -23,7 +23,6 @@
 
 #include <sys/stat.h>
 #include "config.h"
-#include "ldb.h"
 #include "util/util.h"
 #include "confdb/confdb.h"
 #include "confdb/confdb_private.h"
diff --git a/server/confdb/confdb.h b/server/confdb/confdb.h
index 76e44822..b3df6a67 100644
--- a/server/confdb/confdb.h
+++ b/server/confdb/confdb.h
@@ -25,6 +25,8 @@
 #include <stdbool.h>
 #include "talloc.h"
 #include "tevent.h"
+#include "ldb.h"
+#include "ldb_errors.h"
 #include "util/btreemap.h"
 #include "config.h"
 
diff --git a/server/db/sysdb.h b/server/db/sysdb.h
index 7bfe1fd7..336c9600 100644
--- a/server/db/sysdb.h
+++ b/server/db/sysdb.h
@@ -22,7 +22,6 @@
 #ifndef __SYS_DB_H__
 #define __SYS_DB_H__
 
-#include "ldb.h"
 #include "confdb/confdb.h"
 
 #define SYSDB_CONF_SECTION "config/sysdb"
diff --git a/server/external/pam.m4 b/server/external/pam.m4
index f99a2e69..40c8fd0d 100644
--- a/server/external/pam.m4
+++ b/server/external/pam.m4
@@ -1,5 +1,6 @@
 AC_SUBST(PAM_LIBS)
 
-AC_CHECK_HEADERS(security/pam_appl.h security/pam_misc.h security/pam_modules.h)
-
-AC_CHECK_LIB(pam, pam_get_item, [ PAM_LIBS="-lpam" ])
+AC_CHECK_HEADERS([security/pam_appl.h security/pam_misc.h security/pam_modules.h],
+    [AC_CHECK_LIB(pam, pam_get_item, [ PAM_LIBS="-lpam" ], [AC_MSG_ERROR([PAM must support pam_get_item])])],
+    [AC_MSG_ERROR([PAM development libraries not installed])]
+)
diff --git a/server/providers/data_provider.h b/server/providers/data_provider.h
index 9278e396..95a1b379 100644
--- a/server/providers/data_provider.h
+++ b/server/providers/data_provider.h
@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include <sys/un.h>
 #include <errno.h>
+#include <stdbool.h>
 #include "talloc.h"
 #include "tevent.h"
 #include "ldb.h"