Fix includes to new zebra api location