Move private header stuff around...