diff --git a/ChangeLog b/ChangeLog
index b6af46baa..d2a9e13ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Sep  2 11:10:42 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/gunicomp.h
+	glib/gunichartables.h glib/giounix.c: Fix some variables that 
+	should have been static.
+
 2001-08-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* glib/gthread.h, glib/gthread.c: Add 'want_to_read' to
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b6af46baa..d2a9e13ca 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sun Sep  2 11:10:42 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/gunicomp.h
+	glib/gunichartables.h glib/giounix.c: Fix some variables that 
+	should have been static.
+
 2001-08-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* glib/gthread.h, glib/gthread.c: Add 'want_to_read' to
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b6af46baa..d2a9e13ca 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Sep  2 11:10:42 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/gunicomp.h
+	glib/gunichartables.h glib/giounix.c: Fix some variables that 
+	should have been static.
+
 2001-08-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* glib/gthread.h, glib/gthread.c: Add 'want_to_read' to
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index b6af46baa..d2a9e13ca 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Sun Sep  2 11:10:42 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/gunicomp.h
+	glib/gunichartables.h glib/giounix.c: Fix some variables that 
+	should have been static.
+
 2001-08-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* glib/gthread.h, glib/gthread.c: Add 'want_to_read' to
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b6af46baa..d2a9e13ca 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun Sep  2 11:10:42 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/gunicomp.h
+	glib/gunichartables.h glib/giounix.c: Fix some variables that 
+	should have been static.
+
 2001-08-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* glib/gthread.h, glib/gthread.c: Add 'want_to_read' to
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b6af46baa..d2a9e13ca 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Sep  2 11:10:42 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/gunicomp.h
+	glib/gunichartables.h glib/giounix.c: Fix some variables that 
+	should have been static.
+
 2001-08-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* glib/gthread.h, glib/gthread.c: Add 'want_to_read' to
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b6af46baa..d2a9e13ca 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Sep  2 11:10:42 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/gunicomp.h
+	glib/gunichartables.h glib/giounix.c: Fix some variables that 
+	should have been static.
+
 2001-08-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* glib/gthread.h, glib/gthread.c: Add 'want_to_read' to
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b6af46baa..d2a9e13ca 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Sep  2 11:10:42 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/gunicomp.h
+	glib/gunichartables.h glib/giounix.c: Fix some variables that 
+	should have been static.
+
 2001-08-30  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* glib/gthread.h, glib/gthread.c: Add 'want_to_read' to
diff --git a/glib/gen-unicode-tables.pl b/glib/gen-unicode-tables.pl
index 5e140af02..920492493 100755
--- a/glib/gen-unicode-tables.pl
+++ b/glib/gen-unicode-tables.pl
@@ -892,7 +892,7 @@ sub output_special_case_table
  * other than the case of the codepoint, in the order [Ll],[Lu],[Lt],
  * separated and terminated by a double NUL.
  */
