Canonicalize all paths leading into client/, then resort #include statements
in the affected files. Finally take client/ out of the include path.

Change-Id: Iac7aa41a10e7fcf5396921935ae1da0423c59527