Fixed bad formatting of client.h and merc.h caused by my last commit.