That looks ok to me. An alternate approach I almost finished implementing is to define some macro in bits/stdio_lim.h and use #if on that in stdio.h. That saves adding a file, but is a bit more crufty. I would like to put one of these two changes in (to 2.2 as well) if others agree.