mild refactoring to clarify actual usage
begin breakup of headers.h
finalize breakup of headers.h
stop tracking headers.h