* removed redundant includes (they were even wrongly used)