diff --git a/servers/slapd/slapi/printmsg.c b/servers/slapd/slapi/printmsg.c
index 2f7f587986..21f0c2f8db 100644
--- a/servers/slapd/slapi/printmsg.c
+++ b/servers/slapd/slapi/printmsg.c
@@ -13,11 +13,11 @@
 #include <portable.h>
 #include <slapi_common.h>
 #include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <unistd.h>
+#include <ac/string.h>
+#include <ac/stdarg.h>
+#include <ac/unistd.h>
 #include <fcntl.h>
-#include <errno.h>
+#include <ac/errno.h>
 
 #include <ldap.h>
 #include <ldap_config.h>
diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 4f24b6c2c5..f52fb40f4d 100644
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -24,9 +24,9 @@
 
 #include <slap.h>
 #include <slapi.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <unistd.h>
+#include <ac/stdarg.h>
+#include <ac/ctype.h>
+#include <ac/unistd.h>
 #include <ldap_pvt.h>
 
 struct berval *ns_get_supported_extop( int );