Bug 17600: Fix missing imports from mappings.pl