diff --git a/gas/config/tc-s12z.c b/gas/config/tc-s12z.c
index e024e7298b3..736f062b80e 100644
--- a/gas/config/tc-s12z.c
+++ b/gas/config/tc-s12z.c
@@ -22,7 +22,7 @@
 #include "safe-ctype.h"
 #include "subsegs.h"
 #include "dwarf2dbg.h"
-#include "opcodes/s12z.h"
+#include "opcode/s12z.h"
 #include <stdint.h>
 #include <limits.h>
 #include <stdbool.h>
diff --git a/include/ChangeLog b/include/ChangeLog
index 4b3d5493d4a..f663f9b937a 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-27  John Darrington <john@darrington.wattle.id.au>
+
+        * opcode/s12z.h: New file.
+
 2018-08-09  Richard Earnshaw  <rearnsha@arm.com>
 
 	* elf/arm.h: Updated comments for e_flags definitions.
diff --git a/opcodes/s12z.h b/include/opcode/s12z.h
similarity index 100%
rename from opcodes/s12z.h
rename to include/opcode/s12z.h
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 78b92696a43..8776fbd8a99 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-28  John Darrington <john@darrington.wattle.id.au>
+
+        * s12z.h: Delete.
+
 2018-08-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* i386-dis.c (OP_E_memory): In 64-bit mode, display eiz for
diff --git a/opcodes/s12z-dis.c b/opcodes/s12z-dis.c
index 47f86163903..7130908a01b 100644
--- a/opcodes/s12z-dis.c
+++ b/opcodes/s12z-dis.c
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <assert.h>
 
-#include "s12z.h"
+#include "opcode/s12z.h"
 
 #include "bfd.h"
 #include "dis-asm.h"