Move all internal header files to a separate directory, so that it's clear what

forms the public API.  Tidy up a couple of macros in xen_internal.h.  Remove
test_hvm_bindings, which no longer builds, and which has had its functionality
subsumed into test_bindings.  Bump the library version to 0.9.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

64 files changed, 225 insertions, 194 deletions

diff --git a/tools/libxen/include/xen/api/xen_all.h b/tools/libxen/include/xen/api/xen_all.h
new file mode 100644
index 0000000000..8f0c1b83bc
--- /dev/null
+++ b/tools/libxen/include/xen/api/xen_all.h
@@ -0,0 +1,39 @@
+/* This file is autogenerated */
+#ifndef XEN_API_XEN_ALL_H
+#define XEN_API_XEN_ALL_H
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_console.h>
+#include <xen/api/xen_console_protocol.h>
+#include <xen/api/xen_crashdump.h>
+#include <xen/api/xen_event.h>
+#include <xen/api/xen_event_operation.h>
+#include <xen/api/xen_host_cpu.h>
+#include <xen/api/xen_host.h>
+#include <xen/api/xen_host_metrics.h>
+#include <xen/api/xen_int_float_map.h>
+#include <xen/api/xen_int_int_map.h>
+#include <xen/api/xen_int_string_set_map.h>
+#include <xen/api/xen_network.h>
+#include <xen/api/xen_on_crash_behaviour.h>
+#include <xen/api/xen_on_normal_exit.h>
+#include <xen/api/xen_pbd.h>
+#include <xen/api/xen_pif.h>
+#include <xen/api/xen_pif_metrics.h>
+#include <xen/api/xen_sr.h>
+#include <xen/api/xen_string_set.h>
+#include <xen/api/xen_string_string_map.h>
+#include <xen/api/xen_user.h>
+#include <xen/api/xen_vbd.h>
+#include <xen/api/xen_vbd_metrics.h>
+#include <xen/api/xen_vbd_mode.h>
+#include <xen/api/xen_vbd_type.h>
+#include <xen/api/xen_vdi.h>
+#include <xen/api/xen_vdi_type.h>
+#include <xen/api/xen_vif.h>
+#include <xen/api/xen_vif_metrics.h>
+#include <xen/api/xen_vm_guest_metrics.h>
+#include <xen/api/xen_vm.h>
+#include <xen/api/xen_vm_metrics.h>
+#include <xen/api/xen_vm_power_state.h>
+#include <xen/api/xen_vtpm.h>
+#endif
diff --git a/tools/libxen/include/xen_common.h b/tools/libxen/include/xen/api/xen_common.h
index fc8d092e74..89d92cacc4 100644
--- a/tools/libxen/include/xen_common.h
+++ b/tools/libxen/include/xen/api/xen_common.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <time.h>
 
