diff --git a/gas/ChangeLog b/gas/ChangeLog
index 46fb0fef9f1..7e9e517902d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-14  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+	* config/tc-nios2.c (nios2_as_options): Make file static.
+	* config/tc-ppc.c (toc_reloc_ypes): Likewise.
+	* config/tc-sparc.c (native_op_table): Likewise.
+
 2016-04-14  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
 
 	* config/tc-m32c.c (M32C_Macros): Remove.
diff --git a/gas/config/tc-nios2.c b/gas/config/tc-nios2.c
index bf37ff7fdba..d207758352d 100644
--- a/gas/config/tc-nios2.c
+++ b/gas/config/tc-nios2.c
@@ -98,7 +98,7 @@ typedef enum
 } relax_optionT;
 
 /* Struct contains all assembler options set with .set.  */
-struct
+static struct
 {
   /* .set noat -> noat = 1 allows assembly code to use at without warning
      and macro expansions generate a warning.
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 1d2c57f0293..8bfdfdc38c2 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -207,7 +207,7 @@ ppc_cpu_t sticky = 0;
 unsigned int ppc_abiversion = 0;
 
 /* Flags set on encountering toc relocs.  */
-enum {
+static enum {
   has_large_toc_reloc = 1,
   has_small_toc_reloc = 2
 } toc_reloc_types;
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index a51ca1ff4e2..b95613109a6 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -758,7 +758,7 @@ md_show_usage (FILE *stream)
 }
 
 /* Native operand size opcode translation.  */
-struct
+static struct
   {
     const char *name;
     const char *name32;