Now that cache.h needs strbuf.h, remove useless includes.