diff -uNr a/qemu-kvm-0.15.0/qapi/qapi-types-core.h b/qemu-kvm-0.15.0/qapi/qapi-types-core.h
--- a/qemu-kvm-0.15.0/qapi/qapi-types-core.h	2011-08-13 11:12:03.573188142 -0400
+++ b/qemu-kvm-0.15.0/qapi/qapi-types-core.h	2011-08-13 11:14:16.879188166 -0400
@@ -15,6 +15,6 @@
 #define QAPI_TYPES_CORE_H
 
 #include "qemu-common.h"
-#include "error.h"
+#include "../error.h"
 
 #endif
diff -uNr a/qemu-kvm-0.15.0/qapi/qmp-core.h b/qemu-kvm-0.15.0/qapi/qmp-core.h
--- a/qemu-kvm-0.15.0/qapi/qmp-core.h	2011-08-13 11:12:03.573188142 -0400
+++ b/qemu-kvm-0.15.0/qapi/qmp-core.h	2011-08-13 11:12:22.921188146 -0400
@@ -16,7 +16,7 @@
 
 #include "qobject.h"
 #include "qdict.h"
-#include "error.h"
+#include "../error.h"
 
 typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);