s3-messages: only include messages.h where needed.