nbd: Clean up use of block_int.h

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

diff --git a/block/nbd.c b/block/nbd.c
index 55cb2fd8ba79a060a5d1dbb15f19db5761ab3b24..70edd81bd6048781f1dd6b0d24ee939bd747f21d 100644 (file)
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -28,6 +28,7 @@
 
 #include "qemu-common.h"
 #include "nbd.h"
+#include "block_int.h"
 #include "module.h"
 #include "qemu_socket.h"
 

diff --git a/nbd.c b/nbd.c
index e7a585dcb04b0bb642d8f3405ad263b327058164..6d81cfbcd093b6709e1dc67031eba3b2d2917bc7 100644 (file)
--- a/nbd.c
+++ b/nbd.c
@@ -17,6 +17,7 @@
  */
 
 #include "nbd.h"
+#include "block.h"
 
 #include <errno.h>
 #include <string.h>

diff --git a/nbd.h b/nbd.h
index 273cfa1af4523d7d74e7d2e76790e5c47bec752a..df7b7af7c0888d027523f4535bdd9d96fe882efe 100644 (file)
--- a/nbd.h
+++ b/nbd.h
@@ -23,8 +23,6 @@
 
 #include "qemu-common.h"
 
-#include "block_int.h"
-
 struct nbd_request {
     uint32_t magic;
     uint32_t type;