more header dependency reduction