Index: zzuf/trunk/src/zzuf.c
===================================================================
--- zzuf/trunk/src/zzuf.c	(revision 1728)
+++ zzuf/trunk/src/zzuf.c	(revision 1729)
@@ -35,9 +35,9 @@
 #   include <regex.h>
 #endif
+#if defined HAVE_WINSOCK2_H
+#   include <winsock2.h>
+#endif
 #if defined HAVE_WINDOWS_H
 #   include <windows.h>
-#endif
-#if defined HAVE_WINSOCK2_H
-#   include <winsock2.h>
 #endif
 #if defined HAVE_IO_H
@@ -125,4 +125,8 @@
 #endif
     int i;
+#if !defined HAVE_GETOPT_H
+#   define MOREINFO "Usage: %s message...\n"
+    int optind = 1;
+#endif
 
     _zz_opts_init(opts);
@@ -300,7 +304,4 @@
         }
     }
-#else
-#   define MOREINFO "Usage: %s message...\n"
-    int optind = 1;
 #endif