Update headers for marmalade compatibility