Switch to unified view

a/mpd.h b/mpd.h