Remove mixable_holder and fix header dependencies