diff --git a/ChangeLog b/ChangeLog
index d2bcbee..e350f6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-17  Colin Walters <walters@debian.org>
+
+	+ Remove some unused variables, and initialize some other ones so
+	gcc doesn't warn us.
+
 2003-04-16  Keith Packard <keithp@keithp.com>
 
 	+ tag version 2.1.94
diff --git a/doc/edit-sgml.c b/doc/edit-sgml.c
index a9b8947..407dd2c 100644
--- a/doc/edit-sgml.c
+++ b/doc/edit-sgml.c
@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 
 typedef enum { False, True } Bool;
diff --git a/src/fclang.c b/src/fclang.c
index 1fa4dd6..b0a0894 100644
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -259,8 +259,8 @@ bail0:
 static int
 FcLangSetIndex (const FcChar8 *lang)
 {
-    int	    low, high, mid;
-    int	    cmp;
+    int	    low, high, mid = 0;
+    int	    cmp = 0;
     FcChar8 firstChar = FcToLower(lang[0]); 
     
     if (firstChar < 'a')
@@ -582,7 +582,6 @@ static FcBool
 FcLangSetContainsLang (const FcLangSet *ls, const FcChar8 *lang)
 {
     int		    id;
-    FcLangResult    r;
     int		    i;
 
     id = FcLangSetIndex (lang);
@@ -613,7 +612,6 @@ FcLangSetContainsLang (const FcLangSet *ls, const FcChar8 *lang)
     {
 	FcStrList	*list = FcStrListCreate (ls->extra);
 	FcChar8		*extra;
-	FcLangResult	r;
 	
 	if (list)
 	{