Add two missing files after refactoring.