switch to yelp-tools
fix includes for mate-desktop-1.7.x