fixed includes
Merge branch 'cabalization' of https://github.com/mfpi/freetype2 into cabalization