Move the autocleanup declarations into their
respective headers.