Yes, that was what I was thinking. We'll have to be careful to check for all the potential places where basename() is used and make sure they do the HAVE_DECL thing, else they'll break if/when this is committed.