fix msm-common inclusion problem