changed some includes
Started writing out message.c