--- Libc/Libc-1725.40.4/include/sys/rbtree.h
+++ Libc/Libc-997.90.3/include/sys/rbtree.h
@@ -34,15 +34,12 @@
 #ifndef _SYS_RBTREE_H_
 #define	_SYS_RBTREE_H_
 
-#include <_bounds.h>
 #include <Availability.h>
 
 #include <sys/types.h>
 #include <stdbool.h>
 #include <inttypes.h>
 #include <sys/queue.h>
-
-_LIBC_SINGLE_BY_DEFAULT()
 
 __BEGIN_DECLS
 
@@ -55,16 +52,9 @@
 #define RB_TREE_FOREACH(N, T) \
     for ((N) = RB_TREE_MIN(T); (N); \
 	(N) = rb_tree_iterate((T), (N), RB_DIR_RIGHT))
-#define RB_TREE_FOREACH_SAFE(N, T, TVAR) \
-    for ((N) = RB_TREE_MIN(T); (N) && ((TVAR) = rb_tree_iterate((T), (N), RB_DIR_RIGHT), 1); \
-	(N) = (TVAR))
 #define RB_TREE_FOREACH_REVERSE(N, T) \
     for ((N) = RB_TREE_MAX(T); (N); \
 	(N) = rb_tree_iterate((T), (N), RB_DIR_LEFT))
-#define RB_TREE_FOREACH_REVERSE_SAFE(N, T, TVAR) \
-    for ((N) = RB_TREE_MAX(T); (N) && ((TVAR) = rb_tree_iterate((T), (N), RB_DIR_LEFT), 1); \
-	(N) = (TVAR))
-
 
 /*
  * rbto_compare_nodes_fn: