Add missing inclusions in extensions