diff --git a/src/xutf8/utf8Utils.c b/src/xutf8/utf8Utils.c
index ebbf11273..ad2bc83ff 100644
--- a/src/xutf8/utf8Utils.c
+++ b/src/xutf8/utf8Utils.c
@@ -14,14 +14,12 @@
  *     http://www.fltk.org/str.php
  */
 
-#include "../config_lib.h"
-
 /*
  * Unicode to UTF-8 conversion functions.
+ *
+ * This file is compiled and linked only for X11 w/o Xft.
  */
 
-#if defined(FL_CFG_WIN_X11)
-
 #include "../Xutf8.h"
 
 /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
@@ -224,8 +222,6 @@ XFastConvertUtf8ToUcs(const unsigned char     *buf,
   return -1;
 }
 
-#endif /* FL_CFG_WIN_X11 */
-
 /*
  * End of "$Id$".
  */
diff --git a/src/xutf8/utf8Wrap.c b/src/xutf8/utf8Wrap.c
index 255e9ae5e..612c822f3 100644
--- a/src/xutf8/utf8Wrap.c
+++ b/src/xutf8/utf8Wrap.c
@@ -14,12 +14,11 @@
  *     http://www.fltk.org/str.php
  */
 
-#include "../config_lib.h"
-
 /*
  * X11 UTF-8 text drawing functions.
+ *
+ * This file is compiled and linked only for X11 w/o Xft.
  */
-#if defined(FL_CFG_WIN_X11)
 
 #include "../Xutf8.h"
 #include <X11/Xlib.h>
@@ -1024,8 +1023,6 @@ XFreeUtf8FontStruct(Display 	    *dpy,
   free(font_set);
 }
 
-#endif /* FL_CFG_WIN_X11 */
-
 /*
  *  End of "$Id$".
  */