diff --git a/ChangeLog b/ChangeLog
index df6cab6a4..b5e03c604 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 
 	* src/cairo-win32-font.c: Fix various compilation errors.
 
+2005-04-07  Carl Worth  <cworth@cworth.org>
+
+	* src/cairo-gstate.c:
+	* src/cairo-png.c:
+	* src/cairo-win32-font.c:
+	* src/cairo-win32-surface.c:
+	* src/cairo-win32.h:
+	* src/cairoint.h: Minor changes to header file inclusion
+	recommended by Oleg Smolsky for better portability to MSVC.
+
 2005-04-07  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo-png.c (PNG_SIG_SIZE): Use a preprocessor macro to get
diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c
index 5d281c05f..a8abb93d3 100644
--- a/src/cairo-gstate.c
+++ b/src/cairo-gstate.c
@@ -35,7 +35,6 @@
  */
 
 #include <stdlib.h>
-#include <math.h>
 
 #include "cairoint.h"
 
diff --git a/src/cairo-png.c b/src/cairo-png.c
index e84e8b411..fed0cf3b1 100644
--- a/src/cairo-png.c
+++ b/src/cairo-png.c
@@ -36,8 +36,8 @@
  */
 
 #include <png.h>
-#include "cairo-png.h"
 #include "cairoint.h"
+#include "cairo-png.h"
 
 
 static void
@@ -339,3 +339,4 @@ cairo_image_surface_create_for_png (FILE *file, int *width, int *height)
 
     return NULL;
 }
+#undef PNG_SIG_SIZE
diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c
index 3d4033122..cbe245bff 100644
--- a/src/cairo-win32-font.c
+++ b/src/cairo-win32-font.c
@@ -34,7 +34,7 @@
 
 #include <string.h>
 #include <stdio.h>
-
+#include "cairoint.h"
 #include "cairo-win32-private.h"
 
 #ifndef SPI_GETFONTSMOOTHINGTYPE 
diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c
index 8d9a988f8..b0d616525 100644
--- a/src/cairo-win32-surface.c
+++ b/src/cairo-win32-surface.c
@@ -34,7 +34,7 @@
  */
 
 #include <stdio.h>
-
+#include "cairoint.h"
 #include "cairo-win32-private.h"
 
 static const cairo_surface_backend_t cairo_win32_surface_backend;
diff --git a/src/cairo-win32.h b/src/cairo-win32.h
index 27f179df8..535e62cb3 100644
--- a/src/cairo-win32.h
+++ b/src/cairo-win32.h
@@ -34,6 +34,7 @@
  */
 
 #ifndef _CAIRO_WIN32_H_
+#define _CAIRO_WIN32_H_
 
 #include <cairo.h>
 
diff --git a/src/cairoint.h b/src/cairoint.h
index 029841676..51d10309f 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -52,6 +52,10 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES
+#endif
 #include <math.h>
 #include <limits.h>
 #include <stdio.h>