Merge "libsparse: allow including from C++"