3 files changed, 4 insertions, 15 deletions
diff --git a/src/xutf8/case.c b/src/xutf8/case.c
index de97348cf..e6589cc5b 100644
--- a/src/xutf8/case.c
+++ b/src/xutf8/case.c
@@ -19,7 +19,7 @@
  * This file is required on all platforms for UTF-8 support
  */
 
-#include "../Xutf8.h"
+#include "../utf8_internal.h"
 #include <stdlib.h>
 
 /* include UCS tables */
diff --git a/src/xutf8/is_right2left.c b/src/xutf8/is_right2left.c
index e79a55f25..c36a0829b 100644
--- a/src/xutf8/is_right2left.c
+++ b/src/xutf8/is_right2left.c
@@ -14,22 +14,11 @@
  *     http://www.fltk.org/str.php
  */
 
-#if defined(WIN32) || defined(__APPLE__) /* PORTME: Fl_Screen_Driver - platform unicode */
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: utf8 functionality"
-#else
-#endif
-
 /*
- * This file is required on all platforms for utf8 support
+ * This file is required on all platforms for UTF-8 support
  */
 
-#if defined(WIN32) || defined(__APPLE__)
-#elif defined(FL_PORTING)
-#  pragma message "FL_PORTING: do you want to include Xutf8.h? It's written for X11."
-#else
-#  include "../Xutf8.h"
-#endif /* !defined(WIN32) && !defined(__APPLE__) */
+#include "../utf8_internal.h"
 
 unsigned short
 XUtf8IsRightToLeft(unsigned int ucs) {
diff --git a/src/xutf8/is_spacing.c b/src/xutf8/is_spacing.c
index 30229e72e..72e4df4e8 100644
--- a/src/xutf8/is_spacing.c
+++ b/src/xutf8/is_spacing.c
@@ -18,7 +18,7 @@
  * This file is required on all platforms for UTF-8 support
  */
 
-#include "../Xutf8.h"
+#include "../utf8_internal.h"
 
 /* include UCS tables */
 #include "headers/spacing.h"