iprt/string.h: Dropped including utf16.h and let those who need it include it themselves. bugref:9344

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@76408 cfe28804-0f27-0410-a406-dd0f0b0b656f

37 files changed, 72 insertions, 31 deletions

diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibCredentials.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibCredentials.cpp
index 9f7c2c172f5..9c966361356 100644
--- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibCredentials.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibCredentials.cpp
@@ -32,6 +32,7 @@
 #include <iprt/mem.h>
 #include <iprt/rand.h>
 #include <iprt/string.h>
+#include <iprt/utf16.h>
 #include <VBox/log.h>
 
 #include "VBoxGuestR3LibInternal.h"
diff --git a/src/VBox/Debugger/DBGPlugInWinNt.cpp b/src/VBox/Debugger/DBGPlugInWinNt.cpp
index 4f5d73aeaf6..2fcb5e192ae 100644
--- a/src/VBox/Debugger/DBGPlugInWinNt.cpp
+++ b/src/VBox/Debugger/DBGPlugInWinNt.cpp
@@ -32,6 +32,7 @@
 #include <iprt/path.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
+#include <iprt/utf16.h>
 #include <iprt/formats/pecoff.h>
 #include <iprt/formats/mz.h>
 #include <iprt/nt/nt-structures.h>
diff --git a/src/VBox/Devices/EFI/DevEFI.cpp b/src/VBox/Devices/EFI/DevEFI.cpp
index 35cfcbdef82..f4f2e310bf1 100644
--- a/src/VBox/Devices/EFI/DevEFI.cpp
+++ b/src/VBox/Devices/EFI/DevEFI.cpp
@@ -46,6 +46,7 @@
 # include <iprt/stream.h>
 # define DEVEFI_WITH_VBOXDBG_SCRIPT
 #endif
+#include <iprt/utf16.h>
 
 #include "DevEFI.h"
 #include "VBoxDD.h"
diff --git a/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp b/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp
index 09a4f854904..e776929ebc6 100644
--- a/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp
+++ b/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp
@@ -23,6 +23,10 @@
  * to LocalConfig.kmk will cause the tests to be run every time the code is
  * changed. */
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_SHARED_CLIPBOARD
 
 #include <errno.h>
@@ -46,6 +50,7 @@
 #include <iprt/mem.h>
 #include <iprt/semaphore.h>
 #include <iprt/thread.h>
+#include <iprt/utf16.h>
 
 #include <VBox/log.h>
 #include <VBox/version.h>
@@ -54,6 +59,10 @@
 #include <VBox/GuestHost/clipboard-helper.h>
 #include <VBox/HostServices/VBoxClipboardSvc.h>
 
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 /* The serialisation mechanism looks like it is not needed (everything using it
  * runs on one thread, and the flag is always cleared at the end of calls which
  * use it).  So we will remove it after the 5.2 series. */
@@ -61,9 +70,10 @@
 # define VBOX_AFTER_5_2
 #endif
 
-class formats;
-static Atom clipGetAtom(CLIPBACKEND *pCtx, const char *pszName);
 
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
 /** The different clipboard formats which we support. */
 enum CLIPFORMAT
 {
@@ -72,9 +82,22 @@ enum CLIPFORMAT
     TEXT,  /* Treat this as Utf8, but it may really be ascii */
     UTF8,
     BMP,
-        HTML
+    HTML
 };
 
+typedef unsigned CLIPX11FORMAT;
+
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+class formats;
+static Atom clipGetAtom(CLIPBACKEND *pCtx, const char *pszName);
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 /** The table mapping X11 names to data formats and to the corresponding
  * VBox clipboard formats (currently only Unicode) */
 static struct _CLIPFORMATTABLE
@@ -108,14 +131,13 @@ static struct _CLIPFORMATTABLE
     /** @todo Inkscape exports image/png but not bmp... */
 };
 
-typedef unsigned CLIPX11FORMAT;
-
 enum
 {
     NIL_CLIPX11FORMAT = 0,
     MAX_CLIP_X11_FORMATS = RT_ELEMENTS(g_aFormats)
 };
 
+
 /** Return the atom corresponding to a supported X11 format.
  * @param widget a valid Xt widget
  */
