--- xftint.h	2002-10-24 18:53:13.000000000 +0200
+++ xftint.h.new	2001-09-21 04:32:26.000000000 +0300
@@ -25,12 +25,28 @@
 #ifndef _XFTINT_H_
 #define _XFTINT_H_
 
+/* CPD 21/09/2001 - Redfine Kfi overloaded functions... */
+#define XftConfigparse     KfiXftConfigparse
+#define XftConfigAddDir    KfiXftConfigAddDir
+#define XftConfigAddEdit   KfiXftConfigAddEdit
+#define XftConfigPushInput KfiXftConfigPushInput
+#define XftConfigdebug     KfiXftConfigdebug
+#define XftConfigerror     KfiXftConfigerror
+#define XftConfigwrap      KfiXftConfigwrap
+
+/* CPD 09/06/2001 */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 #include <X11/Xlib.h>
 #ifdef FREETYPE2
-#include "XftFreetype.h"
+#include "X11/Xft/XftFreetype.h"   /* CPD 31/05/2001 -- Added X11/Xft/ */
 #else
-#include "Xft.h"
+#include "X11/Xft/Xft.h"           /* CPD 31/05/2001 -- Added X11/Xft/ */
 #endif
+#define yylval KfiXftConfiglval    /* CPD 06/06/2001 */
 
 typedef struct _XftMatcher {
     char    *object;
@@ -427,4 +443,9 @@
 Bool
 XftCoreAddFonts (XftFontSet *set, Display *dpy, Bool ignore_scalable);
 
+/* CPD 09/06/2001 */
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _XFT_INT_H_ */