diff -Naur qemu-kvm-0.15.0_orig/error.h qemu-kvm-0.15.0/error.h
--- qemu-kvm-0.15.0_orig/error.h	2011-08-09 15:40:29.000000000 +0300
+++ qemu-kvm-0.15.0/error.h	2011-08-14 01:23:06.000000000 +0300
@@ -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_Q_H
+#define ERROR_Q_H
 
 #include "compiler.h"
 #include <stdbool.h>
diff -Naur qemu-kvm-0.15.0_orig/qapi/qapi-types-core.h qemu-kvm-0.15.0/qapi/qapi-types-core.h
--- qemu-kvm-0.15.0_orig/qapi/qapi-types-core.h	2011-08-09 15:40:29.000000000 +0300
+++ qemu-kvm-0.15.0/qapi/qapi-types-core.h	2011-08-14 01:23:44.000000000 +0300
@@ -14,6 +14,7 @@
 #ifndef QAPI_TYPES_CORE_H
 #define QAPI_TYPES_CORE_H
 
+#include "../error.h"
 #include "qemu-common.h"
 #include "error.h"
 
diff -Naur qemu-kvm-0.15.0_orig/qapi/qmp-core.h qemu-kvm-0.15.0/qapi/qmp-core.h
--- qemu-kvm-0.15.0_orig/qapi/qmp-core.h	2011-08-09 15:40:29.000000000 +0300
+++ qemu-kvm-0.15.0/qapi/qmp-core.h	2011-08-14 01:25:04.000000000 +0300
@@ -13,7 +13,7 @@
 
 #ifndef QMP_CORE_H
 #define QMP_CORE_H
-
+#include "../error.h"
 #include "qobject.h"
 #include "qdict.h"
 #include "error.h"