diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f3a4026b94..7504d2c81f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2001-06-01  Jim Blandy  <jimb@redhat.com>
 
+	* gnu-v3-abi.c (gnu_v3_abi_ops, vtable_type_gdbarch_data): Make
+	these static --- there's no reason other files should use these.
+
 	* partial-stab.h (case N_FUN: case 'f':, case N_FUN: case 'F':)
 	Fix memory leak.
 
diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index 1bd4ce68b9..015bead1b8 100644
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -24,7 +24,7 @@
 #include "cp-abi.h"
 #include "demangle.h"
 
-struct cp_abi_ops gnu_v3_abi_ops;
+static struct cp_abi_ops gnu_v3_abi_ops;
 
 static int
 gnuv3_is_vtable_name (const char *name)
@@ -76,7 +76,7 @@ gnuv3_is_operator_name (const char *name)
    vtable_type_gdbarch_data is a gdbarch per-architecture data pointer
    which refers to the struct type * for this structure, laid out
    appropriately for the architecture.  */
-struct gdbarch_data *vtable_type_gdbarch_data;
+static struct gdbarch_data *vtable_type_gdbarch_data;
 
 
 /* Human-readable names for the numbers of the fields above.  */