Index: /zzuf/trunk/src/libzzuf/lib-load.h
===================================================================
--- /zzuf/trunk/src/libzzuf/lib-load.h	(revision 4656)
+++ /zzuf/trunk/src/libzzuf/lib-load.h	(revision 4657)
@@ -19,5 +19,5 @@
 #define ORIG(x) x##_orig
 
-#ifdef HAVE_DLFCN_H
+#if defined HAVE_DLFCN_H
 #   include <dlfcn.h>
 #   define NEW(x) x
@@ -35,5 +35,5 @@
                 abort(); \
         } while(0)
-#else
+#elif defined _WIN32
 #   define NEW(x) x##_new
 #   define LOADSYM(x) \
@@ -57,3 +57,6 @@
                     table_win32[];
 
+#else
+#   error no function diversion system for this platform
 #endif
+
Index: /zzuf/trunk/src/libzzuf/lib-stream.c
===================================================================
--- /zzuf/trunk/src/libzzuf/lib-stream.c	(revision 4656)
+++ /zzuf/trunk/src/libzzuf/lib-stream.c	(revision 4657)
@@ -1148,4 +1148,5 @@
 
 /* Win32 function table */
+#if defined _WIN32
 zzuf_table_t table_stream[] =
 {
@@ -1155,2 +1156,4 @@
     DIVERT_END
 };
+#endif
+
Index: /zzuf/trunk/src/libzzuf/lib-win32.c
===================================================================
--- /zzuf/trunk/src/libzzuf/lib-win32.c	(revision 4656)
+++ /zzuf/trunk/src/libzzuf/lib-win32.c	(revision 4657)
@@ -17,9 +17,15 @@
 #include "config.h"
 
+#if defined HAVE_STDINT_H
+#   include <stdint.h>
+#elif defined HAVE_INTTYPES_H
+#   include <inttypes.h>
+#endif
+
+#include <stdio.h>
+
 #if defined HAVE_WINDOWS_H
 #   include <windows.h>
 #endif
-
-#include <stdio.h>
 
 #include "common.h"
@@ -38,4 +44,5 @@
 #endif
 
+#if defined HAVE_CREATEFILE
 HANDLE NEW(CreateFileA)(LPCTSTR lpFileName, DWORD dwDesiredAccess,
            DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes,
@@ -48,6 +55,8 @@
                              dwFlagsAndAttributes, hTemplateFile);
 }
+#endif
 
 /* Win32 function table */
+#if defined _WIN32
 zzuf_table_t table_win32[] =
 {
@@ -57,3 +66,4 @@
     DIVERT_END
 };
+#endif
 
Index: /zzuf/trunk/src/Makefile.am
===================================================================
--- /zzuf/trunk/src/Makefile.am	(revision 4656)
+++ /zzuf/trunk/src/Makefile.am	(revision 4657)
@@ -15,5 +15,5 @@
     libzzuf/network.c libzzuf/network.h \
     libzzuf/lib-fd.c libzzuf/lib-mem.c libzzuf/lib-signal.c \
-    libzzuf/lib-stream.c libzzuf/lib-load.h
+    libzzuf/lib-stream.c libzzuf/lib-win32.c libzzuf/lib-load.h
 
 COMMON = \