Add kerning handling

Also, an include fix.