Add imports overlooked during rebase.