bootloader - use include_wrappers, clean the patch