fixed include path for merged build