Add message system
fixed #includes for message system