Fix plugin api, so that it includes all the new required headers.