Change types in headers to Magnum's equivalents