Sort out includes for xen_blktap.c

diff --git a/hw/xen_blktap.c b/hw/xen_blktap.c
index 5420da248b3246592742cfeb83b5a9214209c6f4..d307d6e2e4dd5c56d848ed04548d4fca78dcc0a5 100644 (file)
--- a/hw/xen_blktap.c
+++ b/hw/xen_blktap.c
@@ -32,10 +32,9 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "vl.h"
-#include "blktaplib.h"
 #include "xen_blktap.h"
 #include "block_int.h"
+#include "qemu-char.h"
 
 #define MSG_SIZE 4096
 

diff --git a/hw/xen_blktap.h b/hw/xen_blktap.h
index 0fb4bb3f6fb6db8de95c70891971b709a14eda4e..81f735f05a01783d79de2a1182952cf744feace4 100644 (file)
--- a/hw/xen_blktap.h
+++ b/hw/xen_blktap.h
@@ -12,6 +12,7 @@
 #include <syslog.h>
 #include <stdio.h>
 
+#include "hw.h"
 #include "block_int.h"
 
 /* Things disks need to know about, these should probably be in a higher-level

diff --git a/xen-config-host.h b/xen-config-host.h
index 9fe82892305f005ad9a25650570d44ce16bbdaeb..b7a7c9badae628678f32b61a3c4a5d75c8c6507e 100644 (file)
--- a/xen-config-host.h
+++ b/xen-config-host.h
@@ -6,6 +6,7 @@ extern int domid;
 #define bool xen_bool
 #include "xenctrl.h"
 #include "xs.h"
+#include "blktaplib.h"
 #undef bool
 
 extern int xc_handle;