Index: /trunk/include/iprt/string.h
===================================================================
--- /trunk/include/iprt/string.h	(revision 16028)
+++ /trunk/include/iprt/string.h	(revision 16029)
@@ -42,24 +42,9 @@
    *  Some of the string.h stuff clashes with sys/libkern.h, so just wrap
    *  it up while including string.h to keep things quiet. It's nothing
-   *  important that's clashing, after all. Well, with 7.x it's more
-   *  essential stuff unforuntately...
+   *  important that's clashing, after all.
    */
-# define strdup  strdup_string_h
-# define memset  memset_string_h
-# define memcmp  memcmp_string_h
-# define strchr  strchr_string_h
-# define strrchr strrchr_string_h
-# define ffsl    ffsl_string_h
-# define fls     fls_string_h
-# define flsl    flsl_string_h
+# define strdup strdup_string_h
 # include <string.h>
 # undef strdup
-# undef memset
-# undef memcmp
-# undef strchr
-# undef strrchr
-# undef ffsl
-# undef fls
-# undef flsl
 #elif defined(RT_OS_SOLARIS) && defined(_KERNEL)
   /*
Index: /trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h	(revision 16028)
+++ /trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h	(revision 16029)
@@ -117,5 +117,21 @@
 
 #elif defined(RT_OS_FREEBSD)
+#   define memset  libkern_memset /** @todo these are just hacks to get it compiling, check out later. */
+#   define memcmp  libkern_memcmp
+#   define strchr  libkern_strchr
+#   define strrchr libkern_strrchr
+#   define ffs     libkern_ffs
+#   define ffsl    libkern_ffsl
+#   define fls     libkern_fls
+#   define flsl    libkern_flsl
 #   include <sys/libkern.h>
+#   undef  memset
+#   undef  memcmp
+#   undef  strchr
+#   undef  strrchr
+#   undef  ffs
+#   undef  ffsl
+#   undef  fls
+#   undef  flsl
 #   include <iprt/string.h>