[HAO-Tracker-Primary] cleaned up includes in KiwiFrameBuilder