diff --git a/src/cairoint.h b/src/cairoint.h
old mode 100644
new mode 100755
index 0ee33dcd1..53a113051
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -65,6 +65,11 @@
 #include "cairo.h"
 #include <pixman.h>
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#define inline __inline
+#endif
+
 CAIRO_BEGIN_DECLS
 
 #if __GNUC__ >= 3 && defined(__ELF__)
diff --git a/test/cairo-test.h b/test/cairo-test.h
old mode 100644
new mode 100755
index 381709d28..a2d0285b0
--- a/test/cairo-test.h
+++ b/test/cairo-test.h
@@ -53,6 +53,12 @@ typedef unsigned __int64 uint64_t;
 #error Cannot find definitions for fixed-width integral types (uint8_t, uint32_t, \etc.)
 #endif
 
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES
+#endif
+
+#include <math.h>
+
 typedef enum cairo_test_status {
     CAIRO_TEST_SUCCESS = 0,
     CAIRO_TEST_FAILURE,