...like 74cd94a1 "Put back some #include (needed
for e.g. --disable-pch)" (this one having caused loplugin:unreffun with
clang-cl)

Change-Id: I1a888ca754365232663fed0b99535d91fded040a