From 8d50346ce6f16f42bc2f4bc8699e7498806ab988 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Mon, 17 Feb 2020 23:49:33 -0700
Subject: [PATCH] hw/xbox: Update includes that have changed upstream

---
 hw/xbox/amd_smbus.c      | 1 +
 hw/xbox/chihiro.c        | 2 +-
 hw/xbox/lpc47m157.c      | 3 +++
 hw/xbox/nvnet.c          | 1 +
 hw/xbox/smbus_xbox_smc.c | 2 ++
 hw/xbox/xbox_pci.c       | 1 +
 hw/xbox/xid-sdl.c        | 3 +++
 hw/xbox/xid.c            | 3 +++
 8 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/hw/xbox/amd_smbus.c b/hw/xbox/amd_smbus.c
index 858e202671..1d48131b2a 100644
--- a/hw/xbox/amd_smbus.c
+++ b/hw/xbox/amd_smbus.c
@@ -28,6 +28,7 @@
 #include "hw/xbox/amd_smbus.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus_master.h"
+#include "hw/irq.h"
 
 // #define DEBUG
 #ifdef DEBUG
diff --git a/hw/xbox/chihiro.c b/hw/xbox/chihiro.c
index a4871d5d74..3a62fa850e 100644
--- a/hw/xbox/chihiro.c
+++ b/hw/xbox/chihiro.c
@@ -50,7 +50,7 @@
 #include "kvm_i386.h"
 #include "sysemu/numa.h"
 
-#include "hw/timer/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc.h"
 #include "xbox_pci.h"
 #include "smbus.h"
 
diff --git a/hw/xbox/lpc47m157.c b/hw/xbox/lpc47m157.c
index 29a7840745..6c3a7f81f5 100644
--- a/hw/xbox/lpc47m157.c
+++ b/hw/xbox/lpc47m157.c
@@ -18,6 +18,9 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+#include "sysemu/sysemu.h"
 #include "hw/char/serial.h"
 #include "hw/isa/isa.h"
 #include "qapi/error.h"
diff --git a/hw/xbox/nvnet.c b/hw/xbox/nvnet.c
index c1090717b1..d107aa4cd4 100644
--- a/hw/xbox/nvnet.c
+++ b/hw/xbox/nvnet.c
@@ -22,6 +22,7 @@
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "net/net.h"
 #include "qemu/iov.h"
 
diff --git a/hw/xbox/smbus_xbox_smc.c b/hw/xbox/smbus_xbox_smc.c
index cb0e244aba..63b6193ad4 100644
--- a/hw/xbox/smbus_xbox_smc.c
+++ b/hw/xbox/smbus_xbox_smc.c
@@ -31,6 +31,8 @@
 #include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "smbus.h"
+#include "sysemu/runstate.h"
+#include "hw/qdev-properties.h"
 
 #define TYPE_XBOX_SMC "smbus-xbox-smc"
 #define XBOX_SMC(obj) OBJECT_CHECK(SMBusSMCDevice, (obj), TYPE_XBOX_SMC)
diff --git a/hw/xbox/xbox_pci.c b/hw/xbox/xbox_pci.c
index 5f83dcc760..724ff3ad6b 100644
--- a/hw/xbox/xbox_pci.c
+++ b/hw/xbox/xbox_pci.c
@@ -43,6 +43,7 @@
 #include "hw/xbox/acpi_xbox.h"
 #include "hw/xbox/amd_smbus.h"
 #include "hw/xbox/xbox_pci.h"
+#include "hw/irq.h"
 
  /*
   * xbox chipset based on nForce 420, which was based on AMD-760
diff --git a/hw/xbox/xid-sdl.c b/hw/xbox/xid-sdl.c
index eb4b821d8b..1ba18a4d0e 100644
--- a/hw/xbox/xid-sdl.c
+++ b/hw/xbox/xid-sdl.c
@@ -20,6 +20,9 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+#include "sysemu/sysemu.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/usb.h"
diff --git a/hw/xbox/xid.c b/hw/xbox/xid.c
index 4bbc824122..e35f607801 100644
--- a/hw/xbox/xid.c
+++ b/hw/xbox/xid.c
@@ -19,6 +19,9 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+#include "sysemu/sysemu.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/usb.h"