diff --git a/src/VBox/Main/cbinding/VBoxCAPI.cpp b/src/VBox/Main/cbinding/VBoxCAPI.cpp
index a3ced738dba..d3447a923ef 100644
--- a/src/VBox/Main/cbinding/VBoxCAPI.cpp
+++ b/src/VBox/Main/cbinding/VBoxCAPI.cpp
@@ -32,6 +32,7 @@
 #include <iprt/initterm.h>
 #include <iprt/mem.h>
 #include <iprt/string.h>
+#include <iprt/utf16.h>
 #include <iprt/uuid.h>
 #include <VBox/log.h>
 #include <VBox/version.h>
diff --git a/src/VBox/Main/glue/xpcom/helpers.cpp b/src/VBox/Main/glue/xpcom/helpers.cpp
index 3eac57483f8..1504ad21de7 100644
--- a/src/VBox/Main/glue/xpcom/helpers.cpp
+++ b/src/VBox/Main/glue/xpcom/helpers.cpp
@@ -1,6 +1,5 @@
 /* $Id$ */
 /** @file
- *
  * COM helper functions for XPCOM
  */
 
@@ -20,7 +19,7 @@
 
 #include <nsMemory.h>
 
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 
 
 //
diff --git a/src/VBox/Runtime/common/dvm/dvmgpt.cpp b/src/VBox/Runtime/common/dvm/dvmgpt.cpp
index 106f5de5d2f..3c47efea4e6 100644
--- a/src/VBox/Runtime/common/dvm/dvmgpt.cpp
+++ b/src/VBox/Runtime/common/dvm/dvmgpt.cpp
@@ -28,13 +28,14 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/types.h>
+#include <iprt/dvm.h>
+
 #include <iprt/assert.h>
+#include <iprt/asm.h>
 #include <iprt/mem.h>
-#include <iprt/dvm.h>
 #include <iprt/string.h>
+#include <iprt/utf16.h>
 #include <iprt/uuid.h>
-#include <iprt/asm.h>
 #include "internal/dvm.h"
 
 
diff --git a/src/VBox/Runtime/common/fs/fatvfs.cpp b/src/VBox/Runtime/common/fs/fatvfs.cpp
index 90bb798623a..8e9fdf10fc2 100644
--- a/src/VBox/Runtime/common/fs/fatvfs.cpp
+++ b/src/VBox/Runtime/common/fs/fatvfs.cpp
@@ -46,6 +46,7 @@
 #include <iprt/sg.h>
 #include <iprt/thread.h>
 #include <iprt/uni.h>
+#include <iprt/utf16.h>
 #include <iprt/vfs.h>
 #include <iprt/vfslowlevel.h>
 #include <iprt/zero.h>
diff --git a/src/VBox/Runtime/common/fs/isomakerimport.cpp b/src/VBox/Runtime/common/fs/isomakerimport.cpp
index dbdb9d58663..9b6fd9daa92 100644
--- a/src/VBox/Runtime/common/fs/isomakerimport.cpp
+++ b/src/VBox/Runtime/common/fs/isomakerimport.cpp
@@ -42,6 +42,7 @@
 #include <iprt/log.h>
 #include <iprt/mem.h>
 #include <iprt/string.h>
+#include <iprt/utf16.h>
 #include <iprt/vfs.h>
 #include <iprt/formats/iso9660.h>
 
diff --git a/src/VBox/Runtime/common/fs/isovfs.cpp b/src/VBox/Runtime/common/fs/isovfs.cpp
index 632bf371e69..98ad47548b9 100644
--- a/src/VBox/Runtime/common/fs/isovfs.cpp
+++ b/src/VBox/Runtime/common/fs/isovfs.cpp
@@ -46,6 +46,7 @@
 #include <iprt/vfs.h>
 #include <iprt/vfslowlevel.h>
 #include <iprt/uni.h>
+#include <iprt/utf16.h>
 #include <iprt/formats/iso9660.h>
 #include <iprt/formats/udf.h>
 
