Christof's change

skip some obsolete includes