Merge "mm-core: inc: Uniform all header files to UNIX format"