Move common-utils.h to common-defs.h.  Remove explicit includes