Index: /trunk/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp
===================================================================
--- /trunk/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp	(revision 37883)
+++ /trunk/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp	(revision 37884)
@@ -20,12 +20,9 @@
 #include <map>
 
-#include <VBox/com/string.h>
-
 #include <iprt/string.h>
+#include <iprt/cpp/ministring.h>
 
 #include <iprt/test.h>
 #include <iprt/stream.h>
-
-using namespace com;
 
 /** @todo Use original source of GuestCtrlImpl.cpp! */
@@ -35,9 +32,13 @@
     char *pszValue;
 } VBOXGUESTCTRL_BUFFER_VALUE, *PVBOXGUESTCTRL_BUFFER_VALUE;
-typedef std::map< Utf8Str, VBOXGUESTCTRL_BUFFER_VALUE > GuestBufferMap;
-typedef std::map< Utf8Str, VBOXGUESTCTRL_BUFFER_VALUE >::iterator GuestBufferMapIter;
-typedef std::map< Utf8Str, VBOXGUESTCTRL_BUFFER_VALUE >::const_iterator GuestBufferMapIterConst;
+typedef std::map< RTCString, VBOXGUESTCTRL_BUFFER_VALUE > GuestBufferMap;
+typedef std::map< RTCString, VBOXGUESTCTRL_BUFFER_VALUE >::iterator GuestBufferMapIter;
+typedef std::map< RTCString, VBOXGUESTCTRL_BUFFER_VALUE >::const_iterator GuestBufferMapIterConst;
 
 char pszUnterm1[] = { 'a', 's', 'd', 'f' };
+
+#ifndef RT_OS_WINDOWS
+# define BYTE uint8_t
+#endif
 
 static struct
@@ -120,5 +121,5 @@
             memcpy(pszKey, pszStart, uKeyLen);
 
-            mapBuf[Utf8Str(pszKey)].pszValue = NULL;
+            mapBuf[RTCString(pszKey)].pszValue = NULL;
 
             if (uValLen)
@@ -133,5 +134,5 @@
                 memcpy(pszVal, pszSep + 1, uValLen);
 
-                mapBuf[Utf8Str(pszKey)].pszValue = pszVal;
+                mapBuf[RTCString(pszKey)].pszValue = pszVal;
             }