redundant redeclaration of ‘XftNameUnparse’ in Xft.h & XftCompat.h

Building xclock generates warnings from gcc:

In file included from ClockP.h:61,
                 from Clock.c:85:
/usr/include/X11/Xft/Xft.h:441:1: warning: redundant redeclaration of ‘XftNameUnparse’ [-Wredundant-decls]
  441 | XftNameUnparse (FcPattern *pat, char *dest, int len);
      | ^~~~~~~~~~~~~~
In file included from /usr/include/X11/Xft/Xft.h:52:
/usr/include/X11/Xft/XftCompat.h:159:1: note: previous declaration of ‘XftNameUnparse’ 
 with type ‘FcBool(XftPattern *, char *, int)’ {aka ‘int(FcPattern *, char *, int)’}
  159 | XftNameUnparse (XftPattern *pat, char *dest, int len);
      | ^~~~~~~~~~~~~~

This appears to be due to commit 81944f37 from MR !8 (merged) by @dickey which added XftNameUnparse to Xft.h despite it already being in XftCompat.h. Should it be removed from XftCompat.h now?