diff --git a/OCL.cmake b/OCL.cmake
index dde805a5..8f11f44c 100644
--- a/OCL.cmake
+++ b/OCL.cmake
@@ -27,6 +27,12 @@ set(CLANG_OCL_FLAGS -fcolor-diagnostics -Werror -Wno-error=atomic-alignment -x c
   -cl-std=CL2.0 -target "${AMDGPU_TARGET_TRIPLE}" -fvisibility=protected -fomit-frame-pointer
   -Xclang -finclude-default-header "${CLANG_OPTIONS_APPEND}")
 
+# For compatibility with the MSVC headers we use a 32-bit wchar. Users linking
+# against us must also use a short wchar.
+if (WIN32)
+  set(CLANG_OCL_FLAGS ${CLANG_OCL_FLAGS} -fshort-wchar)
+endif()
+
 set (BC_EXT .bc)
 set (LIB_SUFFIX ".lib${BC_EXT}")
 set (STRIP_SUFFIX ".strip${BC_EXT}")