upstream includes librevenge