Add missing import statements & shims.