diff --git a/include/valkey/sds.h b/include/valkey/sds.h
index 5ba04f62..079e8bdf 100644
--- a/include/valkey/sds.h
+++ b/include/valkey/sds.h
@@ -35,7 +35,8 @@
 
 #define SDS_MAX_PREALLOC (1024*1024)
 #ifdef _MSC_VER
-typedef long long ssize_t;
+#include <basetsd.h>
+typedef SSIZE_T ssize_t;
 #define SSIZE_MAX (LLONG_MAX >> 1)
 #ifndef __clang__
 #define __attribute__(x)
diff --git a/include/valkey/sockcompat.h b/include/valkey/sockcompat.h
index 84afeeab..18b1c6b0 100644
--- a/include/valkey/sockcompat.h
+++ b/include/valkey/sockcompat.h
@@ -53,7 +53,8 @@
 #include <mstcpip.h>
 
 #ifdef _MSC_VER
-typedef long long ssize_t;
+#include <basetsd.h>
+typedef SSIZE_T ssize_t;
 #endif
 
 /* Emulate the parts of the BSD socket API that we need (override the winsock signatures). */
diff --git a/include/valkey/valkey.h b/include/valkey/valkey.h
index 8d41bba5..a9d88125 100644
--- a/include/valkey/valkey.h
+++ b/include/valkey/valkey.h
@@ -38,8 +38,9 @@
 #ifndef _MSC_VER
 #include <sys/time.h> /* for struct timeval */
 #else
+#include <basetsd.h>
 struct timeval; /* forward declaration */
-typedef long long ssize_t;
+typedef SSIZE_T ssize_t;
 #endif
 #include <stdint.h> /* uintXX_t, etc */
 #include "sds.h" /* for sds */