diff --git a/src/cairo-system.c b/src/cairo-system.c
index 9970fceb2..85c74876e 100644
--- a/src/cairo-system.c
+++ b/src/cairo-system.c
@@ -50,7 +50,7 @@
 
 
 #if CAIRO_MUTEX_IMPL_WIN32
-#if !defined(CAIRO_WIN32_STATIC_BUILD)
+#if !CAIRO_WIN32_STATIC_BUILD
 
 #define WIN32_LEAN_AND_MEAN
 /* We require Windows 2000 features such as ETO_PDY */
diff --git a/src/cairo.h b/src/cairo.h
index 8b5044a6f..9b700b70f 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -51,7 +51,7 @@
 #endif
 
 #ifndef cairo_public
-# ifdef _MSC_VER
+# if _MSC_VER && !CAIRO_WIN32_STATIC_BUILD
 #  define cairo_public __declspec(dllimport)
 # else
 #  define cairo_public