Move all includes into client-devel package