2 files changed, 9 insertions, 7 deletions
diff --git a/src/util/sss_utf8.c b/src/util/sss_utf8.c
index 27c5cb60a..695230826 100644
--- a/src/util/sss_utf8.c
+++ b/src/util/sss_utf8.c
@@ -20,7 +20,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "util/util.h"
+#include "config.h"
+
+#ifdef HAVE_LIBUNISTRING
+#include <unistr.h>
+#include <unicase.h>
+#elif defined(HAVE_GLIB2)
+#include <glib.h>
+#endif
+
 #include "sss_utf8.h"
 
 #ifdef HAVE_LIBUNISTRING
diff --git a/src/util/sss_utf8.h b/src/util/sss_utf8.h
index b7da76219..95b085f56 100644
--- a/src/util/sss_utf8.h
+++ b/src/util/sss_utf8.h
@@ -23,12 +23,6 @@
 #ifndef SSS_UTF8_H_
 #define SSS_UTF8_H_
 
-#ifdef HAVE_LIBUNISTRING
-#include <unistr.h>
-#include <unicase.h>
-#elif HAVE_GLIB2
-#include <glib.h>
-#endif
 #include "util/util.h"
 
 #ifndef ENOMATCH