diff --git a/ChangeLog b/ChangeLog
index 95018e477cc54d5e1303460d6492cebf8e9ce8d6..252c0b110c2a5ce6faa3eae5b3529df0d3f2276b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 20 09:05:15 EDT 2006 Daniel Veillard <veillard@redhat.com>
+
+	* proxy/Makefile.am src/xen_internal.c src/xend_internal.c: cleanup
+	  code when compiled for the proxy, changed the command line macro and
+	  remove warnings.
+
 Wed Jul 19 17:26:48 EDT 2006 Daniel Berrange <berrange@redhat.com>
 
 	* src/*.c: Bulk replace 'informations' with 'information' to
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index c1a841d97120d5a5b8d6ce288fff61de0f50d3ca..e6741a3c292508102bb302f48bee0bb37b3a8562 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES = -I$(top_builddir)/include -I@top_srcdir@/include \
            -I@top_srcdir@/proxy -I@top_srcdir@/src @LIBXML_CFLAGS@ \
-	   -DXEN_RO
+	   -DPROXY
 
 
 libexec_PROGRAMS = libvirt_proxy
diff --git a/src/xen_internal.c b/src/xen_internal.c
index b4aef0e52832b1fd64ac9ba4b9108d70b3bfe6c5..d0ca433a9478db9f65fa0ee653c54078d416e5e5 100644
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -49,11 +49,13 @@ static int hv_version = 0;
 
 #define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd"
 
+#ifndef PROXY
 static const char * xenHypervisorGetType(virConnectPtr conn);
 static unsigned long xenHypervisorGetMaxMemory(virDomainPtr domain);
+#endif
 static int xenHypervisorInit(void);
 
-#ifndef XEN_RO
+#ifndef PROXY
 static virDriver xenHypervisorDriver = {
     VIR_DRV_XEN_HYPERVISOR,
     "Xen",
@@ -89,7 +91,7 @@ static virDriver xenHypervisorDriver = {
     NULL, /* domainSave */
     NULL /* domainRestore */
 };
-#endif /* !XEN_RO */
+#endif /* !PROXY */
 
 /**
  * virXenError:
@@ -177,7 +179,7 @@ done:
 
 }
 
-#ifndef XEN_RO
+#ifndef PROXY
 /**
  * xenHypervisorRegister:
  *
@@ -190,7 +192,7 @@ void xenHypervisorRegister(void)
 
     virRegisterDriver(&xenHypervisorDriver);
 }
-#endif /* !XEN_RO */
+#endif /* !PROXY */
 
 /**
  * xenHypervisorOpen:
@@ -333,6 +335,7 @@ xenHypervisorDoOp(int handle, dom0_op_t * op)
     return (0);
 }
 
+#ifndef PROXY
 /**
  * xenHypervisorGetType:
  * @conn: pointer to the Xen Hypervisor block
@@ -352,6 +355,7 @@ xenHypervisorGetType(virConnectPtr conn)
     }
     return("Xen");
 }
+#endif
 
 /**
  * xenHypervisorGetVersion:
@@ -558,6 +562,7 @@ xenHypervisorGetDomMaxMemory(virConnectPtr conn, int id)
     return((unsigned long) dominfo.max_pages * 4);
 }
 
+#ifndef PROXY
 /**
  * xenHypervisorGetMaxMemory:
  * @domain: a domain object or NULL
@@ -577,6 +582,7 @@ xenHypervisorGetMaxMemory(virDomainPtr domain)
 
     return(xenHypervisorGetDomMaxMemory(domain->conn, domain->handle));
 }
+#endif
 
 /**
  * xenHypervisorGetDomInfo:
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 183229e970569d4b526c8d7b4cf8109cc45f2f00..5798e4be74a4976ff9c3b1f8a3e5e74632f6bc16 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -36,6 +36,7 @@
 #include "xend_internal.h"
 #include "xen_internal.h" /* for DOM0_INTERFACE_VERSION */
 
