diff --git a/pixman/src/pixmanint.h b/pixman/src/pixmanint.h
index b11c22728..a10a8342f 100644
--- a/pixman/src/pixmanint.h
+++ b/pixman/src/pixmanint.h
@@ -27,12 +27,18 @@
 #  include "config.h"
 #endif
 
-#include "pixman.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#undef inline
+#define inline __inline
+#endif
+
+#include "pixman.h"
+
 #undef MIN
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 #undef MAX
diff --git a/src/cairoint.h b/src/cairoint.h
index a8b052520..b386e8f80 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -68,6 +68,8 @@
 
 #ifdef _MSC_VER
 #define snprintf _snprintf
+#undef inline
+#define inline __inline
 #endif
 
 CAIRO_BEGIN_DECLS