Add files which were not included by commit 154868.