Index: src/domain_conf.c
===================================================================
RCS file: /data/cvs/libvirt/src/domain_conf.c,v
retrieving revision 1.15
diff -u -r1.15 domain_conf.c
--- src/domain_conf.c	1 Aug 2008 14:19:06 -0000	1.15
+++ src/domain_conf.c	5 Aug 2008 07:05:20 -0000
@@ -23,6 +23,7 @@
 
 #include <config.h>
 
+#if defined(WITH_XEN) || defined(WITH_OPENVZ) || defined(WITH_QEMU) || defined(WITH_TEST)
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -3148,3 +3149,4 @@
 }
 
 #endif /* ! PROXY */
+#endif /* !OPENVZ && !QEMU && !XEN && !TEST */
Index: src/network_conf.c
===================================================================
RCS file: /data/cvs/libvirt/src/network_conf.c,v
retrieving revision 1.4
diff -u -r1.4 network_conf.c
--- src/network_conf.c	1 Aug 2008 09:39:44 -0000	1.4
+++ src/network_conf.c	5 Aug 2008 07:05:20 -0000
@@ -25,6 +25,7 @@
 
 #include <config.h>
 
+#if defined(WITH_QEMU) || defined(TEST)
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -739,3 +740,4 @@
 
     return 0;
 }
+#endif /* !WITH_QEMU && !TEST */
Index: src/virsh.c
===================================================================
RCS file: /data/cvs/libvirt/src/virsh.c,v
retrieving revision 1.160
diff -u -r1.160 virsh.c
--- src/virsh.c	1 Aug 2008 14:30:41 -0000	1.160
+++ src/virsh.c	5 Aug 2008 07:05:25 -0000
@@ -5058,6 +5058,7 @@
     return ret;
 }
 
+#ifndef WIN32
 /* Common code for the edit / net-edit / pool-edit functions which follow. */
 static char *
 editWriteToTempFile (vshControl *ctl, const char *doc)
@@ -5315,6 +5316,7 @@
 /* This is generated from this file by a sed script in the Makefile. */
 #include "virsh-pool-edit.c"
 
+#endif /* !WIN32 */
 /*
  * "quit" command
  */
@@ -5358,7 +5360,9 @@
     {"domblkstat", cmdDomblkstat, opts_domblkstat, info_domblkstat},
     {"domifstat", cmdDomIfstat, opts_domifstat, info_domifstat},
     {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml},
+#ifndef WIN32
     {"edit", cmdEdit, opts_edit, info_edit},
+#endif
     {"freecell", cmdFreecell, opts_freecell, info_freecell},
     {"hostname", cmdHostname, NULL, info_hostname},
     {"list", cmdList, opts_list, info_list},
@@ -5369,7 +5373,9 @@
     {"net-define", cmdNetworkDefine, opts_network_define, info_network_define},
     {"net-destroy", cmdNetworkDestroy, opts_network_destroy, info_network_destroy},
     {"net-dumpxml", cmdNetworkDumpXML, opts_network_dumpxml, info_network_dumpxml},
+#ifndef WIN32
     {"net-edit", cmdNetworkEdit, opts_network_edit, info_network_edit},
+#endif
     {"net-list", cmdNetworkList, opts_network_list, info_network_list},
     {"net-name", cmdNetworkName, opts_network_name, info_network_name},
     {"net-start", cmdNetworkStart, opts_network_start, info_network_start},
@@ -5386,7 +5392,9 @@
     {"pool-destroy", cmdPoolDestroy, opts_pool_destroy, info_pool_destroy},
     {"pool-delete", cmdPoolDelete, opts_pool_delete, info_pool_delete},
     {"pool-dumpxml", cmdPoolDumpXML, opts_pool_dumpxml, info_pool_dumpxml},
+#ifndef WIN32
     {"pool-edit", cmdPoolEdit, opts_pool_edit, info_pool_edit},
+#endif
     {"pool-info", cmdPoolInfo, opts_pool_info, info_pool_info},
     {"pool-list", cmdPoolList, opts_pool_list, info_pool_list},
     {"pool-name", cmdPoolName, opts_pool_name, info_pool_name},
Index: tests/testutilsxen.c
===================================================================
RCS file: /data/cvs/libvirt/tests/testutilsxen.c,v
retrieving revision 1.1
diff -u -r1.1 testutilsxen.c
--- tests/testutilsxen.c	25 Jul 2008 13:17:27 -0000	1.1
+++ tests/testutilsxen.c	5 Aug 2008 07:05:25 -0000
@@ -1,4 +1,5 @@
 #include <config.h>
+#ifdef WITH_XEN
 
 #include <sys/utsname.h>
 #include <stdlib.h>
@@ -51,3 +52,4 @@
     virCapabilitiesFree(caps);
     return NULL;
 }
+#endif /* !WIN32 */