Move private methods into private headers.