Use correct types in header