Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging

[mirror_qemu.git] / disas / ia64.c

diff --git a/disas/ia64.c b/disas/ia64.c
index a8fe26c4136ffbd7070c7c8efc853369f0c7947e..140754c9444e1555f1c4868a77edcc0604b5ee74 100644 (file)
--- a/disas/ia64.c
+++ b/disas/ia64.c
@@ -18,8 +18,7 @@
    along with this file; see the file COPYING.  If not, see
    <http://www.gnu.org/licenses/>. */
 
-#include <assert.h>
-#include <string.h>
+#include "qemu/osdep.h"
 
 #include "disas/bfd.h"
 
@@ -28,7 +27,6 @@
    Free Software Foundation, Inc.
    Contributed by David Mosberger-Tang <davidm@hpl.hp.com> */
 
-#include <sys/types.h>
 
 typedef uint64_t ia64_insn;