4 files changed, 8 insertions, 33 deletions
diff --git a/src/xutf8/keysym2Ucs.c b/src/xutf8/keysym2Ucs.c
index b811d4054..6115b8c2e 100644
--- a/src/xutf8/keysym2Ucs.c
+++ b/src/xutf8/keysym2Ucs.c
@@ -16,11 +16,9 @@
 
 #define KEYSYM2UCS_INCLUDED
 
-#if defined(WIN32)
-#elif defined(__APPLE__) /* PORTME: Fl_Screen_Driver - platform unicode */
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: do you want to include Xutf8.h?"
-#else
+#include <config.h>
+
+#if defined(USE_X11)
 
 #include "../Xutf8.h"
 #include "imKStoUCS.c"
diff --git a/src/xutf8/utf8Input.c b/src/xutf8/utf8Input.c
index bba400271..baf2432a1 100644
--- a/src/xutf8/utf8Input.c
+++ b/src/xutf8/utf8Input.c
@@ -14,13 +14,10 @@
  *     http://www.fltk.org/str.php
  */
 
-#if defined(WIN32)
-#elif defined(__APPLE__) /* PORTME: Fl_Screen_Driver - platform unicode */
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: do you want to include Xutf8.h?"
-#else
-
 #include <config.h>
+
+#if defined(USE_X11)
+
 #include "../Xutf8.h"
 #include <X11/X.h>
 #include <X11/Xlib.h>
diff --git a/src/xutf8/utf8Utils.c b/src/xutf8/utf8Utils.c
index 9be6f8607..83c233c38 100644
--- a/src/xutf8/utf8Utils.c
+++ b/src/xutf8/utf8Utils.c
@@ -16,21 +16,11 @@
 
 #include <config.h>
 
-#if defined(WIN32) || defined(__APPLE__) /* PORTME: Fl_Screen_Driver - platform unicode */
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: utf8"
-#else
-#endif
-
 /*
  * Unicode to UTF-8 conversion functions.
  */
 
-#if defined(WIN32)
-#elif defined(__APPLE__)
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: do you want to include Xutf8.h?"
-#else
+#if defined(USE_X11)
 
 #include "../Xutf8.h"
 
diff --git a/src/xutf8/utf8Wrap.c b/src/xutf8/utf8Wrap.c
index d7321b289..4920ab02d 100644
--- a/src/xutf8/utf8Wrap.c
+++ b/src/xutf8/utf8Wrap.c
@@ -16,20 +16,10 @@
 
 #include <config.h>
 
-#if defined(WIN32) || defined(__APPLE__) /* PORTME: Fl_Screen_Driver - platform unicode */
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: utf8"
-#else
-#endif
-
 /*
  * X11 UTF-8 text drawing functions.
  */
-#if defined(WIN32)
-#elif defined(__APPLE__)
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: do you want to include Xutf8.h?"
-#else
+#if defined(USE_X11)
 
 #include "../Xutf8.h"
 #include <X11/Xlib.h>