diff --git a/servers/slapd/back-dnssrv/compare.c b/servers/slapd/back-dnssrv/compare.c
index af6931b54d..0b24f4d248 100644
--- a/servers/slapd/back-dnssrv/compare.c
+++ b/servers/slapd/back-dnssrv/compare.c
@@ -22,7 +22,11 @@ dnssrv_back_compare(
     Operation	*op,
     char	*dn,
     char	*ndn,
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+	AttributeAssertion *ava
+#else
     Ava		*ava
+#endif
 )
 {
 	return dnssrv_back_request( be, conn, op, dn, ndn );
diff --git a/servers/slapd/back-dnssrv/external.h b/servers/slapd/back-dnssrv/external.h
index a772468ad8..a915eb5c03 100644
--- a/servers/slapd/back-dnssrv/external.h
+++ b/servers/slapd/back-dnssrv/external.h
@@ -33,9 +33,15 @@ extern int	dnssrv_back_search LDAP_P(( BackendDB *bd,
 	char *nbase, int scope, int deref, int sizelimit, int timelimit,
 	Filter *filter, char *filterstr, char **attrs, int attrsonly ));
 
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
 extern int	dnssrv_back_compare LDAP_P((BackendDB *bd,
 	Connection *conn, Operation *op,
-	char *dn, char *ndn, Ava 	*ava ));
+	char *dn, char *ndn, AttributeAssertion *ava ));
+#else
+extern int	dnssrv_back_compare LDAP_P((BackendDB *bd,
+	Connection *conn, Operation *op,
+	char *dn, char *ndn, Ava *ava ));
+#endif
 
 extern int	dnssrv_back_modify LDAP_P(( BackendDB *bd,
 	Connection *conn, Operation *op,
diff --git a/servers/slapd/back-dnssrv/modify.c b/servers/slapd/back-dnssrv/modify.c
index dd5521c774..bd5b06936a 100644
--- a/servers/slapd/back-dnssrv/modify.c
+++ b/servers/slapd/back-dnssrv/modify.c
@@ -23,7 +23,7 @@ dnssrv_back_modify(
     Operation	*op,
     char	*dn,
     char	*ndn,
-    LDAPModList	*ml
+    Modifications	*ml
 )
 {
 	return dnssrv_back_request( be, conn, op, dn, ndn );