Merge "Change includes to support new slicer header location"