diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 6ee6860cba..60f77233e7 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -2117,23 +2117,23 @@ struct SlapReply {
 		rep_extended_s sru_extended;
 	} sr_un;
 	slap_mask_t sr_flags;
-#define REP_ENTRY_MODIFIABLE	0x0001U
-#define REP_ENTRY_MUSTBEFREED	0x0002U
-#define REP_ENTRY_MUSTRELEASE	0x0004U
-#define	REP_ENTRY_MASK		(REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTBEFREED|REP_ENTRY_MUSTRELEASE)
+#define	REP_ENTRY_MODIFIABLE	((slap_mask_t) 0x0001U)
+#define	REP_ENTRY_MUSTBEFREED	((slap_mask_t) 0x0002U)
+#define	REP_ENTRY_MUSTRELEASE	((slap_mask_t) 0x0004U)
+#define	REP_ENTRY_MASK		(REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTFLUSH)
 #define	REP_ENTRY_MUSTFLUSH	(REP_ENTRY_MUSTBEFREED|REP_ENTRY_MUSTRELEASE)
 
-#define REP_MATCHED_MUSTBEFREED	0x0010U
+#define	REP_MATCHED_MUSTBEFREED	((slap_mask_t) 0x0010U)
 #define	REP_MATCHED_MASK	(REP_MATCHED_MUSTBEFREED)
 
-#define REP_REF_MUSTBEFREED	0x0020U
+#define REP_REF_MUSTBEFREED	((slap_mask_t) 0x0020U)
 #define REP_REF_MASK		(REP_REF_MUSTBEFREED)
 
-#define REP_CTRLS_MUSTBEFREED	0x0040U
+#define REP_CTRLS_MUSTBEFREED	((slap_mask_t) 0x0040U)
 #define REP_CTRLS_MASK		(REP_CTRLS_MUSTBEFREED)
 
-#define	REP_NO_ENTRYDN		0x1000U
-#define	REP_NO_SUBSCHEMA	0x2000U
+#define	REP_NO_ENTRYDN		((slap_mask_t) 0x1000U)
+#define	REP_NO_SUBSCHEMA	((slap_mask_t) 0x2000U)
 #define	REP_NO_OPERATIONALS	(REP_NO_ENTRYDN|REP_NO_SUBSCHEMA)
 };