diff --git a/src/timezone/asctime.c b/src/timezone/asctime.c
index 7054c75458ce933c34167cc992c4e944408e77cf..31a6275edc933596eb5f4881c128bb126f73b2db 100644
--- a/src/timezone/asctime.c
+++ b/src/timezone/asctime.c
@@ -1,3 +1,4 @@
+#include "pgtz.h"
 /*
 ** This file is in the public domain, so clarified as of
 ** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
diff --git a/src/timezone/difftime.c b/src/timezone/difftime.c
index a4aa631d15a30931731bd3045174912acce5815d..636640d6f572e0ba02a8c33fd6066cbd0ae8099b 100644
--- a/src/timezone/difftime.c
+++ b/src/timezone/difftime.c
@@ -1,3 +1,4 @@
+#include "pgtz.h"
 /*
 ** This file is in the public domain, so clarified as of
 ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c
index 33e22a5e2052651d33657a9c9a4e22feadf3aee8..4f389b52dee13dff7bc433058417a29637902403 100644
--- a/src/timezone/localtime.c
+++ b/src/timezone/localtime.c
@@ -1,3 +1,8 @@
+#include "pgtz.h"
+#undef open
+#define timezone pg_timezone
+#define USG_COMPAT
+extern time_t pg_timezone;
 /*
 ** This file is in the public domain, so clarified as of
 ** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index f4eaa0ca05c6bd3edc7cf616f0932bac80d299a7..ec187addf3d061074646e76c319baf7366696f89 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -1,4 +1,11 @@
 static char	elsieid[] = "@(#)zic.c	7.115";
+#include "pgtz.h"
+#undef unlink
+#undef TZDIR
+#define TZDIR "data"
+#ifdef WIN32
+#include <windows.h>
+#endif
 
 #include "private.h"
 #include "locale.h"
@@ -7,11 +14,13 @@ static char	elsieid[] = "@(#)zic.c	7.115";
 #if HAVE_SYS_STAT_H
 #include "sys/stat.h"
 #endif
+#ifndef WIN32
 #ifdef S_IRUSR
 #define MKDIR_UMASK (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
 #else
 #define MKDIR_UMASK 0755
 #endif
+#endif
 
 /*
 ** On some ancient hosts, predicates like `isspace(C)' are defined
@@ -2234,3 +2243,16 @@ const int	i;
 /*
 ** UNIX was a registered trademark of The Open Group in 2003.
 */
+
+
+#ifdef WIN32
+/*
+ * To run on win32 
+ */
+int link(const char *oldpath, const char *newpath) {
+	if (!CopyFileEx(oldpath, newpath, NULL, NULL, FALSE, 0)) {
+		return -1;
+	}
+	return 0;
+}
+#endif