+#ifndef PROXY
 static const char * xenDaemonGetType(virConnectPtr conn);
 static int xenDaemonListDomains(virConnectPtr conn, int *ids, int maxids);
 static int xenDaemonNumOfDomains(virConnectPtr conn);
@@ -45,8 +46,9 @@ static virDomainPtr xenDaemonLookupByUUID(virConnectPtr conn,
 static virDomainPtr xenDaemonCreateLinux(virConnectPtr conn,
                                          const char *xmlDesc,
 					 unsigned int flags);
+#endif
 
-#ifndef XEN_RO
+#ifndef PROXY
 static virDriver xenDaemonDriver = {
     VIR_DRV_XEN_DAEMON,
     "XenDaemon",
@@ -92,7 +94,7 @@ void xenDaemonRegister(void)
 {
     virRegisterDriver(&xenDaemonDriver);
 }
-#endif /* !XEN_RO */
+#endif /* !PROXY */
 
 /**
  * xend_connection_type:
@@ -1357,7 +1359,7 @@ xend_log(virConnectPtr xend, char *buffer, size_t n_buffer)
  ******
  ******
  *****************************************************************/
-#ifndef XEN_RO
+#ifndef PROXY
 
 /**
  * xend_parse_sexp_desc_os:
@@ -1624,7 +1626,7 @@ xend_parse_sexp_desc(struct sexpr *root)
         free(ret);
     return (NULL);
 }
-#endif /* !XEN_RO */
+#endif /* !PROXY */
 
 /**
  * sexpr_to_xend_domain_info:
@@ -1707,7 +1709,7 @@ sexpr_to_xend_node_info(struct sexpr *root, virNodeInfoPtr info)
     return (0);
 }
 
-#ifndef XEN_RO
+#ifndef PROXY
 /**
  * sexpr_to_domain:
  * @conn: an existing virtual connection block
@@ -1753,7 +1755,7 @@ error:
         virFreeDomain(conn, ret);
     return(NULL);
 }
-#endif /* !XEN_RO */
+#endif /* !PROXY */
 
 /*****************************************************************
  ******
@@ -1766,7 +1768,7 @@ error:
  ******
  ******
  *****************************************************************/
-#ifndef XEN_RO
+#ifndef PROXY
 /**
  * xenDaemonOpen:
  * @conn: an existing virtual connection block
@@ -1854,7 +1856,7 @@ failed:
         xmlFreeURI(uri);
     return(-1);
 }
-#endif /* !XEN_RO */
+#endif /* !PROXY */
 
 /**
  * xenDaemonClose:
@@ -2114,7 +2116,7 @@ xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory)
                    "target", buf, NULL);
 }
 
-#ifndef XEN_RO
+#ifndef PROXY
 /**
  * xenDaemonDomainDumpXML:
  * @domain: a domain object
@@ -2145,7 +2147,7 @@ xenDaemonDomainDumpXML(virDomainPtr domain)
 
     return (ret);
 }
-#endif /* !XEN_RO */
+#endif /* !PROXY */
 
 /**
  * xenDaemonDomainGetInfo:
@@ -2180,7 +2182,7 @@ xenDaemonDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
     return (ret);
 }
 
-#ifndef XEN_RO
+#ifndef PROXY
 /**
  * xenDaemonDomainLookupByName:
  * @conn: A xend instance
@@ -2246,7 +2248,7 @@ xenDaemonNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) {
     return (ret);
 }
 
-#ifndef XEN_RO
+#ifndef PROXY
 /**
  * xenDaemonGetType:
  * @conn: pointer to the Xen Daemon block
@@ -2318,6 +2320,7 @@ xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer)
     return(0);
 }
 
+#ifndef PROXY
 /**
  * xenDaemonListDomains:
  * @conn: pointer to the hypervisor connection
@@ -2394,8 +2397,9 @@ error:
 	sexpr_free(root);
     return(ret);
 }
+#endif
 
-#ifndef XEN_RO
+#ifndef PROXY
 /**
  * xenDaemonLookupByID:
  * @conn: pointer to the hypervisor connection