Fixed incorrect includes after file-name changes.