diff --git a/lib/imageio_png.c b/lib/imageio_png.c
index e7c13bfd..a462844f 100644
--- a/lib/imageio_png.c
+++ b/lib/imageio_png.c
@@ -33,10 +33,7 @@
 #include <apr_strings.h>
 
 #ifdef _WIN32
-typedef unsigned char     uint8_t;
-typedef unsigned short    uint16_t;
-typedef unsigned int      uint32_t;
-typedef unsigned long int uint64_t;
+#include <stdint.h>
 #endif
 
 #ifndef Z_BEST_SPEED
diff --git a/lib/util.c b/lib/util.c
index af9447ed..71f349be 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -45,10 +45,7 @@
 #endif
 
 #ifdef _WIN32
-typedef unsigned char     uint8_t;
-typedef unsigned short    uint16_t;
-typedef unsigned int      uint32_t;
-typedef unsigned long int uint64_t;
+#include <stdint.h>
 #endif
 
 const double mapcache_meters_per_unit[MAPCACHE_UNITS_COUNT] = {1.0,6378137.0 * 2.0 * M_PI / 360,0.3048};