From d8f95977305dbadff6113318259bd46191586721 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 5 Jan 2009 14:12:03 -0800
Subject: [PATCH] Always include u8_textprep

---
 module/unicode/u8_textprep.c | 2 +-
 module/unicode/uconv.c       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c
index 72299b51f3..93b8f0ba65 100644
--- a/module/unicode/u8_textprep.c
+++ b/module/unicode/u8_textprep.c
@@ -45,11 +45,11 @@
 #include <sys/ddi.h>
 #include <sys/sunddi.h>
 #else
-#include <sys/u8_textprep.h>
 #include <strings.h>
 #endif	/* _KERNEL */
 #include <sys/byteorder.h>
 #include <sys/errno.h>
+#include <sys/u8_textprep.h>
 #include <sys/u8_textprep_data.h>
 
 
diff --git a/module/unicode/uconv.c b/module/unicode/uconv.c
index a9fa9cf33a..e3aee2acab 100644
--- a/module/unicode/uconv.c
+++ b/module/unicode/uconv.c
@@ -42,11 +42,10 @@
 #include <sys/debug.h>
 #include <sys/kmem.h>
 #include <sys/sunddi.h>
-#else
-#include <sys/u8_textprep.h>
 #endif	/* _KERNEL */
 #include <sys/byteorder.h>
 #include <sys/errno.h>
+#include <sys/u8_textprep.h>
 
 
 /*