diff --git a/ChangeLog b/ChangeLog
index 40e9f910e..00c9ba85f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-09-18  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	Remove unused fields.
+
+	* src/pcf.h (PCF_FaceRec): Remove `charmap' and `charmap_handle'.
+	* src/bdfdrvr.h (BDF_FaceRec): Ditto.
+	* src/winfonts/winfnt.h (FNT_FaceRec): Ditto.
+
 2018-09-17  Werner Lemberg  <wl@gnu.org>
 
 	[pshinter] Handle numeric overflow.
diff --git a/src/bdf/bdfdrivr.h b/src/bdf/bdfdrivr.h
index 37dd6f367..b37b84ea3 100644
--- a/src/bdf/bdfdrivr.h
+++ b/src/bdf/bdfdrivr.h
@@ -56,9 +56,6 @@ FT_BEGIN_HEADER
 
     BDF_encoding_el*  en_table;
 
-    FT_CharMap        charmap_handle;
-    FT_CharMapRec     charmap;  /* a single charmap per face */
-
     FT_UInt           default_glyph;
 
   } BDF_FaceRec, *BDF_Face;
diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h
index 3c4eb6a99..ee83023cc 100644
--- a/src/pcf/pcf.h
+++ b/src/pcf/pcf.h
@@ -161,9 +161,6 @@ FT_BEGIN_HEADER
 
     FT_ULong       bitmapsFormat;
 
-    FT_CharMap     charmap_handle;
-    FT_CharMapRec  charmap;  /* a single charmap per face */
-
   } PCF_FaceRec, *PCF_Face;
 
 
diff --git a/src/winfonts/winfnt.h b/src/winfonts/winfnt.h
index 0161939f8..fb5962432 100644
--- a/src/winfonts/winfnt.h
+++ b/src/winfonts/winfnt.h
@@ -150,9 +150,6 @@ FT_BEGIN_HEADER
     FT_FaceRec     root;
     FNT_Font       font;
 
-    FT_CharMap     charmap_handle;
-    FT_CharMapRec  charmap;  /* a single charmap per face */
-
   } FNT_FaceRec, *FNT_Face;