[FOLD] Use make_unique, add missing includes