Add missing files from previous patches