--- src/slonik/dbutil.c.orig	Wed Apr  4 11:50:01 2007
+++ src/slonik/dbutil.c	Wed Apr  4 11:50:15 2007
@@ -11,10 +11,10 @@
  */
 
 
+#ifndef WIN32
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#ifndef WIN32
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
--- src/slonik/slonik.c.orig	Wed Apr  4 11:50:22 2007
+++ src/slonik/slonik.c	Wed Apr  4 11:50:46 2007
@@ -11,22 +11,21 @@
  */
 
 
+#ifndef WIN32
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#ifndef WIN32
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <errno.h>
+#include <time.h>
 #else
 #define sleep(x) Sleep(x*1000)
 #define vsnprintf _vsnprintf
-#define INT64_FORMAT "%I64d"
 #endif
-#include <errno.h>
-#include <time.h>
 
 #include "postgres.h"
 #include "libpq-fe.h"