diff --git a/unicode.c b/unicode.c
index 24dfd448..d1428bb6 100644
--- a/unicode.c
+++ b/unicode.c
@@ -971,9 +971,9 @@ int check_compose_internal(int first, int second, int recurse)
     if (recurse == 0) {
 	nc = check_compose_internal(second, first, 1);
 	if (nc == -1)
-	    nc = check_compose(toupper(first), toupper(second), 1);
+	    nc = check_compose_internal(toupper(first), toupper(second), 1);
 	if (nc == -1)
-	    nc = check_compose(toupper(second), toupper(first), 1);
+	    nc = check_compose_internal(toupper(second), toupper(first), 1);
     }
     return nc;
 }
diff --git a/winstuff.h b/winstuff.h
index ed12ba56..1aa68bb7 100644
--- a/winstuff.h
+++ b/winstuff.h
@@ -201,6 +201,7 @@ void EnableSizeTip(int bEnable);
 /*
  * Exports from unicode.c.
  */
+struct unicode_data;
 void init_ucs(Config *, struct unicode_data *);
 
 #endif