* (bug 2503) remove redundant includes