Move private functions into private headers