Track own d2-common to fix aliasing violations