diff --git a/canvas_base.h b/canvas_base.h
index 7c5f275..7a69def 100644
--- a/canvas_base.h
+++ b/canvas_base.h
@@ -27,6 +27,9 @@
 #include "lz.h"
 #include "region.h"
 #include "draw.h"
+#ifdef WIN32
+#include <windows.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/canvas_utils.c b/canvas_utils.c
index d861800..604f589 100644
--- a/canvas_utils.c
+++ b/canvas_utils.c
@@ -30,7 +30,7 @@
 #include "mem.h"
 
 #ifdef WIN32
-extern int gdi_handlers;
+static int gdi_handlers = 0;
 #endif
 
 #ifndef CANVAS_ERROR
diff --git a/canvas_utils.h b/canvas_utils.h
index ffed927..16ada45 100644
--- a/canvas_utils.h
+++ b/canvas_utils.h
@@ -19,6 +19,10 @@
 #ifndef _H_CANVAS_UTILS
 #define _H_CANVAS_UTILS
 
+#ifdef WIN32
+#include <windows.h>
+#endif
+
 #include <spice/types.h>
 
 #include "pixman_utils.h"