diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 5539535578..f9db732ba2 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -36,8 +36,6 @@ static int	get_simple_vrFilter(
 	ValuesReturnFilter **f,
 	const char **text );
 
-#define XXX 1
-
 int
 get_filter(
 	Connection *conn,
@@ -243,9 +241,7 @@ get_filter(
 			break;
 		}
 
-#ifdef XXX
 		assert( f.f_not != NULL );
-#endif
 		break;
 
 	case LDAP_FILTER_EXT:
@@ -261,9 +257,7 @@ get_filter(
 			break;
 		}
 
-#ifdef XXX
 		assert( f.f_mra != NULL );
-#endif
 		break;
 
 	default:
diff --git a/servers/slapd/matchedValues.c b/servers/slapd/matchedValues.c
index febd05d24a..e13d661296 100644
--- a/servers/slapd/matchedValues.c
+++ b/servers/slapd/matchedValues.c
@@ -17,8 +17,6 @@
 
 #include "slap.h"
 
-#include "../../libraries/liblber/lber-int.h"
-
 static int
 test_mra_vrFilter(
 	Operation	*op,