Remove file as it is in the docket now.
Skip signatures that start with "typedef".
Fix block mappings.