reorder includes in client.c