Fix Cairo lib handling
Update headers