Merge "Remove EventHub header from include dir"