diff --git a/src/numericsort.c b/src/numericsort.c
index e3455a8cf..a85fab4b7 100644
--- a/src/numericsort.c
+++ b/src/numericsort.c
@@ -19,6 +19,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <FL/platform_types.h>
+#include <FL/filename.H>
 
 /*
  * 'numericsort()' - Compare two directory entries, possibly with
diff --git a/src/xutf8/case.c b/src/xutf8/case.c
index 95d76bbdb..de97348cf 100644
--- a/src/xutf8/case.c
+++ b/src/xutf8/case.c
@@ -19,9 +19,12 @@
  * This file is required on all platforms for UTF-8 support
  */
 
-#include "headers/case.h"
+#include "../Xutf8.h"
 #include <stdlib.h>
 
+/* include UCS tables */
+#include "headers/case.h"
+
 int
 XUtf8Tolower(int ucs) {
   int ret;
diff --git a/src/xutf8/is_spacing.c b/src/xutf8/is_spacing.c
index cd6eb687c..30229e72e 100644
--- a/src/xutf8/is_spacing.c
+++ b/src/xutf8/is_spacing.c
@@ -15,9 +15,12 @@
  */
 
 /*
- * This file is required on all platforms for utf8 support
+ * This file is required on all platforms for UTF-8 support
  */
 
+#include "../Xutf8.h"
+
+/* include UCS tables */
 #include "headers/spacing.h"
 
 unsigned short