Improved process_headers.pl and fixed newly-found include weirdness in s2.
Merge branch 'sam_process_headers_improvement' into next