Merge pull request #1219 from antonio-nino-diaz-arm/an/mm-version

SPM: Fix version header definitions