diff -Naur fontconfig-2.12.1/fontconfig/fontconfig.h fontconfig-2.12.1-glibc225/fontconfig/fontconfig.h
--- fontconfig-2.12.1/fontconfig/fontconfig.h	2016-08-05 07:47:02.000000000 +0200
+++ fontconfig-2.12.1-glibc225/fontconfig/fontconfig.h	2017-03-14 16:25:06.746744335 +0100
@@ -128,7 +128,8 @@
 #define FC_USER_CACHE_FILE	    ".fonts.cache-" FC_CACHE_VERSION
 
 /* Adjust outline rasterizer */
-#define FC_CHAR_WIDTH	    "charwidth"	/* Int */
+#define FC_CHARWIDTH        "charwidth" /* Int */
+#define FC_CHAR_WIDTH       FC_CHARWIDTH
 #define FC_CHAR_HEIGHT	    "charheight"/* Int */
 #define FC_MATRIX	    "matrix"    /* FcMatrix */
 
diff -Naur fontconfig-2.12.1/src/fcobjs.h fontconfig-2.12.1-glibc225/src/fcobjs.h
--- fontconfig-2.12.1/src/fcobjs.h	2016-07-11 04:41:06.000000000 +0200
+++ fontconfig-2.12.1-glibc225/src/fcobjs.h	2017-03-14 16:24:54.269875771 +0100
@@ -51,7 +51,7 @@
 FC_OBJECT (RGBA,		FcTypeInteger,	NULL)
 FC_OBJECT (SCALE,		FcTypeDouble,	NULL)
 FC_OBJECT (MINSPACE,		FcTypeBool,	NULL)
-FC_OBJECT (CHAR_WIDTH,		FcTypeInteger,	NULL)
+FC_OBJECT (CHARWIDTH,           FcTypeInteger,  NULL)
 FC_OBJECT (CHAR_HEIGHT,		FcTypeInteger,	NULL)
 FC_OBJECT (MATRIX,		FcTypeMatrix,	NULL)
 FC_OBJECT (CHARSET,		FcTypeCharSet,	FcCompareCharSet)