rework headers to not require progress_meter.h