fix: adapt to different locations for cdd includes

from master