diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index 44a9c8f74..fa0a39937 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -205,7 +205,7 @@ FT_BEGIN_HEADER
                                   FT_UInt32  variant_selector );
 
 
-  typedef struct  FT_CMap_ClassRec_
+  typedef const struct  FT_CMap_ClassRec_
   {
     FT_ULong               size;
 
@@ -226,37 +226,6 @@ FT_BEGIN_HEADER
   } FT_CMap_ClassRec;
 
 
-#define FT_DECLARE_CMAP_CLASS( class_ )            \
-  FT_CALLBACK_TABLE const FT_CMap_ClassRec  class_;
-
-#define FT_DEFINE_CMAP_CLASS(       \
-          class_,                   \
-          size_,                    \
-          init_,                    \
-          done_,                    \
-          char_index_,              \
-          char_next_,               \
-          char_var_index_,          \
-          char_var_default_,        \
-          variant_list_,            \
-          charvariant_list_,        \
-          variantchar_list_ )       \
-  FT_CALLBACK_TABLE_DEF             \
-  const FT_CMap_ClassRec  class_ =  \
-  {                                 \
-    size_,                          \
-    init_,                          \
-    done_,                          \
-    char_index_,                    \
-    char_next_,                     \
-    char_var_index_,                \
-    char_var_default_,              \
-    variant_list_,                  \
-    charvariant_list_,              \
-    variantchar_list_               \
-  };
-
-
   /* create a new charmap and add it to charmap->face */
   FT_BASE( FT_Error )
   FT_CMap_New( FT_CMap_Class  clazz,
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 8bb2a41bc..cc626a18a 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -187,7 +187,7 @@ THE SOFTWARE.
 
 
   static
-  const FT_CMap_ClassRec  bdf_cmap_class =
+  FT_CMap_ClassRec  bdf_cmap_class =
   {
     sizeof ( BDF_CMapRec ),
     bdf_cmap_init,
diff --git a/src/cff/cffcmap.c b/src/cff/cffcmap.c
index ea5f8ed28..0c00e4c7c 100644
--- a/src/cff/cffcmap.c
+++ b/src/cff/cffcmap.c
@@ -97,9 +97,9 @@
   }
 
 
-  FT_DEFINE_CMAP_CLASS(
-    cff_cmap_encoding_class_rec,
-
+  FT_CALLBACK_TABLE_DEF
+  FT_CMap_ClassRec  cff_cmap_encoding_class_rec =
+  {
     sizeof ( CFF_CMapStdRec ),
 
     (FT_CMap_InitFunc)     cff_cmap_encoding_init,        /* init       */
@@ -112,7 +112,7 @@
     (FT_CMap_VariantListFunc)     NULL,  /* variant_list     */
     (FT_CMap_CharVariantListFunc) NULL,  /* charvariant_list */
     (FT_CMap_VariantCharListFunc) NULL   /* variantchar_list */
-  )
+  };
 
 
   /*************************************************************************/
@@ -209,9 +209,9 @@
   }
 
 
-  FT_DEFINE_CMAP_CLASS(
-    cff_cmap_unicode_class_rec,
-
+  FT_CALLBACK_TABLE_DEF
+  FT_CMap_ClassRec  cff_cmap_unicode_class_rec =
+  {
     sizeof ( PS_UnicodesRec ),
 
     (FT_CMap_InitFunc)     cff_cmap_unicode_init,        /* init       */
@@ -224,7 +224,7 @@
     (FT_CMap_VariantListFunc)     NULL,  /* variant_list     */
     (FT_CMap_CharVariantListFunc) NULL,  /* charvariant_list */
     (FT_CMap_VariantCharListFunc) NULL   /* variantchar_list */
-  )
+  };
 
 
 /* END */
diff --git a/src/cff/cffcmap.h b/src/cff/cffcmap.h
index 1dd8700cd..037e3e0ae 100644
--- a/src/cff/cffcmap.h
+++ b/src/cff/cffcmap.h
@@ -43,7 +43,8 @@ FT_BEGIN_HEADER
   } CFF_CMapStdRec;
 
 
-  FT_DECLARE_CMAP_CLASS( cff_cmap_encoding_class_rec )
+  FT_CALLBACK_TABLE
+  FT_CMap_ClassRec  cff_cmap_encoding_class_rec;
 
 
   /*************************************************************************/
@@ -56,7 +57,8 @@ FT_BEGIN_HEADER
 
   /* unicode (synthetic) cmaps */
 
-  FT_DECLARE_CMAP_CLASS( cff_cmap_unicode_class_rec )
+  FT_CALLBACK_TABLE
+  FT_CMap_ClassRec  cff_cmap_unicode_class_rec;
 
 
 FT_END_HEADER
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
index 5545d4c63..10fba468d 100644
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -157,7 +157,7 @@ THE SOFTWARE.
 
 
   static
-  const FT_CMap_ClassRec  pcf_cmap_class =
+  FT_CMap_ClassRec  pcf_cmap_class =
   {
     sizeof ( PCF_CMapRec ),
     pcf_cmap_init,
diff --git a/src/pfr/pfrcmap.c b/src/pfr/pfrcmap.c
index cd701661f..12e9e829f 100644
--- a/src/pfr/pfrcmap.c
+++ b/src/pfr/pfrcmap.c
@@ -167,8 +167,8 @@
   }
 
 
