diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index b4978186e9e..0be79416a98 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-18  Alan Modra  <amodra@gmail.com>
 
+	* ia64-opc.c: Remove #include "ansidecl.h".
+	* z8kgen.c: Include sysdep.h first.
+
 	* arc-dis.c: Include sysdep.h first, remove some redundant includes.
 	* bfin-dis.c: Likewise.
 	* i860-dis.c: Likewise.
diff --git a/opcodes/ia64-opc.c b/opcodes/ia64-opc.c
index 539fa9b2d76..359221bbfff 100644
--- a/opcodes/ia64-opc.c
+++ b/opcodes/ia64-opc.c
@@ -1,5 +1,6 @@
 /* ia64-opc.c -- Functions to access the compacted opcode table
-   Copyright 1999, 2000, 2001, 2003, 2005, 2007, 2009 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2003, 2005, 2007, 2009, 2012
+   Free Software Foundation, Inc.
    Written by Bob Manson of Cygnus Solutions, <manson@cygnus.com>
 
    This file is part of the GNU opcodes library.
@@ -19,7 +20,6 @@
    Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#include "ansidecl.h"
 #include "sysdep.h"
 #include "libiberty.h"
 #include "ia64-asmtab.h"
diff --git a/opcodes/z8kgen.c b/opcodes/z8kgen.c
index ecb56b7eea4..8f22efda342 100644
--- a/opcodes/z8kgen.c
+++ b/opcodes/z8kgen.c
@@ -1,4 +1,5 @@
-/* Copyright 2001, 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright 2001, 2002, 2003, 2005, 2007, 2009, 2012
+   Free Software Foundation, Inc.
 
    This file is part of the GNU opcodes library.
 
@@ -19,8 +20,8 @@
 
 /* This program generates z8k-opc.h.  */
 
-#include <stdio.h>
 #include "sysdep.h"
+#include <stdio.h>
 #include "libiberty.h"
 
 #define BYTE_INFO_LEN 10