diff --git a/error.h b/error.h
index 6361f40..d55e207 100644
--- a/error.h
+++ b/error.h
@@ -9,8 +9,8 @@
  * This work is licensed under the terms of the GNU LGPL, version 2.  See
  * the COPYING.LIB file in the top-level directory.
  */
-#ifndef ERROR_H
-#define ERROR_H
+#ifndef ERROR_QAPI_H
+#define ERROR_QAPI_H
 
 #include "compiler.h"
 #include <stdbool.h>
diff --git a/hw/qxl.c b/hw/qxl.c
index db7ae7a..e663f1a 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1189,7 +1189,7 @@ async_common:
         }
         d->current_async = orig_io_port;
         qemu_mutex_unlock(&d->async_lock);
-        dprint(d, 2, "start async %d (%d)\n", io_port, val);
+        dprint(d, 2, "start async %d (%ld)\n", io_port, val);
         break;
     default:
         break;
@@ -1305,7 +1305,7 @@ async_common:
         break;
     }
     case QXL_IO_FLUSH_SURFACES_ASYNC:
-        dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC (%d) (%s, s#=%d, res#=%d)\n",
+        dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC (%ld) (%s, s#=%d, res#=%d)\n",
                val, qxl_mode_to_string(d->mode), d->guest_surfaces.count,
                d->num_free_res);
         qxl_spice_flush_surfaces_async(d);
diff --git a/qapi/qapi-types-core.h b/qapi/qapi-types-core.h
index a79bc2b..64d85fc 100644
--- a/qapi/qapi-types-core.h
+++ b/qapi/qapi-types-core.h
@@ -15,6 +15,6 @@
 #define QAPI_TYPES_CORE_H
 
 #include "qemu-common.h"
-#include "error.h"
+#include "../error.h"
 
 #endif
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 5584693..d024120 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -10,7 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  *
  */
-
+#include "../error.h"
 #include "qemu-objects.h"
 #include "qapi/qmp-core.h"
 #include "json-parser.h"
diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c
index 3fe8866..2640437 100644
--- a/qapi/qmp-registry.c
+++ b/qapi/qmp-registry.c
@@ -11,7 +11,7 @@
  * See the COPYING.LIB file in the top-level directory.
  *
  */
-
+#include "../error.h"
 #include "qapi/qmp-core.h"
 
 static QTAILQ_HEAD(, QmpCommand) qmp_commands =
diff --git a/qemu-objects.h b/qemu-objects.h
index c53fbaa..3fbece1 100644
--- a/qemu-objects.h
+++ b/qemu-objects.h
@@ -13,6 +13,7 @@
 #ifndef QEMU_OBJECTS_H
 #define QEMU_OBJECTS_H
 
+#include "error.h"
 #include "qobject.h"
 #include "qint.h"
 #include "qfloat.h"
diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h
index e42b91d..b81eaba 100644
--- a/qga/guest-agent-core.h
+++ b/qga/guest-agent-core.h
@@ -10,6 +10,7 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+#include "../error.h"
 #include "qapi/qmp-core.h"
 #include "qemu-common.h"