-guchar special_case_table[][$special_case_len] = {
+static guchar special_case_table[][$special_case_len] = {
 EOT
 
     for $case (@special_cases) {
@@ -1057,7 +1057,7 @@ sub output_composition_table
 
     # Output first singletons
 
-    print OUT "gushort compose_first_single[][2] = {\n";
+    print OUT "static gushort compose_first_single[][2] = {\n";
     $i = 0;				     
     for $record (@first_singletons) {
 	print OUT ",\n" if $i++ > 0;
@@ -1069,7 +1069,7 @@ sub output_composition_table
 		  
     # Output second singletons
 
-    print OUT "gushort compose_second_single[][2] = {\n";
+    print OUT "static gushort compose_second_single[][2] = {\n";
     $i = 0;				     
     for $record (@second_singletons) {
 	print OUT ",\n" if $i++ > 0;
@@ -1082,7 +1082,7 @@ sub output_composition_table
     # Output array of composition pairs
 
     print OUT <<EOT;
-gushort compose_array[$n_first][$n_second] = {
+static gushort compose_array[$n_first][$n_second] = {
 EOT
 			
     for (my $i = 0; $i < $n_first; $i++) {
@@ -1117,7 +1117,7 @@ sub output_casefold_table
 
 /* Table of casefolding cases that can't be derived by lowercasing
  */
-struct {
+static struct {
   guint16 ch;
   gchar data[$casefoldlen];
 } casefold_table[] = {
diff --git a/glib/giounix.c b/glib/giounix.c
index 67d4cc5ff..fa54b86b1 100644
--- a/glib/giounix.c
+++ b/glib/giounix.c
@@ -102,7 +102,7 @@ GSourceFuncs unix_watch_funcs = {
   g_io_unix_finalize
 };
 
-GIOFuncs unix_channel_funcs = {
+static GIOFuncs unix_channel_funcs = {
   g_io_unix_read,
   g_io_unix_write,
   g_io_unix_seek,
diff --git a/glib/gunichartables.h b/glib/gunichartables.h
index 1408f23d0..d71700e70 100644
--- a/glib/gunichartables.h
+++ b/glib/gunichartables.h
@@ -5993,7 +5993,7 @@ static unsigned short title_table[][3] = {
  * other than the case of the codepoint, in the order [Ll],[Lu],[Lt],
  * separated and terminated by a double NUL.
  */
-guchar special_case_table[][18] = {
+static guchar special_case_table[][18] = {
  "\x00\x00\x00\x53\x00\x53\x00\x00\x00\x53\x00\x73\0",
  "\x00\x00\x00\x46\x00\x46\x00\x00\x00\x46\x00\x66\0",
  "\x00\x00\x00\x46\x00\x49\x00\x00\x00\x46\x00\x69\0",
@@ -6101,7 +6101,7 @@ guchar special_case_table[][18] = {
 
 /* Table of casefolding cases that can't be derived by lowercasing
  */
-struct {
+static struct {
   guint16 ch;
   gchar data[7];
 } casefold_table[] = {
diff --git a/glib/gunicomp.h b/glib/gunicomp.h
index b07a6357e..f2414ca56 100644
--- a/glib/gunicomp.h
+++ b/glib/gunicomp.h
@@ -285,7 +285,7 @@ static unsigned short *compose_table[256] = {
   compose_page48
 };
 
-gushort compose_first_single[][2] = {
+static gushort compose_first_single[][2] = {
  { 0x0338, 0x226e },
  { 0x0338, 0x2260 },
  { 0x0338, 0x226f },
@@ -497,7 +497,7 @@ gushort compose_first_single[][2] = {
  { 0x3099, 0x30fa },
  { 0x3099, 0x30fe }
 };
-gushort compose_second_single[][2] = {
+static gushort compose_second_single[][2] = {
  { 0x0627, 0x0622 },
  { 0x0627, 0x0623 },
  { 0x0627, 0x0625 },
@@ -517,7 +517,7 @@ gushort compose_second_single[][2] = {
  { 0x0dd9, 0x0ddc },
  { 0x0dd9, 0x0dde }
 };
-gushort compose_array[146][31] = {
+static gushort compose_array[146][31] = {
  { 0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x0100, 0x0102, 0x0226, 0x00c4, 0x1ea2, 0x00c5,      0, 0x01cd, 0x0200, 0x0202,      0,      0,      0, 0x1ea0,      0, 0x1e00,      0,      0, 0x0104,      0,      0,      0,      0,      0,      0,      0,      0 },
  {      0,      0,      0,      0,      0,      0, 0x1e02,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0, 0x1e04,      0,      0,      0,      0,      0,      0,      0,      0, 0x1e06,      0,      0,      0,      0 },
  {      0, 0x0106, 0x0108,      0,      0,      0, 0x010a,      0,      0,      0,      0, 0x010c,      0,      0,      0,      0,      0,      0,      0,      0,      0, 0x00c7,      0,      0,      0,      0,      0,      0,      0,      0,      0 },
diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c
index 8f556fa23..6afc75d63 100644
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -77,7 +77,7 @@ g_unicode_canonical_ordering (gunichar *string,
     }
 }
 
-guchar *
+static guchar *
 find_decomposition (gunichar ch,
 		    gboolean compat)
 {