2 files changed, 13 insertions, 0 deletions
diff --git a/libxcb/src/xcb.h b/libxcb/src/xcb.h
index 5a1c01ab1..323a31fb2 100644
--- a/libxcb/src/xcb.h
+++ b/libxcb/src/xcb.h
@@ -35,9 +35,19 @@
 #include <stdint.h>
 #endif
 
+#ifndef _MSC_VER
 #include <sys/uio.h>
+#else
+#define HANDLE void *
+typedef int pid_t;
+#endif
 #include <pthread.h>
 
+#ifdef _MSC_VER
+#undef HANDLE
+typedef unsigned uint32_t;
+typedef int int32_t;
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libxcb/src/xcbxlib.h b/libxcb/src/xcbxlib.h
index 4cb5cd4bf..53821afce 100644
--- a/libxcb/src/xcbxlib.h
+++ b/libxcb/src/xcbxlib.h
@@ -31,6 +31,9 @@
 #ifndef __XCBXLIB_H
 #define __XCBXLIB_H
 
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
 #include <pthread.h>
 #include "xcb.h"