diff --git a/src/VBox/Runtime/common/ldr/ldrPE.cpp b/src/VBox/Runtime/common/ldr/ldrPE.cpp
index ab1fceecce7..1e5a019095c 100644
--- a/src/VBox/Runtime/common/ldr/ldrPE.cpp
+++ b/src/VBox/Runtime/common/ldr/ldrPE.cpp
@@ -43,6 +43,7 @@
 #include <iprt/path.h>
 #include <iprt/sha.h>
 #include <iprt/string.h>
+#include <iprt/utf16.h>
 #include <iprt/x86.h>
 #ifndef IPRT_WITHOUT_LDR_VERIFY
 #include <iprt/zero.h>
diff --git a/src/VBox/Runtime/common/misc/inifile.cpp b/src/VBox/Runtime/common/misc/inifile.cpp
index ec80a3d7313..130832c5528 100644
--- a/src/VBox/Runtime/common/misc/inifile.cpp
+++ b/src/VBox/Runtime/common/misc/inifile.cpp
@@ -38,6 +38,7 @@
 #include <iprt/latin1.h>
 #include <iprt/mem.h>
 #include <iprt/string.h>
+#include <iprt/utf16.h>
 #include <iprt/vfs.h>
 
 #include "internal/magics.h"
diff --git a/src/VBox/Runtime/common/misc/json.cpp b/src/VBox/Runtime/common/misc/json.cpp
index 2592607d697..f76331243f1 100644
--- a/src/VBox/Runtime/common/misc/json.cpp
+++ b/src/VBox/Runtime/common/misc/json.cpp
@@ -38,6 +38,7 @@
 #include <iprt/mem.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
+#include <iprt/utf16.h>
 
 #include <stdlib.h> /* strtod() */
 #include <errno.h>  /* errno */
diff --git a/src/VBox/Runtime/common/string/RTUtf16Cat.cpp b/src/VBox/Runtime/common/string/RTUtf16Cat.cpp
index d9c2f78ad55..3d1f38abe64 100644
--- a/src/VBox/Runtime/common/string/RTUtf16Cat.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16Cat.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 #include <iprt/err.h>
diff --git a/src/VBox/Runtime/common/string/RTUtf16CatAscii.cpp b/src/VBox/Runtime/common/string/RTUtf16CatAscii.cpp
index 9ee5f873fa8..31da796077d 100644
--- a/src/VBox/Runtime/common/string/RTUtf16CatAscii.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16CatAscii.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 #include <iprt/err.h>
diff --git a/src/VBox/Runtime/common/string/RTUtf16Chr.cpp b/src/VBox/Runtime/common/string/RTUtf16Chr.cpp
index 3937dc94b7c..55b5d554ea4 100644
--- a/src/VBox/Runtime/common/string/RTUtf16Chr.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16Chr.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 
diff --git a/src/VBox/Runtime/common/string/RTUtf16CmpAscii.cpp b/src/VBox/Runtime/common/string/RTUtf16CmpAscii.cpp
index 634e5a9002c..83a26e23acb 100644
--- a/src/VBox/Runtime/common/string/RTUtf16CmpAscii.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16CmpAscii.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 #include <iprt/assert.h>
diff --git a/src/VBox/Runtime/common/string/RTUtf16Copy.cpp b/src/VBox/Runtime/common/string/RTUtf16Copy.cpp
index 8e0a482ba70..c30df2d23f8 100644
--- a/src/VBox/Runtime/common/string/RTUtf16Copy.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16Copy.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 #include <iprt/err.h>
diff --git a/src/VBox/Runtime/common/string/RTUtf16CopyAscii.cpp b/src/VBox/Runtime/common/string/RTUtf16CopyAscii.cpp
index f4be20eb535..ca53ecd83d8 100644
--- a/src/VBox/Runtime/common/string/RTUtf16CopyAscii.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16CopyAscii.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 #include <iprt/err.h>
diff --git a/src/VBox/Runtime/common/string/RTUtf16End.cpp b/src/VBox/Runtime/common/string/RTUtf16End.cpp
index b05b68dcc80..847e06d0a5c 100644
--- a/src/VBox/Runtime/common/string/RTUtf16End.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16End.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 
diff --git a/src/VBox/Runtime/common/string/RTUtf16ICmpAscii.cpp b/src/VBox/Runtime/common/string/RTUtf16ICmpAscii.cpp
index 8b2fa4f608a..7072a1d7997 100644
--- a/src/VBox/Runtime/common/string/RTUtf16ICmpAscii.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16ICmpAscii.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 #include <iprt/assert.h>
diff --git a/src/VBox/Runtime/common/string/RTUtf16NCmpAscii.cpp b/src/VBox/Runtime/common/string/RTUtf16NCmpAscii.cpp
index 2eb01800f14..72b4b6e7326 100644
--- a/src/VBox/Runtime/common/string/RTUtf16NCmpAscii.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16NCmpAscii.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 #include <iprt/assert.h>
diff --git a/src/VBox/Runtime/common/string/RTUtf16NICmpAscii.cpp b/src/VBox/Runtime/common/string/RTUtf16NICmpAscii.cpp
index f8546d318e9..b8ced7e19d2 100644
--- a/src/VBox/Runtime/common/string/RTUtf16NICmpAscii.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16NICmpAscii.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 #include <iprt/assert.h>
diff --git a/src/VBox/Runtime/common/string/RTUtf16NLen.cpp b/src/VBox/Runtime/common/string/RTUtf16NLen.cpp
index 132f22ce94d..4024cfb86c8 100644
--- a/src/VBox/Runtime/common/string/RTUtf16NLen.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16NLen.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 
diff --git a/src/VBox/Runtime/common/string/RTUtf16NLenEx.cpp b/src/VBox/Runtime/common/string/RTUtf16NLenEx.cpp
index 747a0b81b10..bc911b4c23b 100644
--- a/src/VBox/Runtime/common/string/RTUtf16NLenEx.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16NLenEx.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 #include <iprt/err.h>
diff --git a/src/VBox/Runtime/common/string/RTUtf16PrintHexBytes.cpp b/src/VBox/Runtime/common/string/RTUtf16PrintHexBytes.cpp
index 1b34f19d564..00453540ec6 100644
--- a/src/VBox/Runtime/common/string/RTUtf16PrintHexBytes.cpp
+++ b/src/VBox/Runtime/common/string/RTUtf16PrintHexBytes.cpp
@@ -28,8 +28,8 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
-#include <iprt/string.h>
 
 #include <iprt/assert.h>
 #include <iprt/err.h>