-#include "xen_host_decl.h"
+#include "xen/api/xen_host_decl.h"
 
 
 typedef bool (*xen_result_func)(const void *data, size_t len,
diff --git a/tools/libxen/include/xen_console.h b/tools/libxen/include/xen/api/xen_console.h
index 5402ae9fbe..19bfdeb082 100644
--- a/tools/libxen/include/xen_console.h
+++ b/tools/libxen/include/xen/api/xen_console.h
@@ -19,11 +19,11 @@
 #ifndef XEN_CONSOLE_H
 #define XEN_CONSOLE_H
 
-#include "xen_common.h"
-#include "xen_console_decl.h"
-#include "xen_console_protocol.h"
-#include "xen_string_string_map.h"
-#include "xen_vm_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_console_decl.h>
+#include <xen/api/xen_console_protocol.h>
+#include <xen/api/xen_string_string_map.h>
+#include <xen/api/xen_vm_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_console_decl.h b/tools/libxen/include/xen/api/xen_console_decl.h
index 1392164593..432ff76919 100644
--- a/tools/libxen/include/xen_console_decl.h
+++ b/tools/libxen/include/xen/api/xen_console_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_console_protocol.h b/tools/libxen/include/xen/api/xen_console_protocol.h
index e6fcf62b4a..413ad7aa9b 100644
--- a/tools/libxen/include/xen_console_protocol.h
+++ b/tools/libxen/include/xen/api/xen_console_protocol.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #define XEN_CONSOLE_PROTOCOL_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 enum xen_console_protocol
diff --git a/tools/libxen/include/xen_crashdump.h b/tools/libxen/include/xen/api/xen_crashdump.h
index 00869dbb4c..145e0419a7 100644
--- a/tools/libxen/include/xen_crashdump.h
+++ b/tools/libxen/include/xen/api/xen_crashdump.h
@@ -19,10 +19,10 @@
 #ifndef XEN_CRASHDUMP_H
 #define XEN_CRASHDUMP_H
 
-#include "xen_common.h"
-#include "xen_crashdump_decl.h"
-#include "xen_vdi_decl.h"
-#include "xen_vm_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_crashdump_decl.h>
+#include <xen/api/xen_vdi_decl.h>
+#include <xen/api/xen_vm_decl.h>
 
 
 /*
@@ -183,7 +183,7 @@ xen_crashdump_get_vdi(xen_session *session, xen_vdi *result, xen_crashdump crash
 
 
 /**
- * Destroy the specified crashdump
+ * Destroy the specified crashdump.
  */
 extern bool
 xen_crashdump_destroy(xen_session *session, xen_crashdump self);
diff --git a/tools/libxen/include/xen_crashdump_decl.h b/tools/libxen/include/xen/api/xen_crashdump_decl.h
index 3087715c4f..4eb6d5493f 100644
--- a/tools/libxen/include/xen_crashdump_decl.h
+++ b/tools/libxen/include/xen/api/xen_crashdump_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_event.h b/tools/libxen/include/xen/api/xen_event.h
index 1e171b8d26..6a2845b4b2 100644
--- a/tools/libxen/include/xen_event.h
+++ b/tools/libxen/include/xen/api/xen_event.h
@@ -19,10 +19,10 @@
 #ifndef XEN_EVENT_H
 #define XEN_EVENT_H
 
-#include "xen_common.h"
-#include "xen_event_decl.h"
-#include "xen_event_operation.h"
-#include "xen_string_set.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_event_decl.h>
+#include <xen/api/xen_event_operation.h>
+#include <xen/api/xen_string_set.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_event_decl.h b/tools/libxen/include/xen/api/xen_event_decl.h
index 856991fd09..856991fd09 100644
--- a/tools/libxen/include/xen_event_decl.h
+++ b/tools/libxen/include/xen/api/xen_event_decl.h
diff --git a/tools/libxen/include/xen_event_operation.h b/tools/libxen/include/xen/api/xen_event_operation.h
index 05319ef58a..31cce20b8a 100644
--- a/tools/libxen/include/xen_event_operation.h
+++ b/tools/libxen/include/xen/api/xen_event_operation.h
@@ -20,7 +20,7 @@
 #define XEN_EVENT_OPERATION_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 enum xen_event_operation
diff --git a/tools/libxen/include/xen_host.h b/tools/libxen/include/xen/api/xen_host.h
index cb2c447fc4..9ca40d700e 100644
--- a/tools/libxen/include/xen_host.h
+++ b/tools/libxen/include/xen/api/xen_host.h
@@ -19,16 +19,16 @@
 #ifndef XEN_HOST_H
 #define XEN_HOST_H
 
-#include "xen_common.h"
-#include "xen_host_cpu_decl.h"
-#include "xen_host_decl.h"
-#include "xen_host_metrics_decl.h"
-#include "xen_pbd_decl.h"
-#include "xen_pif_decl.h"
-#include "xen_sr_decl.h"
-#include "xen_string_set.h"
-#include "xen_string_string_map.h"
-#include "xen_vm_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_host_cpu_decl.h>
+#include <xen/api/xen_host_decl.h>
+#include <xen/api/xen_host_metrics_decl.h>
+#include <xen/api/xen_pbd_decl.h>
+#include <xen/api/xen_pif_decl.h>
+#include <xen/api/xen_sr_decl.h>
+#include <xen/api/xen_string_set.h>
+#include <xen/api/xen_string_string_map.h>
+#include <xen/api/xen_vm_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_host_cpu.h b/tools/libxen/include/xen/api/xen_host_cpu.h
index b484793782..f1bdb7134f 100644
--- a/tools/libxen/include/xen_host_cpu.h
+++ b/tools/libxen/include/xen/api/xen_host_cpu.h
@@ -19,9 +19,9 @@
 #ifndef XEN_HOST_CPU_H
 #define XEN_HOST_CPU_H
 
-#include "xen_common.h"
-#include "xen_host_cpu_decl.h"
-#include "xen_host_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_host_cpu_decl.h>
+#include <xen/api/xen_host_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_host_cpu_decl.h b/tools/libxen/include/xen/api/xen_host_cpu_decl.h
index 1d24953ecc..1e9be29004 100644
--- a/tools/libxen/include/xen_host_cpu_decl.h
+++ b/tools/libxen/include/xen/api/xen_host_cpu_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_host_decl.h b/tools/libxen/include/xen/api/xen_host_decl.h
index affb676869..79d974b471 100644
--- a/tools/libxen/include/xen_host_decl.h
+++ b/tools/libxen/include/xen/api/xen_host_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_host_metrics.h b/tools/libxen/include/xen/api/xen_host_metrics.h
index 84121332c7..2055362672 100644
--- a/tools/libxen/include/xen_host_metrics.h
+++ b/tools/libxen/include/xen/api/xen_host_metrics.h
@@ -19,8 +19,8 @@
 #ifndef XEN_HOST_METRICS_H
 #define XEN_HOST_METRICS_H
 
-#include "xen_common.h"
-#include "xen_host_metrics_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_host_metrics_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_host_metrics_decl.h b/tools/libxen/include/xen/api/xen_host_metrics_decl.h
index e9137160ed..8b73554e69 100644
--- a/tools/libxen/include/xen_host_metrics_decl.h
+++ b/tools/libxen/include/xen/api/xen_host_metrics_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_int_float_map.h b/tools/libxen/include/xen/api/xen_int_float_map.h
index 9cc4769d48..058c45e459 100644
--- a/tools/libxen/include/xen_int_float_map.h
+++ b/tools/libxen/include/xen/api/xen_int_float_map.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #define XEN_INT_FLOAT_MAP_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 typedef struct xen_int_float_map_contents
diff --git a/tools/libxen/include/xen_int_int_map.h b/tools/libxen/include/xen/api/xen_int_int_map.h
index 5d11e146b0..71295a62b8 100644
--- a/tools/libxen/include/xen_int_int_map.h
+++ b/tools/libxen/include/xen/api/xen_int_int_map.h
@@ -20,7 +20,7 @@
 #define XEN_INT_INT_MAP_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 typedef struct xen_int_int_map_contents
diff --git a/tools/libxen/include/xen_int_string_set_map.h b/tools/libxen/include/xen/api/xen_int_string_set_map.h
index 7a784fd070..bca1a6bb7e 100644
--- a/tools/libxen/include/xen_int_string_set_map.h
+++ b/tools/libxen/include/xen/api/xen_int_string_set_map.h
@@ -20,7 +20,7 @@
 #define XEN_INT_STRING_SET_MAP_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 typedef struct xen_int_string_set_map_contents
diff --git a/tools/libxen/include/xen_network.h b/tools/libxen/include/xen/api/xen_network.h
index 988495f2f4..bf8295afe0 100644
--- a/tools/libxen/include/xen_network.h
+++ b/tools/libxen/include/xen/api/xen_network.h
@@ -19,11 +19,11 @@
 #ifndef XEN_NETWORK_H
 #define XEN_NETWORK_H
 
-#include "xen_common.h"
-#include "xen_network_decl.h"
-#include "xen_pif_decl.h"
-#include "xen_string_string_map.h"
-#include "xen_vif_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_network_decl.h>
+#include <xen/api/xen_pif_decl.h>
+#include <xen/api/xen_string_string_map.h>
+#include <xen/api/xen_vif_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_network_decl.h b/tools/libxen/include/xen/api/xen_network_decl.h
index d970c2af15..dbfb3e919e 100644
--- a/tools/libxen/include/xen_network_decl.h
+++ b/tools/libxen/include/xen/api/xen_network_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_on_crash_behaviour.h b/tools/libxen/include/xen/api/xen_on_crash_behaviour.h
index 8286488659..47792c6a01 100644
--- a/tools/libxen/include/xen_on_crash_behaviour.h
+++ b/tools/libxen/include/xen/api/xen_on_crash_behaviour.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #define XEN_ON_CRASH_BEHAVIOUR_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 enum xen_on_crash_behaviour
diff --git a/tools/libxen/include/xen_on_normal_exit.h b/tools/libxen/include/xen/api/xen_on_normal_exit.h
index 3897fef24c..cd5a813ff0 100644
--- a/tools/libxen/include/xen_on_normal_exit.h
+++ b/tools/libxen/include/xen/api/xen_on_normal_exit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #define XEN_ON_NORMAL_EXIT_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 enum xen_on_normal_exit
diff --git a/tools/libxen/include/xen_pbd.h b/tools/libxen/include/xen/api/xen_pbd.h
index 335d20b2ff..224d2d4a40 100644
--- a/tools/libxen/include/xen_pbd.h
+++ b/tools/libxen/include/xen/api/xen_pbd.h
@@ -19,11 +19,11 @@
 #ifndef XEN_PBD_H
 #define XEN_PBD_H
 
-#include "xen_common.h"
-#include "xen_host_decl.h"
-#include "xen_pbd_decl.h"
-#include "xen_sr_decl.h"
-#include "xen_string_string_map.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_host_decl.h>
+#include <xen/api/xen_pbd_decl.h>
+#include <xen/api/xen_sr_decl.h>
+#include <xen/api/xen_string_string_map.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_pbd_decl.h b/tools/libxen/include/xen/api/xen_pbd_decl.h
index 81f8f4b300..c7e324e94e 100644
--- a/tools/libxen/include/xen_pbd_decl.h
+++ b/tools/libxen/include/xen/api/xen_pbd_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_pif.h b/tools/libxen/include/xen/api/xen_pif.h
index 63fc88477b..d36efd0699 100644
--- a/tools/libxen/include/xen_pif.h
+++ b/tools/libxen/include/xen/api/xen_pif.h
@@ -19,11 +19,11 @@
 #ifndef XEN_PIF_H
 #define XEN_PIF_H
 
-#include "xen_common.h"
-#include "xen_host_decl.h"
-#include "xen_network_decl.h"
-#include "xen_pif_decl.h"
-#include "xen_pif_metrics_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_host_decl.h>
+#include <xen/api/xen_network_decl.h>
+#include <xen/api/xen_pif_decl.h>
+#include <xen/api/xen_pif_metrics_decl.h>
 
 
 /*
@@ -253,7 +253,7 @@ xen_pif_set_vlan(xen_session *session, xen_pif pif, int64_t vlan);
 
 
 /**
- * Create a VLAN interface from an existing physical interface
+ * Create a VLAN interface from an existing physical interface.
  */
 extern bool
 xen_pif_create_vlan(xen_session *session, xen_pif *result, char *device, xen_network network, xen_host host, int64_t vlan);
@@ -261,7 +261,7 @@ xen_pif_create_vlan(xen_session *session, xen_pif *result, char *device, xen_net
 
 /**
  * Destroy the interface (provided it is a synthetic interface like a
- * VLAN; fail if it is a physical interface)
+ * VLAN; fail if it is a physical interface).
  */
 extern bool
 xen_pif_destroy(xen_session *session, xen_pif self);
diff --git a/tools/libxen/include/xen_pif_decl.h b/tools/libxen/include/xen/api/xen_pif_decl.h
index b326bea3bc..6d49bdb6c3 100644
--- a/tools/libxen/include/xen_pif_decl.h
+++ b/tools/libxen/include/xen/api/xen_pif_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_pif_metrics.h b/tools/libxen/include/xen/api/xen_pif_metrics.h
index 970700feb1..06b9d268b4 100644
--- a/tools/libxen/include/xen_pif_metrics.h
+++ b/tools/libxen/include/xen/api/xen_pif_metrics.h
@@ -19,8 +19,8 @@
 #ifndef XEN_PIF_METRICS_H
 #define XEN_PIF_METRICS_H
 
-#include "xen_common.h"
-#include "xen_pif_metrics_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_pif_metrics_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_pif_metrics_decl.h b/tools/libxen/include/xen/api/xen_pif_metrics_decl.h
index 71afe69d53..f6ef2fd276 100644
--- a/tools/libxen/include/xen_pif_metrics_decl.h
+++ b/tools/libxen/include/xen/api/xen_pif_metrics_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_sr.h b/tools/libxen/include/xen/api/xen_sr.h
index 39a8dd6650..08204a29f6 100644
--- a/tools/libxen/include/xen_sr.h
+++ b/tools/libxen/include/xen/api/xen_sr.h
@@ -19,11 +19,11 @@
 #ifndef XEN_SR_H
 #define XEN_SR_H
 
-#include "xen_common.h"
-#include "xen_pbd_decl.h"
-#include "xen_sr_decl.h"
-#include "xen_string_set.h"
-#include "xen_vdi_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_pbd_decl.h>
+#include <xen/api/xen_sr_decl.h>
+#include <xen/api/xen_string_set.h>
+#include <xen/api/xen_vdi_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_sr_decl.h b/tools/libxen/include/xen/api/xen_sr_decl.h
index 533e90c49e..ae7d4f6b1c 100644
--- a/tools/libxen/include/xen_sr_decl.h
+++ b/tools/libxen/include/xen/api/xen_sr_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_string_set.h b/tools/libxen/include/xen/api/xen_string_set.h
index a14af9412b..a14af9412b 100644
--- a/tools/libxen/include/xen_string_set.h
+++ b/tools/libxen/include/xen/api/xen_string_set.h
diff --git a/tools/libxen/include/xen_string_string_map.h b/tools/libxen/include/xen/api/xen_string_string_map.h
index e3e5f6890b..d800442c90 100644
--- a/tools/libxen/include/xen_string_string_map.h
+++ b/tools/libxen/include/xen/api/xen_string_string_map.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #define XEN_STRING_STRING_MAP_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 typedef struct xen_string_string_map_contents
diff --git a/tools/libxen/include/xen_user.h b/tools/libxen/include/xen/api/xen_user.h
index 9669e07116..a6d9dd99e5 100644
--- a/tools/libxen/include/xen_user.h
+++ b/tools/libxen/include/xen/api/xen_user.h
@@ -19,8 +19,8 @@
 #ifndef XEN_USER_H
 #define XEN_USER_H
 
-#include "xen_common.h"
-#include "xen_user_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_user_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_user_decl.h b/tools/libxen/include/xen/api/xen_user_decl.h
index e5caae473b..723a8bfa68 100644
--- a/tools/libxen/include/xen_user_decl.h
+++ b/tools/libxen/include/xen/api/xen_user_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_vbd.h b/tools/libxen/include/xen/api/xen_vbd.h
index d40af36796..9806c5ee73 100644
--- a/tools/libxen/include/xen_vbd.h
+++ b/tools/libxen/include/xen/api/xen_vbd.h
@@ -19,15 +19,15 @@
 #ifndef XEN_VBD_H
 #define XEN_VBD_H
 
-#include "xen_common.h"
-#include "xen_string_set.h"
-#include "xen_string_string_map.h"
-#include "xen_vbd_decl.h"
-#include "xen_vbd_metrics_decl.h"
-#include "xen_vbd_mode.h"
-#include "xen_vbd_type.h"
-#include "xen_vdi_decl.h"
-#include "xen_vm_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_string_set.h>
+#include <xen/api/xen_string_string_map.h>
+#include <xen/api/xen_vbd_decl.h>
+#include <xen/api/xen_vbd_metrics_decl.h>
+#include <xen/api/xen_vbd_mode.h>
+#include <xen/api/xen_vbd_type.h>
+#include <xen/api/xen_vdi_decl.h>
+#include <xen/api/xen_vm_decl.h>
 
 
 /*
@@ -358,7 +358,7 @@ xen_vbd_remove_from_qos_algorithm_params(xen_session *session, xen_vbd vbd, char
 
 /**
  * Change the media in the device for CDROM-like devices only. For
- * other devices, detach the VBD and attach a new one
+ * other devices, detach the VBD and attach a new one.
  */
 extern bool
 xen_vbd_media_change(xen_session *session, xen_vbd vbd, xen_vdi vdi);
@@ -366,7 +366,7 @@ xen_vbd_media_change(xen_session *session, xen_vbd vbd, xen_vdi vdi);
 
 /**
  * Hotplug the specified VBD, dynamically attaching it to the running
- * VM
+ * VM.
  */
 extern bool
 xen_vbd_plug(xen_session *session, xen_vbd self);
@@ -374,7 +374,7 @@ xen_vbd_plug(xen_session *session, xen_vbd self);
 
 /**
  * Hot-unplug the specified VBD, dynamically unattaching it from the
- * running VM
+ * running VM.
  */
 extern bool
 xen_vbd_unplug(xen_session *session, xen_vbd self);
diff --git a/tools/libxen/include/xen_vbd_decl.h b/tools/libxen/include/xen/api/xen_vbd_decl.h
index c6877866b6..018af3b85d 100644
--- a/tools/libxen/include/xen_vbd_decl.h
+++ b/tools/libxen/include/xen/api/xen_vbd_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_vbd_metrics.h b/tools/libxen/include/xen/api/xen_vbd_metrics.h
index f1aa420a34..1cb1a2bc85 100644
--- a/tools/libxen/include/xen_vbd_metrics.h
+++ b/tools/libxen/include/xen/api/xen_vbd_metrics.h
@@ -19,8 +19,8 @@
 #ifndef XEN_VBD_METRICS_H
 #define XEN_VBD_METRICS_H
 
-#include "xen_common.h"
-#include "xen_vbd_metrics_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_vbd_metrics_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_vbd_metrics_decl.h b/tools/libxen/include/xen/api/xen_vbd_metrics_decl.h
index 501aa8f60c..501aa8f60c 100644
--- a/tools/libxen/include/xen_vbd_metrics_decl.h
+++ b/tools/libxen/include/xen/api/xen_vbd_metrics_decl.h
diff --git a/tools/libxen/include/xen_vbd_mode.h b/tools/libxen/include/xen/api/xen_vbd_mode.h
index b0cd1c2cf3..8cab27ec73 100644
--- a/tools/libxen/include/xen_vbd_mode.h
+++ b/tools/libxen/include/xen/api/xen_vbd_mode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #define XEN_VBD_MODE_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 enum xen_vbd_mode
diff --git a/tools/libxen/include/xen_vbd_type.h b/tools/libxen/include/xen/api/xen_vbd_type.h
index 656fa16316..d19aef83bf 100644
--- a/tools/libxen/include/xen_vbd_type.h
+++ b/tools/libxen/include/xen/api/xen_vbd_type.h
@@ -20,7 +20,7 @@
 #define XEN_VBD_TYPE_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 enum xen_vbd_type
diff --git a/tools/libxen/include/xen_vdi.h b/tools/libxen/include/xen/api/xen_vdi.h
index 74b63542e6..c40dcfc4be 100644
--- a/tools/libxen/include/xen_vdi.h
+++ b/tools/libxen/include/xen/api/xen_vdi.h
@@ -19,13 +19,13 @@
 #ifndef XEN_VDI_H
 #define XEN_VDI_H
 
-#include "xen_common.h"
-#include "xen_crashdump_decl.h"
-#include "xen_sr_decl.h"
-#include "xen_string_string_map.h"
-#include "xen_vbd_decl.h"
-#include "xen_vdi_decl.h"
-#include "xen_vdi_type.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_crashdump_decl.h>
+#include <xen/api/xen_sr_decl.h>
+#include <xen/api/xen_string_string_map.h>
+#include <xen/api/xen_vbd_decl.h>
+#include <xen/api/xen_vdi_decl.h>
+#include <xen/api/xen_vdi_type.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_vdi_decl.h b/tools/libxen/include/xen/api/xen_vdi_decl.h
index 34692a2495..13a328e044 100644
--- a/tools/libxen/include/xen_vdi_decl.h
+++ b/tools/libxen/include/xen/api/xen_vdi_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_vdi_type.h b/tools/libxen/include/xen/api/xen_vdi_type.h
index 01168491ee..d98a2abc51 100644
--- a/tools/libxen/include/xen_vdi_type.h
+++ b/tools/libxen/include/xen/api/xen_vdi_type.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #define XEN_VDI_TYPE_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 enum xen_vdi_type
diff --git a/tools/libxen/include/xen_vif.h b/tools/libxen/include/xen/api/xen_vif.h
index e9ad6b4369..26608f0af9 100644
--- a/tools/libxen/include/xen_vif.h
+++ b/tools/libxen/include/xen/api/xen_vif.h
@@ -19,13 +19,13 @@
 #ifndef XEN_VIF_H
 #define XEN_VIF_H
 
-#include "xen_common.h"
-#include "xen_network_decl.h"
-#include "xen_string_set.h"
-#include "xen_string_string_map.h"
-#include "xen_vif_decl.h"
-#include "xen_vif_metrics_decl.h"
-#include "xen_vm_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_network_decl.h>
+#include <xen/api/xen_string_set.h>
+#include <xen/api/xen_string_string_map.h>
+#include <xen/api/xen_vif_decl.h>
+#include <xen/api/xen_vif_metrics_decl.h>
+#include <xen/api/xen_vm_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_vif_decl.h b/tools/libxen/include/xen/api/xen_vif_decl.h
index 6a130f7154..0d4c59d668 100644
--- a/tools/libxen/include/xen_vif_decl.h
+++ b/tools/libxen/include/xen/api/xen_vif_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_vif_metrics.h b/tools/libxen/include/xen/api/xen_vif_metrics.h
index 2febab468d..a363137816 100644
--- a/tools/libxen/include/xen_vif_metrics.h
+++ b/tools/libxen/include/xen/api/xen_vif_metrics.h
@@ -19,8 +19,8 @@
 #ifndef XEN_VIF_METRICS_H
 #define XEN_VIF_METRICS_H
 
-#include "xen_common.h"
-#include "xen_vif_metrics_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_vif_metrics_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_vif_metrics_decl.h b/tools/libxen/include/xen/api/xen_vif_metrics_decl.h
index 5734723adf..5734723adf 100644
--- a/tools/libxen/include/xen_vif_metrics_decl.h
+++ b/tools/libxen/include/xen/api/xen_vif_metrics_decl.h
diff --git a/tools/libxen/include/xen_vm.h b/tools/libxen/include/xen/api/xen_vm.h
index d33f31b860..35448afd9f 100644
--- a/tools/libxen/include/xen_vm.h
+++ b/tools/libxen/include/xen/api/xen_vm.h
@@ -19,21 +19,21 @@
 #ifndef XEN_VM_H
 #define XEN_VM_H
 
-#include "xen_common.h"
-#include "xen_console_decl.h"
-#include "xen_crashdump_decl.h"
-#include "xen_host_decl.h"
-#include "xen_on_crash_behaviour.h"
-#include "xen_on_normal_exit.h"
-#include "xen_string_string_map.h"
-#include "xen_vbd_decl.h"
-#include "xen_vdi_decl.h"
-#include "xen_vif_decl.h"
-#include "xen_vm_decl.h"
-#include "xen_vm_guest_metrics_decl.h"
-#include "xen_vm_metrics_decl.h"
-#include "xen_vm_power_state.h"
-#include "xen_vtpm_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_console_decl.h>
+#include <xen/api/xen_crashdump_decl.h>
+#include <xen/api/xen_host_decl.h>
+#include <xen/api/xen_on_crash_behaviour.h>
+#include <xen/api/xen_on_normal_exit.h>
+#include <xen/api/xen_string_string_map.h>
+#include <xen/api/xen_vbd_decl.h>
+#include <xen/api/xen_vdi_decl.h>
+#include <xen/api/xen_vif_decl.h>
+#include <xen/api/xen_vm_decl.h>
+#include <xen/api/xen_vm_guest_metrics_decl.h>
+#include <xen/api/xen_vm_metrics_decl.h>
+#include <xen/api/xen_vm_power_state.h>
+#include <xen/api/xen_vtpm_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_vm_decl.h b/tools/libxen/include/xen/api/xen_vm_decl.h
index 815b036ea5..f4ca986b62 100644
--- a/tools/libxen/include/xen_vm_decl.h
+++ b/tools/libxen/include/xen/api/xen_vm_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_vm_guest_metrics.h b/tools/libxen/include/xen/api/xen_vm_guest_metrics.h
index 2734764526..fd4d23a24c 100644
--- a/tools/libxen/include/xen_vm_guest_metrics.h
+++ b/tools/libxen/include/xen/api/xen_vm_guest_metrics.h
@@ -19,9 +19,9 @@
 #ifndef XEN_VM_GUEST_METRICS_H
 #define XEN_VM_GUEST_METRICS_H
 
-#include "xen_common.h"
-#include "xen_string_string_map.h"
-#include "xen_vm_guest_metrics_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_string_string_map.h>
+#include <xen/api/xen_vm_guest_metrics_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_vm_guest_metrics_decl.h b/tools/libxen/include/xen/api/xen_vm_guest_metrics_decl.h
index 837528b919..837528b919 100644
--- a/tools/libxen/include/xen_vm_guest_metrics_decl.h
+++ b/tools/libxen/include/xen/api/xen_vm_guest_metrics_decl.h
diff --git a/tools/libxen/include/xen_vm_metrics.h b/tools/libxen/include/xen/api/xen_vm_metrics.h
index 3350a66807..128c1a3a3a 100644
--- a/tools/libxen/include/xen_vm_metrics.h
+++ b/tools/libxen/include/xen/api/xen_vm_metrics.h
@@ -19,13 +19,13 @@
 #ifndef XEN_VM_METRICS_H
 #define XEN_VM_METRICS_H
 
-#include "xen_common.h"
-#include "xen_int_float_map.h"
-#include "xen_int_int_map.h"
-#include "xen_int_string_set_map.h"
-#include "xen_string_set.h"
-#include "xen_string_string_map.h"
-#include "xen_vm_metrics_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_int_float_map.h>
+#include <xen/api/xen_int_int_map.h>
+#include <xen/api/xen_int_string_set_map.h>
+#include <xen/api/xen_string_set.h>
+#include <xen/api/xen_string_string_map.h>
+#include <xen/api/xen_vm_metrics_decl.h>
 
 
 /*
diff --git a/tools/libxen/include/xen_vm_metrics_decl.h b/tools/libxen/include/xen/api/xen_vm_metrics_decl.h
index ea1bcb51f7..76810b5ba6 100644
--- a/tools/libxen/include/xen_vm_metrics_decl.h
+++ b/tools/libxen/include/xen/api/xen_vm_metrics_decl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_vm_power_state.h b/tools/libxen/include/xen/api/xen_vm_power_state.h
index c5404b89cf..649f49a7f1 100644
--- a/tools/libxen/include/xen_vm_power_state.h
+++ b/tools/libxen/include/xen/api/xen_vm_power_state.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
 #define XEN_VM_POWER_STATE_H
 
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 enum xen_vm_power_state
diff --git a/tools/libxen/include/xen_vtpm.h b/tools/libxen/include/xen/api/xen_vtpm.h
index add504221f..920948d134 100644
--- a/tools/libxen/include/xen_vtpm.h
+++ b/tools/libxen/include/xen/api/xen_vtpm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  * Copyright (c) 2006, IBM Corp.
  *
  * This library is free software; you can redistribute it and/or
@@ -20,14 +20,14 @@
 #ifndef XEN_VTPM_H
 #define XEN_VTPM_H
 
-#include "xen_common.h"
-#include "xen_vm_decl.h"
-#include "xen_vtpm_decl.h"
+#include <xen/api/xen_common.h>
+#include <xen/api/xen_vm_decl.h>
+#include <xen/api/xen_vtpm_decl.h>
 
 
 /*
- * The VTPM class. 
- *  
+ * The VTPM class.
+ * 
  * A virtual TPM device.
  */
 
@@ -195,4 +195,5 @@ xen_vtpm_get_vm(xen_session *session, xen_vm *result, xen_vtpm vtpm);
 extern bool
 xen_vtpm_get_backend(xen_session *session, xen_vm *result, xen_vtpm vtpm);
 
+
 #endif
diff --git a/tools/libxen/include/xen_vtpm_decl.h b/tools/libxen/include/xen/api/xen_vtpm_decl.h
index 7798e3856d..7798e3856d 100644
--- a/tools/libxen/include/xen_vtpm_decl.h
+++ b/tools/libxen/include/xen/api/xen_vtpm_decl.h
diff --git a/tools/libxen/include/xen_console_protocol_internal.h b/tools/libxen/include/xen_console_protocol_internal.h
index 70cdae37af..d2ddaa0319 100644
--- a/tools/libxen/include/xen_console_protocol_internal.h
+++ b/tools/libxen/include/xen_console_protocol_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_internal.h b/tools/libxen/include/xen_internal.h
index ea326b29de..21f75de5fe 100644
--- a/tools/libxen/include/xen_internal.h
+++ b/tools/libxen/include/xen_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 XenSource, Inc.
+ * Copyright (c) 2006-2007 XenSource, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "xen_common.h"
+#include <xen/api/xen_common.h>
 
 
 enum abstract_typename
@@ -147,7 +147,12 @@ type__ ## _free(type__ handle)                  \
 }                                               \
 
 
-#define XEN_SET_ALLOC_FREE(type__)                                      \
+#define XEN_SET_ALLOC_FREE(type__)              \
+    XEN_SET_ALLOC(type__)                       \
+    XEN_SET_FREE(type__)
+
+
+#define XEN_SET_ALLOC(type__)                                           \
 type__ ## _set *                                                        \
 type__ ## _set_alloc(size_t size)                                       \
 {                                                                       \
@@ -155,43 +160,29 @@ type__ ## _set_alloc(size_t size)                                       \
                                     size * sizeof(type__));             \
     result->size = size;                                                \
     return result;                                                      \
-}                                                                       \
-                                                                        \
-void                                                                    \
-type__ ## _set_free(type__ ## _set *set)                                \
+}
+
+
+#define XEN_SET_FREE(type__)                                            \
+void type__ ## _set_free(type__ ## _set *set)                           \
 {                                                                       \
     if (set == NULL)                                                    \
-    {                                                                   \
         return;                                                         \
-    }                                                                   \
-    size_t n = set->size;                                               \
-    for (size_t i = 0; i < n; i++)                                      \
-    {                                                                   \
+    for (size_t i = 0; i < set->size; i++)                              \
        type__ ## _free(set->contents[i]);                               \
-    }                                                                   \
-                                                                        \
     free(set);                                                          \
-}                                                                       \
-
-
-#define XEN_RECORD_OPT_FREE(type__)                     \
-void                                                    \
-type__ ## _record_opt_free(type__ ## _record_opt *opt)  \
-{                                                       \
-    if (opt == NULL)                                    \
-    {                                                   \
-        return;                                         \
-    }                                                   \
-    if (opt->is_record)                                 \
-    {                                                   \
-        type__ ## _record_free(opt->u.record);          \
-    }                                                   \
-    else                                                \
-    {                                                   \
-        type__ ## _free(opt->u.handle);                 \
-    }                                                   \
-    free(opt);                                          \
-}                                                       \
+}
+
+
+#define XEN_RECORD_OPT_FREE(type__)                                     \
+void type__ ## _record_opt_free(type__ ## _record_opt *opt) {           \
+    if (opt == NULL) return;                                            \
+    if (opt->is_record)                                                 \
+        type__ ## _record_free(opt->u.record);                          \
+    else                                                                \
+        type__ ## _free(opt->u.handle);                                 \
+    free(opt);                                                          \
+}
 
 
 #endif
