This reduces the preprocessed size of , and by not including for std::remove and std::remove_if. Also unwrap iterators using __niter_base, to avoid redundant debug mode checks. PR libstdc++/92546 * include/bits/erase_if.h (__erase_nodes_if): Use __niter_base to unwrap debug iterators. * include/bits/refwrap.h: Do not error if included in C++03. * include/bits/stl_algo.h (__remove_if): Move to ... * include/bits/stl_algobase.h (__remove_if): ... here. * include/std/deque (erase, erase_if): Use __remove_if instead of remove and remove_if. * include/std/string (erase, erase_if): Likewise. * include/std/vector (erase, erase_if): Likewise. Tested powerpc64le-linux. Committed to trunk. ff7793bea46 34e9407b3b4 b7e8fb5e482 6ccffeb56b9 e79bde6ada4 e5c093e515c 20751fad19e 9b790acc220 e3869a48fc2 44967af830a dc1b29508d7 59ffa3e3dba d71476c9df9 a09bb4a852f cfb582f6279 c46ecb0112e fb4d55ef61c 10b6d89badd ce709ad3dc0 d335d73889d 681707ec28d 741c7350c08