Small clean in Graphics.
Change includes in Client.