improve(?) C diff headers, fix gc.rerereresolved