* Enable multicore compilation for headers compile. * Remove deprecated part of the patch * Remove deprecated patch