Fix windows compile issues due to import order
Fix windows build issue due to sasl.h include order.

Merge from Valeri Karpov.