diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index d10ecdcda6..fbdcb5b801 100644
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -13,8 +13,6 @@
 
 LDAP_BEGIN_DECL
 
-#define SLAPD_BDB_PRIVATE
-
 #define DEFAULT_MODE		0600
 
 #define DEFAULT_DBENV_HOME	LDAP_RUNDIR LDAP_DIRSEP "openldap-bdb"
diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 6555cfc11d..33a75a8a76 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -44,7 +44,8 @@ bdb_back_initialize(
 		int major, minor, patch;
 		char *version = db_version( &major, &minor, &patch );
 
-		if( major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR ||
+		if( major != DB_VERSION_MAJOR ||
+			minor != DB_VERSION_MINOR ||
 			patch < DB_VERSION_PATCH )
 		{
 			Debug( LDAP_DEBUG_ANY,