Add missing files required by 239c4b7