diff --git a/ChangeLog b/ChangeLog
index 68a914f14..f44216761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2017-02-17  Werner Lemberg  <wl@gnu.org>
+
+	Remove clang warnings.
+
+	* src/autofit/aflatin.c (af_latin_sort_blue): Add missing `static'
+	keyword.
+
+	* src/base/ftmm.c (FT_Set_Var_Design_Coordinates,
+	FT_Set_MM_Blend_Coordinates, FT_Set_Var_Blend_Coordinates):
+	Initialize some variables.
+
 2017-02-16  Nikolaus Waxweiler  <madigens@gmail.com>
 	    Werner Lemberg  <wl@gnu.org>
 
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 7e6e8eab7..b983460d8 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -265,7 +265,7 @@
   }
 
 
-  void
+  static void
   af_latin_sort_blue( FT_UInt        count,
                       AF_LatinBlue*  table )
   {
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index 5705f217d..6aaa5f8b0 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -188,8 +188,8 @@
                                  FT_Fixed*  coords )
   {
     FT_Error                      error;
-    FT_Service_MultiMasters       service_mm;
-    FT_Service_MetricsVariations  service_mvar;
+    FT_Service_MultiMasters       service_mm   = NULL;
+    FT_Service_MetricsVariations  service_mvar = NULL;
 
 
     /* check of `face' delayed to `ft_face_get_mm_service' */
@@ -261,8 +261,8 @@
                                FT_Fixed*  coords )
   {
     FT_Error                      error;
-    FT_Service_MultiMasters       service_mm;
-    FT_Service_MetricsVariations  service_mvar;
+    FT_Service_MultiMasters       service_mm   = NULL;
+    FT_Service_MetricsVariations  service_mvar = NULL;
 
 
     /* check of `face' delayed to `ft_face_get_mm_service' */
@@ -309,8 +309,8 @@
                                 FT_Fixed*  coords )
   {
     FT_Error                      error;
-    FT_Service_MultiMasters       service_mm;
-    FT_Service_MetricsVariations  service_mvar;
+    FT_Service_MultiMasters       service_mm   = NULL;
+    FT_Service_MetricsVariations  service_mvar = NULL;
 
 
     /* check of `face' delayed to `ft_face_get_mm_service' */