Even more moves.

  include/ui + ui/
  include/qapi/qmp/ + qobject/

Change-Id: Ief236a08cb234d9dd692e85907757678ef32f035
diff --git a/blockdev.c b/blockdev.c
index ff7602b..55d60f8 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -10,9 +10,9 @@
 #include "block.h"
 #include "blockdev.h"
 #include "monitor.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
 #include "sysemu.h"
 
 static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives);