MSM: Add missing header files