Interestingly this makes it slower with Clang than less headers.

Change-Id: Ia28d27ca9c8154c907dae1629ca893fc4765f075