Merge "Replace last -includes by .KATI_DEPFILE"