[z2182] Compile fixes for Windows specific corrections.

(based on commit [12264] - 3f1e3ce)

(based on commit [s1815] - e237570)