Add two include files so we don't need to write macro definition of MsgField in many files.