(cherry picked from commit 8c8c28be)
To prepare for the next commit. (cherry picked from commit 94db6cdc)
To avoid conflicts with smb2.h (cherry picked from commit 9adc93c1)