util, differentiator: move common includes to util.