Update for the move of private build headers