diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 59867df3b5..6fd2753c4c 100644
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -158,7 +158,9 @@ struct bdb_db_pgsize {
 	int	bdp_size;
 };
 
+#ifdef LDAP_DEVEL
 #define BDB_MONITOR_IDX
+#endif
 
 typedef struct bdb_monitor_t {
 	void		*bdm_cb;
diff --git a/servers/slapd/back-mdb/back-mdb.h b/servers/slapd/back-mdb/back-mdb.h
index 9d357fa87b..435fdbff84 100644
--- a/servers/slapd/back-mdb/back-mdb.h
+++ b/servers/slapd/back-mdb/back-mdb.h
@@ -51,7 +51,9 @@ LDAP_BEGIN_DECL
 /* Most users will never see this */
 #define DEFAULT_RTXN_SIZE	10000
 
+#ifdef LDAP_DEVEL
 #define MDB_MONITOR_IDX
+#endif
 
 typedef struct mdb_monitor_t {
 	void		*mdm_cb;