Edit cdm_NonUniformDomain.h and cdm_DFI.h