diff.h: reduce unnecessary includes