new style include and definition in CML support