Rename libxc => libxenctrl and xc.h => xen/xenctrl.h

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>


--HG--
rename : tools/libxc/xc.h => tools/libxc/xenctrl.h

48 files changed, 64 insertions, 64 deletions

diff --git a/tools/blktap/blktaplib.h b/tools/blktap/blktaplib.h
index 67ebca64cc..de9edfe2ad 100644
--- a/tools/blktap/blktaplib.h
+++ b/tools/blktap/blktaplib.h
@@ -7,7 +7,7 @@
 #ifndef __BLKTAPLIB_H__
 #define __BLKTAPLIB_H__
 
-#include <xc.h>
+#include <xenctrl.h>
 #include <sys/user.h>
 #include <xen/xen.h>
 #include <xen/io/blkif.h>
diff --git a/tools/blktap/parallax/block-async.h b/tools/blktap/parallax/block-async.h
index 7ae7ec4afe..094ca63685 100755
--- a/tools/blktap/parallax/block-async.h
+++ b/tools/blktap/parallax/block-async.h
@@ -7,7 +7,7 @@
 #define _BLOCKASYNC_H_
 
 #include <assert.h>
-#include <xc.h>
+#include <xenctrl.h>
 #include "vdi.h"
 
 struct io_ret
diff --git a/tools/blktap/parallax/blockstore.h b/tools/blktap/parallax/blockstore.h
index 8415786511..9f2592ecf2 100644
--- a/tools/blktap/parallax/blockstore.h
+++ b/tools/blktap/parallax/blockstore.h
@@ -10,7 +10,7 @@
 #define __BLOCKSTORE_H__
 
 #include <netinet/in.h>
-#include <xc.h>
+#include <xenctrl.h>
 
 #define BLOCK_SIZE  4096
 #define BLOCK_SHIFT   12
