diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in
index 4128e6d3b95..53aaba157ea 100644
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -311,6 +311,7 @@ CPPSRCS += \
 	SkFontHost_FreeType.cpp \
 	SkFontHost_android.cpp \
 	SkFontHost_gamma.cpp \
+	FontHostConfiguration_android.cpp \
 	SkMMapStream.cpp \
 	SkTime_Unix.cpp \
 	$(NULL)
@@ -326,6 +327,7 @@ EXPORTS_skia += \
 	$(NULL)
 CPPSRCS += \
 	SkFontHost_win.cpp \
+	SkFontHost_sandbox_none.cpp \
 	SkTime_win.cpp \
 	$(NULL)
 endif
diff --git a/gfx/skia/src/ports/FontHostConfiguration_android.cpp b/gfx/skia/src/ports/FontHostConfiguration_android.cpp
index 475dc4af8b9..c580c23ef8a 100644
--- a/gfx/skia/src/ports/FontHostConfiguration_android.cpp
+++ b/gfx/skia/src/ports/FontHostConfiguration_android.cpp
@@ -16,6 +16,7 @@
 */
 
 #include "FontHostConfiguration_android.h"
+#include <expat_config.h>
 #include <expat.h>
 #include "SkTDArray.h"