Get rid of circular header dependency