Merge pull request #1 from whiperhack/cm-11.0

Cm 11.0
link missing headers