extract-headers.sh: cleanups