diff --git a/src/query.c b/src/query.c
index 166b178..6b94bd6 100644
--- a/src/query.c
+++ b/src/query.c
@@ -904,7 +904,7 @@ bool node_matches(coordinates_t *loc, coordinates_t *ref, node_select_t sel)
 	NFLAG(sticky)
 	NFLAG(private)
 	NFLAG(locked)
-#undef WFLAG
+#undef NFLAG
 
 	if (loc->node->client == NULL &&
 		(sel.same_class != OPTION_NONE ||
diff --git a/src/tree.c b/src/tree.c
index d8fd107..08e6c95 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -1466,7 +1466,7 @@ bool find_closest_node(coordinates_t *ref, coordinates_t *dst, cycle_dir_t dir,
 		f = (dir == CYCLE_PREV ? prev_leaf(f, d->root) : next_leaf(f, d->root));
 		HANDLE_BOUNDARIES(f);
 	}
-#undef HANDLE_EXTREMUM
+#undef HANDLE_BOUNDARIES
 	return false;
 }