Merge pull request #4487 from gilles-peskine-arm/tniessen-typos-in-header-files-2.16

Backport 2.16: Fix typos in C header files