[ros-diffs] [akhaldi] 67346: [XDK] Partially revert r67338. We already have this in ntifs.h