Merge pull request #2101 from Tilka/intrinsics Clean up the intrinsics #ifdef mess with a common header
