diff --git a/ChangeLog b/ChangeLog
index 8035e6210..0db7b3db6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2017-03-17  Werner Lemberg  <wl@gnu.org>
+
+	`make multi' fixes; compiler warnings.
+
+	* src/base/ftsnames.c: Include FT_INTERNAL_DEBUG_H.
+
+	* src/cff/cffobjs.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
+	FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H.
+
+	* src/sfnt/sfdriver.c [TT_CONFIG_OPTION_GX_VAR_SUPPORT]: Include
+	FT_MULTIPLE_MASTERS_H and FT_SERVICE_MULTIPLE_MASTERS_H.
+	(get_win_string, get_apple_string): Initialize `result'.
+
 2017-03-17  Dave Arnold <darnold@adobe.com>
 
 	[cff] Fix potential bugs in default NDV for CFF2.
diff --git a/src/base/ftsnames.c b/src/base/ftsnames.c
index 868b42943..360945008 100644
--- a/src/base/ftsnames.c
+++ b/src/base/ftsnames.c
@@ -20,6 +20,8 @@
 
 
 #include <ft2build.h>
+#include FT_INTERNAL_DEBUG_H
+
 #include FT_SFNT_NAMES_H
 #include FT_INTERNAL_TRUETYPE_TYPES_H
 #include FT_INTERNAL_STREAM_H
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 832276143..ddcfdc97d 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -27,6 +27,11 @@
 #include FT_INTERNAL_SFNT_H
 #include FT_CFF_DRIVER_H
 
+#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+#include FT_MULTIPLE_MASTERS_H
+#include FT_SERVICE_MULTIPLE_MASTERS_H
+#endif
+
 #include "cffobjs.h"
 #include "cffload.h"
 #include "cffcmap.h"
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index 24181b4cd..991433ee4 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -51,6 +51,11 @@
 #include FT_SERVICE_SFNT_H
 #include FT_SERVICE_TT_CMAP_H
 
+#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
+#include FT_MULTIPLE_MASTERS_H
+#include FT_SERVICE_MULTIPLE_MASTERS_H
+#endif
+
 
   /*************************************************************************/
   /*                                                                       */
@@ -473,7 +478,7 @@
   {
     FT_Error  error = FT_Err_Ok;
 
-    char*       result;
+    char*       result = NULL;
     FT_String*  r;
     FT_Char*    p;
     FT_UInt     len;
@@ -534,7 +539,7 @@
   {
     FT_Error  error = FT_Err_Ok;
 
-    char*       result;
+    char*       result = NULL;
     FT_String*  r;
     FT_Char*    p;
     FT_UInt     len;