Update formatting for includes/diff