Merge remote branch 'origin/master' into pci

Conflicts:
	exec.c

1 files changed, 1 insertions, 2 deletions

diff --git a/hw/pcie.c b/hw/pcie.c
index 6a113a9327..9de6149043 100644
--- a/hw/pcie.c
+++ b/hw/pcie.c
@@ -18,8 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysemu.h"
-#include "range.h"
+#include "qemu-common.h"
 #include "pci_bridge.h"
 #include "pcie.h"
 #include "msix.h"