Move more stuff to include/qemu/ and util/

Change-Id: I3d10ae4d5b050f7da565476e2c0f6be5d3348f5d
diff --git a/block.c b/block.c
index 6d6a692..23a7ad5 100644
--- a/block.c
+++ b/block.c
@@ -25,7 +25,7 @@
 #include "qemu-common.h"
 #include "monitor.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 #include "qemu-objects.h"
 
 #ifdef CONFIG_BSD