Remove unused code after a06c0ed
Make the Cairo less Pango-dependant
Remove recently unused code
Include header where it is actually needed
Minor
Move function to its only caller