diff --git a/tools/libxen/include/xen_on_crash_behaviour_internal.h b/tools/libxen/include/xen_on_crash_behaviour_internal.h
index 012398b814..bd6f1faa7a 100644
--- a/tools/libxen/include/xen_on_crash_behaviour_internal.h
+++ b/tools/libxen/include/xen_on_crash_behaviour_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_on_normal_exit_internal.h b/tools/libxen/include/xen_on_normal_exit_internal.h
index 3a94f8919c..ffff46a869 100644
--- a/tools/libxen/include/xen_on_normal_exit_internal.h
+++ b/tools/libxen/include/xen_on_normal_exit_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_vbd_mode_internal.h b/tools/libxen/include/xen_vbd_mode_internal.h
index 3efd4a63d5..4f05681118 100644
--- a/tools/libxen/include/xen_vbd_mode_internal.h
+++ b/tools/libxen/include/xen_vbd_mode_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_vdi_type_internal.h b/tools/libxen/include/xen_vdi_type_internal.h
index 1de23c8c83..9c575ffaab 100644
--- a/tools/libxen/include/xen_vdi_type_internal.h
+++ b/tools/libxen/include/xen_vdi_type_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/tools/libxen/include/xen_vm_power_state_internal.h b/tools/libxen/include/xen_vm_power_state_internal.h
index 2c88856c08..a3f5af114c 100644
--- a/tools/libxen/include/xen_vm_power_state_internal.h
+++ b/tools/libxen/include/xen_vm_power_state_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public