Get rid of messages.h