diff --git a/src/VBox/Runtime/common/string/strformat.cpp b/src/VBox/Runtime/common/string/strformat.cpp
index ca5b0e98af4..879b48d66f0 100644
--- a/src/VBox/Runtime/common/string/strformat.cpp
+++ b/src/VBox/Runtime/common/string/strformat.cpp
@@ -37,6 +37,7 @@
 # include <iprt/alloc.h>
 # include <iprt/err.h>
 # include <iprt/uni.h>
+# include <iprt/utf16.h>
 #endif
 #include <iprt/ctype.h>
 #include <iprt/string.h>
diff --git a/src/VBox/Runtime/common/string/strformatrt.cpp b/src/VBox/Runtime/common/string/strformatrt.cpp
index 5f9e8a37d83..769197bd935 100644
--- a/src/VBox/Runtime/common/string/strformatrt.cpp
+++ b/src/VBox/Runtime/common/string/strformatrt.cpp
@@ -41,8 +41,9 @@
 #include <iprt/string.h>
 #include <iprt/stdarg.h>
 #ifdef IN_RING3
-# include <iprt/thread.h>
 # include <iprt/err.h>
+# include <iprt/thread.h>
+# include <iprt/utf16.h>
 #endif
 #include <iprt/ctype.h>
 #include <iprt/time.h>
diff --git a/src/VBox/Runtime/common/string/utf-16-case.cpp b/src/VBox/Runtime/common/string/utf-16-case.cpp
index af91ac02081..705ca424178 100644
--- a/src/VBox/Runtime/common/string/utf-16-case.cpp
+++ b/src/VBox/Runtime/common/string/utf-16-case.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 #include <iprt/uni.h>
diff --git a/src/VBox/Runtime/common/string/utf-16-latin-1.cpp b/src/VBox/Runtime/common/string/utf-16-latin-1.cpp
index ae91023000d..c5669a63a13 100644
--- a/src/VBox/Runtime/common/string/utf-16-latin-1.cpp
+++ b/src/VBox/Runtime/common/string/utf-16-latin-1.cpp
@@ -31,10 +31,12 @@
 #include <iprt/latin1.h>
 #include "internal/iprt.h"
 