-  FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
-  pfr_cmap_class_rec =
+  FT_CALLBACK_TABLE_DEF
+  FT_CMap_ClassRec  pfr_cmap_class_rec =
   {
     sizeof ( PFR_CMapRec ),
 
diff --git a/src/pfr/pfrcmap.h b/src/pfr/pfrcmap.h
index ab7913575..77438d44a 100644
--- a/src/pfr/pfrcmap.h
+++ b/src/pfr/pfrcmap.h
@@ -34,7 +34,8 @@ FT_BEGIN_HEADER
   } PFR_CMapRec, *PFR_CMap;
 
 
-  FT_CALLBACK_TABLE const FT_CMap_ClassRec  pfr_cmap_class_rec;
+  FT_CALLBACK_TABLE
+  FT_CMap_ClassRec  pfr_cmap_class_rec;
 
 FT_END_HEADER
 
diff --git a/src/psaux/t1cmap.c b/src/psaux/t1cmap.c
index 5681c3bd0..e5a1fd478 100644
--- a/src/psaux/t1cmap.c
+++ b/src/psaux/t1cmap.c
@@ -136,8 +136,8 @@
   }
 
 
-  FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
-  t1_cmap_standard_class_rec =
+  FT_CALLBACK_TABLE_DEF
+  FT_CMap_ClassRec  t1_cmap_standard_class_rec =
   {
     sizeof ( T1_CMapStdRec ),
 
@@ -166,8 +166,8 @@
     return 0;
   }
 
-  FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
-  t1_cmap_expert_class_rec =
+  FT_CALLBACK_TABLE_DEF
+  FT_CMap_ClassRec  t1_cmap_expert_class_rec =
   {
     sizeof ( T1_CMapStdRec ),
 
@@ -272,8 +272,8 @@
   }
 
 
-  FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
-  t1_cmap_custom_class_rec =
+  FT_CALLBACK_TABLE_DEF
+  FT_CMap_ClassRec  t1_cmap_custom_class_rec =
   {
     sizeof ( T1_CMapCustomRec ),
 
@@ -372,8 +372,8 @@
   }
 
 
-  FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
-  t1_cmap_unicode_class_rec =
+  FT_CALLBACK_TABLE_DEF
+  FT_CMap_ClassRec  t1_cmap_unicode_class_rec =
   {
     sizeof ( PS_UnicodesRec ),
 
diff --git a/src/psaux/t1cmap.h b/src/psaux/t1cmap.h
index 445e6a278..f6ae432fc 100644
--- a/src/psaux/t1cmap.h
+++ b/src/psaux/t1cmap.h
@@ -49,11 +49,11 @@ FT_BEGIN_HEADER
   } T1_CMapStdRec;
 
 
-  FT_CALLBACK_TABLE const FT_CMap_ClassRec
-  t1_cmap_standard_class_rec;
+  FT_CALLBACK_TABLE
+  FT_CMap_ClassRec  t1_cmap_standard_class_rec;
 
-  FT_CALLBACK_TABLE const FT_CMap_ClassRec
-  t1_cmap_expert_class_rec;
+  FT_CALLBACK_TABLE
+  FT_CMap_ClassRec  t1_cmap_expert_class_rec;
 
 
   /*************************************************************************/
@@ -76,8 +76,8 @@ FT_BEGIN_HEADER
   } T1_CMapCustomRec;
 
 
-  FT_CALLBACK_TABLE const FT_CMap_ClassRec
-  t1_cmap_custom_class_rec;
+  FT_CALLBACK_TABLE
+  FT_CMap_ClassRec  t1_cmap_custom_class_rec;
 
 
   /*************************************************************************/
@@ -90,8 +90,8 @@ FT_BEGIN_HEADER
 
   /* unicode (synthetic) cmaps */
 
-  FT_CALLBACK_TABLE const FT_CMap_ClassRec
-  t1_cmap_unicode_class_rec;
+  FT_CALLBACK_TABLE
+  FT_CMap_ClassRec  t1_cmap_unicode_class_rec;
 
  /* */
 
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 2a5b58757..13e2f17b1 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -689,7 +689,8 @@
   }
 
 
-  static const FT_CMap_ClassRec  fnt_cmap_class_rec =
+  static
+  FT_CMap_ClassRec  fnt_cmap_class =
   {
     sizeof ( FNT_CMapRec ),
 
@@ -701,8 +702,6 @@
     NULL, NULL, NULL, NULL, NULL
   };
 
-  static FT_CMap_Class const  fnt_cmap_class = &fnt_cmap_class_rec;
-
 
   static void
   FNT_Face_Done( FT_Face  fntface )       /* FNT_Face */
@@ -871,7 +870,7 @@
 /*        charmap.encoding_id = TT_MAC_ID_ROMAN; */
         }
 
-        error = FT_CMap_New( fnt_cmap_class,
+        error = FT_CMap_New( &fnt_cmap_class,
                              NULL,
                              &charmap,
                              NULL );