2 files changed, 10 insertions, 4 deletions
diff --git a/host/include/uhd/config.h b/host/include/uhd/config.h
index bacda212f..c7184ea4d 100644
--- a/host/include/uhd/config.h
+++ b/host/include/uhd/config.h
@@ -12,8 +12,11 @@
 #include <iso646.h>
 
 // Define ssize_t
-#include <stddef.h>
-typedef ptrdiff_t ssize_t;
+#ifndef _SSIZE_T_DEFINED
+#define _SSIZE_T_DEFINED
+# include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif /* _SSIZE_T_DEFINED */
 
 #endif /* _MSC_VER */
 
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp
index 99c3731c1..8504e0c18 100644
--- a/host/include/uhd/config.hpp
+++ b/host/include/uhd/config.hpp
@@ -38,8 +38,11 @@
 #    include <ciso646>
 
 // define ssize_t
-#    include <cstddef>
-typedef ptrdiff_t ssize_t;
+#ifndef _SSIZE_T_DEFINED
+#define _SSIZE_T_DEFINED
+#    include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif /* _SSIZE_T_DEFINED */
 
 #endif // BOOST_MSVC