Fix build after changes in DEVKIT-869