main/threads: remove excess headers