diff --git a/config.h b/config.h
index 4e7e6b60..0e1f8f60 100644
--- a/config.h
+++ b/config.h
@@ -19,8 +19,9 @@
 #  ifndef strcasecmp
 #    define strcasecmp strcmpi
 #  endif
-#define strtok_r strtok_s
-#define strerror_r(e, b, l) strerror_s(b, l, e)
+#  define strtok_r strtok_s
+#  define strerror_r(e, b, l) strerror_s(b, l, e)
+typedef SSIZE_T ssize_t;
 #endif
 
 
diff --git a/lib/net_mosq.h b/lib/net_mosq.h
index 8c18c308..6a0d34ae 100644
--- a/lib/net_mosq.h
+++ b/lib/net_mosq.h
@@ -20,7 +20,6 @@ Contributors:
 #include <unistd.h>
 #else
 #include <winsock2.h>
-typedef int ssize_t;
 #endif
 
 #include "mosquitto_internal.h"