diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index c5900ff328..9c8d48a25d 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2315,7 +2315,7 @@ struct syntax_defs_rec syntax_defs[] = {
 
 struct mrule_defs_rec {
 	char *						mrd_desc;
-	unsigned					mrd_usage;
+	slap_mask_t					mrd_usage;
 	slap_mr_convert_func *		mrd_convert;
 	slap_mr_normalize_func *	mrd_normalize;
 	slap_mr_match_func *		mrd_match;
diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 1bd2f942f4..0574dcde18 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -26,7 +26,7 @@ struct slap_internal_schema slap_schema;
 static int
 objectClassMatch(
 	int *matchp,
-	unsigned flags,
+	slap_mask_t flags,
 	Syntax *syntax,
 	MatchingRule *mr,
 	struct berval *value,
@@ -72,7 +72,7 @@ objectClassMatch(
 static int
 structuralObjectClassMatch(
 	int *matchp,
-	unsigned flags,
+	slap_mask_t flags,
 	Syntax *syntax,
 	MatchingRule *mr,
 	struct berval *value,