Remove the Message.h include from several files