deleted not needed patch, fixed missed includes