Merge proposals dependent on lp://staging/~bratsche/libdbusmenu/fix-includes-in-client-h

lp://staging/~bratsche/libdbusmenu/fix-includes-in-client-h has no merge proposals.