-#include <iprt/uni.h>
-#include <iprt/alloc.h>
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/mem.h>
+#include <iprt/string.h>
+#include <iprt/utf16.h>
+#include <iprt/uni.h>
 #include "internal/string.h"
 
 
diff --git a/src/VBox/Runtime/common/string/utf-16.cpp b/src/VBox/Runtime/common/string/utf-16.cpp
index 828c72ed738..a0cf79c8015 100644
--- a/src/VBox/Runtime/common/string/utf-16.cpp
+++ b/src/VBox/Runtime/common/string/utf-16.cpp
@@ -28,7 +28,7 @@
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 #include <iprt/uni.h>
diff --git a/src/VBox/Runtime/generic/env-generic.cpp b/src/VBox/Runtime/generic/env-generic.cpp
index 0083e465549..008dbdb75b0 100644
--- a/src/VBox/Runtime/generic/env-generic.cpp
+++ b/src/VBox/Runtime/generic/env-generic.cpp
@@ -34,9 +34,10 @@
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
 #include <iprt/alloca.h>
-#include <iprt/string.h>
-#include <iprt/sort.h>
 #include <iprt/err.h>
+#include <iprt/sort.h>
+#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/magics.h"
 
 #include <stdlib.h>
diff --git a/src/VBox/Runtime/generic/utf16locale-generic.cpp b/src/VBox/Runtime/generic/utf16locale-generic.cpp
index 9547bf7ca19..0e7de12d159 100644
--- a/src/VBox/Runtime/generic/utf16locale-generic.cpp
+++ b/src/VBox/Runtime/generic/utf16locale-generic.cpp
@@ -29,7 +29,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
 #define LOG_GROUP RTLOGGROUP_UTF16
-#include <iprt/string.h>
+#include <iprt/utf16.h>
 #include "internal/iprt.h"
 
 
diff --git a/src/VBox/Runtime/testcase/tstRTUuid.cpp b/src/VBox/Runtime/testcase/tstRTUuid.cpp
index 176d5696bcb..c0c193f0468 100644
--- a/src/VBox/Runtime/testcase/tstRTUuid.cpp
+++ b/src/VBox/Runtime/testcase/tstRTUuid.cpp
@@ -34,6 +34,7 @@
 #include <iprt/err.h>
 #include <iprt/string.h>
 #include <iprt/initterm.h>
+#include <iprt/utf16.h>
 
 
 int main()
diff --git a/src/VBox/Runtime/testcase/tstUtf8.cpp b/src/VBox/Runtime/testcase/tstUtf8.cpp
index 58364c6e587..91e84530e5e 100644
--- a/src/VBox/Runtime/testcase/tstUtf8.cpp
+++ b/src/VBox/Runtime/testcase/tstUtf8.cpp
@@ -30,6 +30,7 @@
 *********************************************************************************************************************************/
 #include <iprt/string.h>
 #include <iprt/latin1.h>
+#include <iprt/utf16.h>
 
 #include <iprt/alloc.h>
 #include <iprt/assert.h>
diff --git a/src/VBox/Storage/VHD.cpp b/src/VBox/Storage/VHD.cpp
index 7911ae61787..519040d335a 100644
--- a/src/VBox/Storage/VHD.cpp
+++ b/src/VBox/Storage/VHD.cpp
@@ -31,6 +31,7 @@
 #include <iprt/uuid.h>
 #include <iprt/path.h>
 #include <iprt/string.h>
+#include <iprt/utf16.h>
 
 #include "VDBackends.h"
 
diff --git a/src/VBox/VMM/VMMR3/CFGM.cpp b/src/VBox/VMM/VMMR3/CFGM.cpp
index 75fb601cf4f..9d0acd3b98b 100644
--- a/src/VBox/VMM/VMMR3/CFGM.cpp
+++ b/src/VBox/VMM/VMMR3/CFGM.cpp
@@ -69,6 +69,7 @@
 #include <iprt/mem.h>
 #include <iprt/param.h>
 #include <iprt/string.h>
+#include <iprt/utf16.h>
 #include <iprt/uuid.h>