diff --git a/tools/console/Makefile b/tools/console/Makefile
index 4a2abdc247..35bac3aaf9 100644
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -26,11 +26,11 @@ clean:
 
 xenconsoled: $(patsubst %.c,%.o,$(wildcard daemon/*.c))
 	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
-              -lxc -lxenstore
+              -lxenctrl -lxenstore
 
 xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
 	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_XENSTORE) \
-	      -lxc -lxenstore
+	      -lxenctrl -lxenstore
 
 install: $(BIN)
 	$(INSTALL_DIR) -p $(DESTDIR)/$(DAEMON_INSTALL_DIR)
diff --git a/tools/console/client/main.c b/tools/console/client/main.c
index a3abd0961e..fb0bf25c5e 100644
--- a/tools/console/client/main.c
+++ b/tools/console/client/main.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 #include <pty.h>
 
-#include "xc.h"
+#include "xenctrl.h"
 #include "xs.h"
 
 #define ESCAPE_CHARACTER 0x1d
diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c
index a6d058acad..9853ffddef 100644
--- a/tools/console/daemon/io.c
+++ b/tools/console/daemon/io.c
@@ -23,7 +23,7 @@
 #include "utils.h"
 #include "io.h"
 
-#include "xc.h"
+#include "xenctrl.h"
 #include "xs.h"
 #include "xen/io/domain_controller.h"
 #include "xcs_proto.h"
diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c
index e485130793..b37351b898 100644
--- a/tools/console/daemon/main.c
+++ b/tools/console/daemon/main.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "xc.h"
+#include "xenctrl.h"
 #include "xen/io/domain_controller.h"
 #include "xcs_proto.h"
 
diff --git a/tools/console/daemon/utils.c b/tools/console/daemon/utils.c
index 96f823bdc7..f1ad0be081 100644
--- a/tools/console/daemon/utils.c
+++ b/tools/console/daemon/utils.c
@@ -33,7 +33,7 @@
 #include <sys/un.h>
 #include <string.h>
 
-#include "xc.h"
+#include "xenctrl.h"
 #include "xen/io/domain_controller.h"
 #include "xcs_proto.h"
 
diff --git a/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c b/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
index 015c4f1938..628e7a9d00 100644
--- a/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
+++ b/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <xc.h>
+#include <xenctrl.h>
 #define TRACE_ENTER /* printf("enter %s\n", __FUNCTION__) */
 long (*myptrace)(enum __ptrace_request, pid_t, long, long);
 int (*myxcwait)(int domain, int *status, int options) ;
diff --git a/tools/debugger/libxendebug/Makefile b/tools/debugger/libxendebug/Makefile
index ed478658a4..0d8881ad49 100644
--- a/tools/debugger/libxendebug/Makefile
+++ b/tools/debugger/libxendebug/Makefile
@@ -20,7 +20,7 @@ CFLAGS   += $(INCLUDES) -I. -I$(XEN_ROOT)/tools/libxc
 CFLAGS   += -Wp,-MD,.$(@F).d
 DEPS     = .*.d
 
-LDFLAGS  += -L$(XEN_ROOT)/tools/libxc -lxc
+LDFLAGS  += -L$(XEN_ROOT)/tools/libxc -lxenctrl
 
 LIB_OBJS := $(patsubst %.c,%.o,$(SRCS))
 PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
diff --git a/tools/debugger/libxendebug/xendebug.c b/tools/debugger/libxendebug/xendebug.c
index 20f6ffd062..f0d8be326f 100644
--- a/tools/debugger/libxendebug/xendebug.c
+++ b/tools/debugger/libxendebug/xendebug.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/mman.h>
-#include <xc.h>
+#include <xenctrl.h>
 #include "list.h"
 
 #if defined(__i386__)
diff --git a/tools/debugger/libxendebug/xendebug.h b/tools/debugger/libxendebug/xendebug.h
index bf79a3b239..41be10df5f 100644
--- a/tools/debugger/libxendebug/xendebug.h
+++ b/tools/debugger/libxendebug/xendebug.h
@@ -9,7 +9,7 @@
 #ifndef _XENDEBUG_H_DEFINED
 #define _XENDEBUG_H_DEFINED
 
-#include <xc.h>
+#include <xenctrl.h>
 
 int xendebug_attach(int xc_handle,
 		    u32 domid,
diff --git a/tools/debugger/pdb/pdb_caml_domain.c b/tools/debugger/pdb/pdb_caml_domain.c
index 5a14a2b82d..482f7df5fa 100644
--- a/tools/debugger/pdb/pdb_caml_domain.c
+++ b/tools/debugger/pdb/pdb_caml_domain.c
@@ -6,7 +6,7 @@
  * PDB's OCaml interface library for debugging domains
  */
 
-#include <xc.h>
+#include <xenctrl.h>
 #include <xendebug.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/tools/debugger/pdb/pdb_caml_evtchn.c b/tools/debugger/pdb/pdb_caml_evtchn.c
index 8a814c3845..0a3e0ae823 100644
--- a/tools/debugger/pdb/pdb_caml_evtchn.c
+++ b/tools/debugger/pdb/pdb_caml_evtchn.c
@@ -6,7 +6,7 @@
  * PDB's OCaml interface library for event channels
  */
 
-#include <xc.h>
+#include <xenctrl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/debugger/pdb/pdb_caml_process.c b/tools/debugger/pdb/pdb_caml_process.c
index 1e2dd7abf1..c91a01147a 100644
--- a/tools/debugger/pdb/pdb_caml_process.c
+++ b/tools/debugger/pdb/pdb_caml_process.c
@@ -15,7 +15,7 @@
 #include <caml/memory.h>
 #include <caml/mlvalues.h>
 
-#include <xc.h>
+#include <xenctrl.h>
 #include <xen/xen.h>
 #include <xen/io/domain_controller.h>
 #include <xen/linux/privcmd.h>
diff --git a/tools/debugger/pdb/pdb_caml_xc.c b/tools/debugger/pdb/pdb_caml_xc.c
index 7507d98808..1bd1fdfb01 100644
--- a/tools/debugger/pdb/pdb_caml_xc.c
+++ b/tools/debugger/pdb/pdb_caml_xc.c
@@ -6,7 +6,7 @@
  * PDB's OCaml interface library for debugging domains
  */
 
-#include <xc.h>
+#include <xenctrl.h>
 #include <xendebug.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/tools/debugger/pdb/pdb_caml_xcs.c b/tools/debugger/pdb/pdb_caml_xcs.c
index 62e988eaef..cdf4ddb4b5 100644
--- a/tools/debugger/pdb/pdb_caml_xcs.c
+++ b/tools/debugger/pdb/pdb_caml_xcs.c
@@ -17,7 +17,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
-#include <xc.h>
+#include <xenctrl.h>
 
 #include <xen/xen.h>
 #include <xen/io/domain_controller.h>
diff --git a/tools/debugger/pdb/pdb_xen.c b/tools/debugger/pdb/pdb_xen.c
index f929010026..e89f364f61 100644
--- a/tools/debugger/pdb/pdb_xen.c
+++ b/tools/debugger/pdb/pdb_xen.c
@@ -7,7 +7,7 @@
  * PDB interface library for accessing Xen
  */
 
-#include <xc.h>
+#include <xenctrl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/tools/firmware/acpi/acpi2_0.h b/tools/firmware/acpi/acpi2_0.h
index 8bf159afc2..4136b3f74a 100644
--- a/tools/firmware/acpi/acpi2_0.h
+++ b/tools/firmware/acpi/acpi2_0.h
@@ -18,7 +18,7 @@
 #ifndef _ACPI_2_0_H_
 #define _ACPI_2_0_H_
 
-#include "xc.h"  // for u8, u16, u32, u64 definition
+#include "xenctrl.h"  // for u8, u16, u32, u64 definition
 
 #pragma pack (1)
 
diff --git a/tools/ioemu/hw/i8254.c b/tools/ioemu/hw/i8254.c
index afa772644e..c92a51ba51 100644
--- a/tools/ioemu/hw/i8254.c
+++ b/tools/ioemu/hw/i8254.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "vl.h"
-#include "xc.h"
+#include "xenctrl.h"
 #include <io/ioreq.h>
 
 //#define DEBUG_PIT
diff --git a/tools/ioemu/hw/i8259.c b/tools/ioemu/hw/i8259.c
index e0e26e7a70..a84e94d44a 100644
--- a/tools/ioemu/hw/i8259.c
+++ b/tools/ioemu/hw/i8259.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "vl.h"
-#include "xc.h"
+#include "xenctrl.h"
 #include <io/ioreq.h>
 
 /* debug PIC */
diff --git a/tools/ioemu/hw/ioapic.h b/tools/ioemu/hw/ioapic.h
index a243b7f59d..1e70c865af 100644
--- a/tools/ioemu/hw/ioapic.h
+++ b/tools/ioemu/hw/ioapic.h
@@ -26,7 +26,7 @@
 #ifndef __IOAPIC_H
 #define __IOAPIC_H
 
-#include "xc.h"
+#include "xenctrl.h"
 #include <io/ioreq.h>
 #include <io/vmx_vlapic.h>
 
diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile
index 56c07c4a3b..233eef4eeb 100644
--- a/tools/ioemu/target-i386-dm/Makefile
+++ b/tools/ioemu/target-i386-dm/Makefile
@@ -188,7 +188,7 @@ endif
 #########################################################
 
 DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DAPIC_SUPPORT
-LIBS+=-lm -L../../libxc -lxc
+LIBS+=-lm -L../../libxc -lxenctrl
 ifndef CONFIG_USER_ONLY
 LIBS+=-lz
 endif
diff --git a/tools/ioemu/target-i386-dm/helper2.c b/tools/ioemu/target-i386-dm/helper2.c
index 5cbeb88aeb..c3b740e3e5 100644
--- a/tools/ioemu/target-i386-dm/helper2.c
+++ b/tools/ioemu/target-i386-dm/helper2.c
@@ -47,7 +47,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include "xc.h"
+#include "xenctrl.h"
 #include <io/ioreq.h>
 
 #include "cpu.h"
diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c
index 9612adaa2a..d6c6d99738 100644
--- a/tools/ioemu/vl.c
+++ b/tools/ioemu/vl.c
@@ -72,7 +72,7 @@
 #endif
 #endif /* CONFIG_SDL */
 
-#include "xc.h"
+#include "xenctrl.h"
 #include "exec-all.h"
 
 //#define DO_TB_FLUSH
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 81fcdc2750..661ae50838 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -48,8 +48,8 @@ DEPS     = .*.d
 LIB_OBJS := $(patsubst %.c,%.o,$(SRCS))
 PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
 
-LIB      := libxc.a libxc-pic.a
-LIB      += libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR)
+LIB      := libxenctrl.a libxenctrl-pic.a
+LIB      += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
 
 all: build
 build: check-for-zlib mk-symlinks
@@ -77,11 +77,11 @@ mk-symlinks:
 install: build
 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
-	$(INSTALL_PROG) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
-	$(INSTALL_DATA) libxc.a $(DESTDIR)/usr/$(LIBDIR)
-	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxc.so.$(MAJOR)
-	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxc.so
-	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
+	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
+	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
+	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
+	$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include/xen
 
 .PHONY: TAGS clean rpm install all
 
@@ -100,18 +100,18 @@ rpm: build
 	mv staging/i386/*.rpm .
 	rm -rf staging
 
-libxc.a: $(LIB_OBJS)
+libxenctrl.a: $(LIB_OBJS)
 	$(AR) rc $@ $^
 
-libxc-pic.a: $(PIC_OBJS)
+libxenctrl-pic.a: $(PIC_OBJS)
 	$(AR) rc $@ $^
 
-libxc.so: libxc.so.$(MAJOR)
+libxenctrl.so: libxenctrl.so.$(MAJOR)
 	ln -sf $< $@
-libxc.so.$(MAJOR): libxc.so.$(MAJOR).$(MINOR)
+libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
 	ln -sf $< $@
 
-libxc.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxc.so.$(MAJOR) -shared -o $@ $^ -lz
+libxenctrl.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-soname -Wl,libxenctrl.so.$(MAJOR) -shared -o $@ $^ -lz
 
 -include $(DEPS)
diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h
index 1b58b0d523..ef0187ba3d 100644
--- a/tools/libxc/xc_private.h
+++ b/tools/libxc/xc_private.h
@@ -14,7 +14,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "xc.h"
+#include "xenctrl.h"
 
 #include <xen/linux/privcmd.h>
 
diff --git a/tools/libxc/xc.h b/tools/libxc/xenctrl.h
index 66cc805920..5206a51779 100644
--- a/tools/libxc/xc.h
+++ b/tools/libxc/xenctrl.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * xc.h
+ * xenctrl.h
  * 
  * A library for low-level access to the Xen control interfaces.
  * 
diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 3b695f61e2..0834da625c 100644
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -50,4 +50,4 @@ clean:
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 $(TARGETS): %: %.o Makefile
-	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxc
+	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
diff --git a/tools/misc/cpuperf/Makefile b/tools/misc/cpuperf/Makefile
index 71710bb9fe..604e149b70 100644
--- a/tools/misc/cpuperf/Makefile
+++ b/tools/misc/cpuperf/Makefile
@@ -37,7 +37,7 @@ clean:
 	$(CC) $(CFLAGS) -o $@ $<
 
 cpuperf-xen: cpuperf.c $(HDRS) Makefile
-	$(CC) $(CFLAGS) -I $(XEN_LIBXC) -L$(XEN_LIBXC) -lxc -DXENO -o $@ $<
+	$(CC) $(CFLAGS) -I $(XEN_LIBXC) -L$(XEN_LIBXC) -lxenctrl -DXENO -o $@ $<
 
 cpuperf-perfcntr: cpuperf.c $(HDRS) Makefile
 	$(CC) $(CFLAGS) -DPERFCNTR -o $@ $<
diff --git a/tools/misc/cpuperf/cpuperf_xeno.h b/tools/misc/cpuperf/cpuperf_xeno.h
index 4f7da770e1..8663a2cc4c 100644
--- a/tools/misc/cpuperf/cpuperf_xeno.h
+++ b/tools/misc/cpuperf/cpuperf_xeno.h
@@ -9,7 +9,7 @@
  *
  */
 
-#include <xc.h>
+#include <xenctrl.h>
 
 static int xc_handle;
 
diff --git a/tools/misc/xc_shadow.c b/tools/misc/xc_shadow.c
index ba21a34126..20363637bf 100644
--- a/tools/misc/xc_shadow.c
+++ b/tools/misc/xc_shadow.c
@@ -11,7 +11,7 @@
  */
 
 
-#include <xc.h>
+#include <xenctrl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>
diff --git a/tools/misc/xenperf.c b/tools/misc/xenperf.c
index 16ddfcb293..1572780c3d 100644
--- a/tools/misc/xenperf.c
+++ b/tools/misc/xenperf.c
@@ -11,7 +11,7 @@
  */
 
 
-#include <xc.h>
+#include <xenctrl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>
diff --git a/tools/python/setup.py b/tools/python/setup.py
index fdf9a39a40..3b716e197b 100644
--- a/tools/python/setup.py
+++ b/tools/python/setup.py
@@ -17,7 +17,7 @@ library_dirs = [ XEN_ROOT + "/tools/libxc",
                  XEN_ROOT + "/tools/xenstore",
                  ]
 
-libraries = [ "xc", "xenstore" ]
+libraries = [ "xenctrl", "xenstore" ]
 
 xc = Extension("xc",
                extra_compile_args = extra_compile_args,
@@ -41,7 +41,7 @@ xs = Extension("xs",
                sources            = [ "xen/lowlevel/xs/xs.c" ])
 
 setup(name            = 'xen',
-      version         = '2.0',
+      version         = '3.0',
       description     = 'Xen',
       packages        = ['xen',
                          'xen.lowlevel',
diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c
index 517f1dd841..027ac2a223 100644
--- a/tools/python/xen/lowlevel/xc/xc.c
+++ b/tools/python/xen/lowlevel/xc/xc.c
@@ -5,7 +5,7 @@
  */
 
 #include <Python.h>
-#include <xc.h>
+#include <xenctrl.h>
 #include <zlib.h>
 #include <fcntl.h>
 #include <netinet/in.h>
diff --git a/tools/python/xen/lowlevel/xu/xu.c b/tools/python/xen/lowlevel/xu/xu.c
index 0f27544898..780ff16990 100644
--- a/tools/python/xen/lowlevel/xu/xu.c
+++ b/tools/python/xen/lowlevel/xu/xu.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <signal.h>
-#include <xc.h>
+#include <xenctrl.h>
 
 #include <xen/xen.h>
 #include <xen/io/domain_controller.h>
diff --git a/tools/xcs/Makefile b/tools/xcs/Makefile
index c3c4bdfa82..ad08e1c23d 100644
--- a/tools/xcs/Makefile
+++ b/tools/xcs/Makefile
@@ -34,10 +34,10 @@ clean:
 
 xcsdump: xcsdump.c dump.c
 	$(CC) $(CFLAGS) -o xcsdump xcsdump.c -L$(XEN_LIBXC) \
-              ctrl_interface.c evtchn.c dump.c -lxc
+              ctrl_interface.c evtchn.c dump.c -lxenctrl
 
 $(BIN): $(OBJS)
-	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -lxc 
+	$(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -lxenctrl 
 
 $(OBJS): $(HDRS)
 
diff --git a/tools/xcs/dump.h b/tools/xcs/dump.h
index 721ea86b32..39fdd2dcd4 100644
--- a/tools/xcs/dump.h
+++ b/tools/xcs/dump.h
@@ -20,7 +20,7 @@
 #define XENCTLD_ERROR_H
 
 #include <stdint.h>
-#include <xc.h>
+#include <xenctrl.h>
 #include <xen/io/domain_controller.h>
 
 void dump_msg(const control_msg_t *msg, uint64_t flags);
diff --git a/tools/xcs/xcs.h b/tools/xcs/xcs.h
index 0d37659ce8..ddf5716623 100644
--- a/tools/xcs/xcs.h
+++ b/tools/xcs/xcs.h
@@ -11,7 +11,7 @@
 #define __XCS_H__
 
 #include <pthread.h>
-#include <xc.h>
+#include <xenctrl.h>
 #include <xen/xen.h>
 #include <xen/io/domain_controller.h>
 #include <xen/linux/privcmd.h>
diff --git a/tools/xcs/xcsdump.c b/tools/xcs/xcsdump.c
index dfc166b154..1f1a2af883 100644
--- a/tools/xcs/xcsdump.c
+++ b/tools/xcs/xcsdump.c
@@ -16,7 +16,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <ctype.h>
-#include <xc.h>
+#include <xenctrl.h>
 #include <xen/xen.h>
 #include <xen/io/domain_controller.h>
 #include <getopt.h>
diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index d4e0ebad0f..4397dbbf8f 100644
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -30,7 +30,7 @@ PROG_DEP = .*.d
 
 PROGRAMS		= xc_restore xc_save
 
-LDLIBS			= -L$(XEN_LIBXC) -lxc
+LDLIBS			= -L$(XEN_LIBXC) -lxenctrl
 
 .PHONY: all
 all: build
diff --git a/tools/xcutils/xc_restore.c b/tools/xcutils/xc_restore.c
index 2eec44c40c..e3d00aa5c1 100644
--- a/tools/xcutils/xc_restore.c
+++ b/tools/xcutils/xc_restore.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <err.h>
 
-#include <xc.h>
+#include <xenctrl.h>
 
 int
 main(int argc, char **argv)
diff --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c
index 6ca1d5cc6c..d2b2e96be9 100644
--- a/tools/xcutils/xc_save.c
+++ b/tools/xcutils/xc_save.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <err.h>
 
-#include <xc.h>
+#include <xenctrl.h>
 
 int
 main(int argc, char **argv)
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index db0d039292..992f93bc82 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -32,7 +32,7 @@ xen:
 	ln -sf $(XEN_ROOT)/xen/include/public $@
 
 xenstored: xenstored_core.o xenstored_watch.o xenstored_domain.o xenstored_transaction.o xs_lib.o talloc.o utils.o
-	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxc -o $@
+	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl -o $@
 
 xenstored_test: xenstored_core_test.o xenstored_watch_test.o xenstored_domain_test.o xenstored_transaction_test.o xs_lib.o talloc_test.o fake_libxc.o utils.o
 	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
@@ -103,7 +103,7 @@ stresstest: xs_stress xenstored_test
 	export $(TESTENV); PID=`./xenstored_test --output-pid --trace-file=/tmp/trace`; ./xs_stress 5000; ret=$$?; kill $$PID; exit $$ret
 
 xs_dom0_test: xs_dom0_test.o utils.o
-	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxc -o $@
+	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -lxenctrl -o $@
 
 TAGS:
 	etags `find . -name '*.[ch]'`
diff --git a/tools/xenstore/xs_dom0_test.c b/tools/xenstore/xs_dom0_test.c
index 8b3b5e695a..e92c3470ae 100644
--- a/tools/xenstore/xs_dom0_test.c
+++ b/tools/xenstore/xs_dom0_test.c
@@ -3,7 +3,7 @@
 #include <sys/ioctl.h>
 #include "xs.h"
 #include "utils.h"
-#include <xc.h>
+#include <xenctrl.h>
 #include <xen/linux/privcmd.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/tools/xenstore/xs_lib.h b/tools/xenstore/xs_lib.h
index 7b58118b7c..4e99c2aa9c 100644
--- a/tools/xenstore/xs_lib.h
+++ b/tools/xenstore/xs_lib.h
@@ -22,7 +22,7 @@
 
 #include <stdbool.h>
 #include <limits.h>
-#include <xc.h>
+#include <xenctrl.h>
 
 /* Bitmask of permissions. */
 enum xs_perm_type {
diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 329d71c3ee..b6ae508d85 100644
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -36,4 +36,4 @@ clean:
 	$(RM) *.a *.so *.o *.rpm $(BIN)
 
 %: %.c $(HDRS) Makefile
-	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxc
+	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c
index c0f85f7485..777604e369 100644
--- a/tools/xentrace/xenctx.c
+++ b/tools/xentrace/xenctx.c
@@ -21,7 +21,7 @@
 #include <argp.h>
 #include <signal.h>
 
-#include "xc.h"
+#include "xenctrl.h"
 
 #ifdef __i386__
 void print_ctx(vcpu_guest_context_t *ctx1)