3 files changed, 9 insertions, 2 deletions
diff --git a/src/util/sss_tc_utf8.c b/src/util/sss_tc_utf8.c
index 4b2c49316..44194ab02 100644
--- a/src/util/sss_tc_utf8.c
+++ b/src/util/sss_tc_utf8.c
@@ -19,6 +19,7 @@
 */
 
 #include <talloc.h>
+#include "util/util.h"
 #include "util/sss_utf8.h"
 
 char *
diff --git a/src/util/sss_utf8.c b/src/util/sss_utf8.c
index 7ba11ca75..722f28d08 100644
--- a/src/util/sss_utf8.c
+++ b/src/util/sss_utf8.c
@@ -22,6 +22,9 @@
 
 #include "config.h"
 
+#include <string.h>
+#include <errno.h>
+
 #ifdef HAVE_LIBUNISTRING
 #include <unistr.h>
 #include <unicase.h>
diff --git a/src/util/sss_utf8.h b/src/util/sss_utf8.h
index 95b085f56..bca9b2c51 100644
--- a/src/util/sss_utf8.h
+++ b/src/util/sss_utf8.h
@@ -23,12 +23,15 @@
 #ifndef SSS_UTF8_H_
 #define SSS_UTF8_H_
 
-#include "util/util.h"
-
 #ifndef ENOMATCH
 #define ENOMATCH -1
 #endif
 
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "util/util_errors.h"
+
 void sss_utf8_free(void *ptr);
 
 /* The result must be freed with sss_utf8_free() */