Inclused re-declaration fixes for some places which I got wrong in the
past.

Conflicts:
	bin/varnishd/cache/cache_objhead.h