Remove as many header dependencies as possible