Many includes were not removed when code parts were moved or removed. Signed-off-by: Enrico Leto <enrico.leto@siemens.com>