fix for out-of-source build

from header rework changes.