More missing include/qapi/qmp/ headers moved.
Change-Id: I83b1daddaaee42c7edbe533a13324a0dc78e0ed4
diff --git a/json-lexer.h b/include/qapi/qmp/json-lexer.h
similarity index 100%
rename from json-lexer.h
rename to include/qapi/qmp/json-lexer.h
diff --git a/json-parser.h b/include/qapi/qmp/json-parser.h
similarity index 100%
rename from json-parser.h
rename to include/qapi/qmp/json-parser.h
diff --git a/json-streamer.h b/include/qapi/qmp/json-streamer.h
similarity index 96%
rename from json-streamer.h
rename to include/qapi/qmp/json-streamer.h
index 2030e86..209b0ec 100644
--- a/json-streamer.h
+++ b/include/qapi/qmp/json-streamer.h
@@ -15,7 +15,7 @@
#define QEMU_JSON_STREAMER_H
#include "qapi/qmp/qlist.h"
-#include "json-lexer.h"
+#include "qapi/qmp/json-lexer.h"
typedef struct JSONMessageParser
{
diff --git a/qdict.h b/include/qapi/qmp/qdict.h
similarity index 100%
rename from qdict.h
rename to include/qapi/qmp/qdict.h
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index 5616f37..3b51948 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -12,7 +12,7 @@
#ifndef QERROR_H
#define QERROR_H
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qstring.h"
#include "qemu/error-report.h"
#include <stdarg.h>
diff --git a/include/ui/console.h b/include/ui/console.h
index 8b32cdb..906274d 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -2,7 +2,7 @@
#define CONSOLE_H
#include "qemu-char.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
#include "qemu/notify.h"
/* keyboard/mouse support */
diff --git a/monitor.h b/monitor.h
index 4955c62..8f17944 100644
--- a/monitor.h
+++ b/monitor.h
@@ -4,7 +4,7 @@
#include "qemu-common.h"
#include "qemu-char.h"
#include "qapi/qmp/qerror.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
#include "block.h"
extern Monitor *cur_mon;
diff --git a/qemu-objects.h b/qemu-objects.h
index ae85c58..7782ec5 100644
--- a/qemu-objects.h
+++ b/qemu-objects.h
@@ -18,7 +18,7 @@
#include "qapi/qmp/qfloat.h"
#include "qapi/qmp/qbool.h"
#include "qapi/qmp/qstring.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/qjson.h"
diff --git a/qemu-option.h b/qemu-option.h
index b515813..e2d1a63 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -28,7 +28,7 @@
#include <stdint.h>
#include "qemu-queue.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
enum QEMUOptionParType {
OPT_FLAG,
diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c
index b97c24f..56e7a66 100644
--- a/qobject/json-lexer.c
+++ b/qobject/json-lexer.c
@@ -13,10 +13,10 @@
#include "qapi/qmp/qstring.h"
#include "qapi/qmp/qlist.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qint.h"
#include "qemu-common.h"
-#include "json-lexer.h"
+#include "qapi/qmp/json-lexer.h"
/*
* \"([^\\\"]|(\\\"\\'\\\\\\/\\b\\f\\n\\r\\t\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]))*\"
diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index 47ea78e..c3d5a3a 100644
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -16,12 +16,12 @@
#include "qemu-common.h"
#include "qapi/qmp/qstring.h"
#include "qapi/qmp/qint.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/qfloat.h"
#include "qapi/qmp/qbool.h"
-#include "json-parser.h"
-#include "json-lexer.h"
+#include "qapi/qmp/json-parser.h"
+#include "qapi/qmp/json-lexer.h"
typedef struct JSONParserContext
{
diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c
index efe63f0..8241125 100644
--- a/qobject/json-streamer.c
+++ b/qobject/json-streamer.c
@@ -13,10 +13,10 @@
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/qint.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
#include "qemu-common.h"
-#include "json-lexer.h"
-#include "json-streamer.h"
+#include "qapi/qmp/json-lexer.h"
+#include "qapi/qmp/json-streamer.h"
static void json_message_process_token(JSONLexer *lexer, QString *token, JSONTokenType type, int x, int y)
{
diff --git a/qobject/qdict.c b/qobject/qdict.c
index 1ed7d4b..edc0186 100644
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -12,7 +12,7 @@
#include "qapi/qmp/qint.h"
#include "qapi/qmp/qfloat.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qbool.h"
#include "qapi/qmp/qstring.h"
#include "qapi/qmp/qobject.h"
diff --git a/qobject/qjson.c b/qobject/qjson.c
index 0ae70a2..83a6b4f 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -11,15 +11,15 @@
*
*/
-#include "json-lexer.h"
-#include "json-parser.h"
-#include "json-streamer.h"
+#include "qapi/qmp/json-lexer.h"
+#include "qapi/qmp/json-parser.h"
+#include "qapi/qmp/json-streamer.h"
#include "qapi/qmp/qjson.h"
#include "qapi/qmp/qint.h"
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/qbool.h"
#include "qapi/qmp/qfloat.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
typedef struct JSONParsingState
{
diff --git a/sysemu.h b/sysemu.h
index 8ade116..48ce618 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -6,7 +6,7 @@
#include "qemu-option.h"
#include "qemu-queue.h"
#include "qemu/timer.h"
-#include "qdict.h"
+#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#ifdef _WIN32
