diff --git a/servers/slapd/back-bdb/attr.c b/servers/slapd/back-bdb/attr.c
index b5df633b66bf5c2d1bbe58a93b0468617e65ce74..3947aeab7294afed0abd813f9bbf74367d968b27 100644
--- a/servers/slapd/back-bdb/attr.c
+++ b/servers/slapd/back-bdb/attr.c
@@ -56,7 +56,10 @@ ainfo_cmp(
 
 #ifdef LDAP_COMP_MATCH
 void
-bdb_attr_comp_ref( struct bdb_info *bdb, AttributeDescription *desc, ComponentReference** cr )
+bdb_attr_comp_ref(
+	struct bdb_info *bdb,
+	AttributeDescription *desc,
+	ComponentReference** cr )
 {
 	AttrInfo	*a;
 
diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index d1ab50e2eabd86d8768fe79114777c066f2afd7d..73bc1dc63642570634877cbbdc603f5c870b87dd 100644
--- a/servers/slapd/back-bdb/filterindex.c
+++ b/servers/slapd/back-bdb/filterindex.c
@@ -58,7 +58,7 @@ static int list_candidates(
 	ID *stack );
 
 #ifdef LDAP_COMP_MATCH
-int
+static int
 ext_candidates(
         Operation *op,
         MatchingRuleAssertion *mra,
@@ -247,7 +247,7 @@ comp_list_candidates(
 	return rc;
 }
 
-int
+static int
 comp_equality_candidates (
         Operation *op,
         MatchingRuleAssertion *mra,
@@ -352,7 +352,7 @@ comp_equality_candidates (
         return( rc );
 }
 
-int
+static int
 comp_candidates (
 	Operation *op,
 	MatchingRuleAssertion *mra,
@@ -399,7 +399,7 @@ comp_candidates (
 	return( rc );
 }
 
-int
+static int
 ext_candidates(
         Operation *op,
         MatchingRuleAssertion *mra,
diff --git a/servers/slapd/back-bdb/proto-bdb.h b/servers/slapd/back-bdb/proto-bdb.h
index 8480db421ed83b234f628f65ff1bda6e5323ccb4..672ab7804a743b57e688cad7e7ba805be0a62997 100644
--- a/servers/slapd/back-bdb/proto-bdb.h
+++ b/servers/slapd/back-bdb/proto-bdb.h
@@ -34,6 +34,13 @@ LDAP_BEGIN_DECL
 #define bdb_attr_index_config		BDB_SYMBOL(attr_index_config)
 #define bdb_attr_index_destroy		BDB_SYMBOL(attr_index_destroy)
 
+#ifdef LDAP_COMP_MATCH
+#define bdb_attr_comp_ref			BDB_SYMBOL(attr_comp_ref)
+void bdb_attr_comp_ref( struct bdb_info *bdb,
+	AttributeDescription *desc,
+	ComponentReference **cr );
+#endif
+
 void bdb_attr_mask( struct bdb_info *bdb,
 	AttributeDescription *desc,
 	slap_mask_t *indexmask );