Fixed excessive file dependencies.