(XDK) Fix builds