diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index b83104d54..06ded1db1 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-18  Klee Dienes  <kdienes@apple.com>
+
+	* arc.h (arc_ext_opcodes): Declare as extern.
+	(arc_ext_operands): Declare as extern.
+	* i860.h (i860_opcodes): Declare as const.
+
 2002-11-18  Svein E. Seldal  <Svein.Seldal@solidas.com>
 
 	* tic4x.h: File reordering. Added enhanced opcodes.
diff --git a/include/opcode/arc.h b/include/opcode/arc.h
index b13784015..3da68ec80 100644
--- a/include/opcode/arc.h
+++ b/include/opcode/arc.h
@@ -98,7 +98,7 @@ struct arc_opcode {
 
 /* this is an "insert at front" linked list per Metaware spec
    that new definitions override older ones.  */
-struct arc_opcode *arc_ext_opcodes;
+extern struct arc_opcode *arc_ext_opcodes;
 
 struct arc_operand_value {
   char *name;          /* eg: "eq"  */
@@ -117,7 +117,9 @@ struct arc_operand_value {
 struct arc_ext_operand_value {
   struct arc_ext_operand_value *next;
   struct arc_operand_value operand;
-} *arc_ext_operands;
+};
+
+extern struct arc_ext_operand_value *arc_ext_operands;
 
 struct arc_operand {
 /* One of the insn format chars.  */
diff --git a/include/opcode/i860.h b/include/opcode/i860.h
index 9f10cd86b..2d6ea19ab 100644
--- a/include/opcode/i860.h
+++ b/include/opcode/i860.h
@@ -96,7 +96,7 @@ Kinds of operands:
  
    The order of opcodes does not affect the disassembler.  */
 
-static struct i860_opcode i860_opcodes[] =
+static const struct i860_opcode i860_opcodes[] =
 {
 /* REG-Format Instructions.  */
 { "ld.c",	0x30000000, 0xcc000000, "c,d", 0 },	/* ld.c csrc2,idest */