Fixed header includes in client.h