diff --git a/ChangeLog b/ChangeLog
index 09681d23f..b938c6226 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-22  Werner Lemberg  <wl@gnu.org>
+
+	* src/cache/ftccache.c, src/cache/ftccache.h (FTC_Node_Destroy):
+	Remove, unused.
+
+	* src/cache/ftccmap.h: Remove, unused.
+
+	* src/cache/rules.mk (CACHE_DRV_H): Remove ftccmap.h.
+
 2006-03-21  Zhe Su  <james.su@gmail.com>
 
 	* src/base/ftoutln.c (FT_Outline_Get_Orientation): Improve
diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c
index 0df9b0977..8994a350c 100644
--- a/src/cache/ftccache.c
+++ b/src/cache/ftccache.c
@@ -247,14 +247,6 @@
   }
 
 
-  FT_EXPORT_DEF( void )
-  FTC_Node_Destroy( FTC_Node     node,
-                    FTC_Manager  manager )
-  {
-    ftc_node_destroy( node, manager );
-  }
-
-
   /* remove a node from the cache manager */
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
   FT_BASE_DEF( void )
diff --git a/src/cache/ftccache.h b/src/cache/ftccache.h
index b41b139cd..d06b65112 100644
--- a/src/cache/ftccache.h
+++ b/src/cache/ftccache.h
@@ -66,21 +66,8 @@ FT_BEGIN_HEADER
 #define FTC_NODE( x )    ( (FTC_Node)(x) )
 #define FTC_NODE_P( x )  ( (FTC_Node*)(x) )
 
-#define FTC_NODE__NEXT(x)  FTC_NODE( (x)->mru.next )
-#define FTC_NODE__PREV(x)  FTC_NODE( (x)->mru.prev )
-
-
-  /*************************************************************************/
-  /*                                                                       */
-  /* These functions are exported so that they can be called from          */
-  /* user-provided cache classes; otherwise, they are really part of the   */
-  /* cache sub-system internals.                                           */
-  /*                                                                       */
-
-  /* reserved for manager's use */
-  FT_EXPORT( void )
-  FTC_Node_Destroy( FTC_Node     node,
-                    FTC_Manager  manager );
+#define FTC_NODE__NEXT( x )  FTC_NODE( (x)->mru.next )
+#define FTC_NODE__PREV( x )  FTC_NODE( (x)->mru.prev )
 
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
diff --git a/src/cache/ftccmap.h b/src/cache/ftccmap.h
deleted file mode 100644
index 638dc4bb2..000000000
--- a/src/cache/ftccmap.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftccmap.h                                                              */
-/*                                                                         */
-/*    FreeType charmap cache (specification).                              */
-/*                                                                         */
-/*  Copyright 2000-2001, 2003, 2005, 2006 by                               */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-
-#ifndef __FTCCMAP_H__
-#define __FTCCMAP_H__
-
-#include <ft2build.h>
-#include FT_CACHE_H
-
-
-FT_BEGIN_HEADER
-
-
-  /*
-   *  The FreeType 2.1.7 Charmap cache interface.
-   *
-   *  Unfortunately, it is not possible to implement it in later versions,
-   *  since some function signatures changed too significantly to do that.
-   *
-   */
-
-#if 0
-
-  typedef enum  FTC_CMapType_
-  {
-    FTC_CMAP_BY_INDEX    = 0,
-    FTC_CMAP_BY_ENCODING = 1,
-    FTC_CMAP_BY_ID       = 2
-
-  } FTC_CMapType;
-
-
-  typedef struct  FTC_CMapIdRec_
-  {
-    FT_UInt  platform;
-    FT_UInt  encoding;
-
-  } FTC_CMapIdRec;
-
-
-  typedef struct  FTC_CMapDescRec_
-  {
-    FTC_FaceID    face_id;
-    FTC_CMapType  type;
-
-    union
-    {
-      FT_UInt        index;
-      FT_Encoding    encoding;
-      FTC_CMapIdRec  id;
-
-    } u;
-
-  } FTC_CMapDescRec, *FTC_CMapDesc;
-
-
-  FT_EXPORT( FT_Error )
-  FTC_CMapCache_New( FTC_Manager     manager,
-                     FTC_CMapCache  *acache );
-
-
-  FT_EXPORT( FT_UInt )
-  FTC_CMapCache_Lookup( FTC_CMapCache  cache,
-                        FTC_CMapDesc   cmap_desc,
-                        FT_UInt32      char_code );
-                        
-#endif /* 0 */
-
-  /* */
-
-
-FT_END_HEADER
-
-
-#endif /* __FTCCMAP_H__ */
-
-
-/* END */
diff --git a/src/cache/rules.mk b/src/cache/rules.mk
index 3af1f2529..457dec848 100644
--- a/src/cache/rules.mk
+++ b/src/cache/rules.mk
@@ -36,7 +36,6 @@ CACHE_DRV_SRC := $(CACHE_DIR)/ftcbasic.c \
 # Cache driver headers
 #
 CACHE_DRV_H := $(CACHE_DIR)/ftccback.h \
-               $(CACHE_DIR)/ftccmap.h  \
                $(CACHE_DIR)/ftcerror.h \
                $(CACHE_DIR)/ftcglyph.h \
                $(CACHE_DIR)/ftcimage.h \