remove i2c-old.c from 2.5.x tree?

Hello all,
I noticed that include/linux/i2c-old.h was removed in 2.5.1-pre3.
Since drivers/media/video/i2c-parport.c and drivers/media/video/i2c-old.c includes i2c-old.h , does that mean that we can remove them from the 2.5.x tree?

Regards,
Frank