Add redefine protection for client.h