Index: /trunk/doc/manual/user_ChangeLogImpl.xml
===================================================================
--- /trunk/doc/manual/user_ChangeLogImpl.xml	(revision 35457)
+++ /trunk/doc/manual/user_ChangeLogImpl.xml	(revision 35458)
@@ -48,4 +48,9 @@
         <para>Main: fixed crash under rare circumstances due to an invalid
           logging string (4.0 regression)</para>
+      </listitem>
+
+      <listitem>
+        <para>Webservice: now listens to localhost by default as documented
+          (bug #6067)</para>
       </listitem>
 
Index: /trunk/src/VBox/Main/webservice/vboxweb.cpp
===================================================================
--- /trunk/src/VBox/Main/webservice/vboxweb.cpp	(revision 35457)
+++ /trunk/src/VBox/Main/webservice/vboxweb.cpp	(revision 35458)
@@ -88,6 +88,5 @@
  ****************************************************************************/
 
-ComPtr<IVirtualBoxClient> g_pVirtualBoxClient = NULL;
-ComPtr<IVirtualBox>     g_pVirtualBox = NULL;
+static ComPtr<IVirtualBoxClient> g_pVirtualBoxClient = NULL;
 
 // generated strings in methodmaps.cpp
@@ -129,6 +128,8 @@
 util::WriteLockHandle  *g_pAuthLibLockHandle;
 
-// this mutex protects the global VirtualBox reference
-util::RWLockHandle  *g_pVirtualBoxLockHandle;
+// this mutex protects the global VirtualBox reference below
+static util::RWLockHandle *g_pVirtualBoxLockHandle;
+
+static ComPtr<IVirtualBox> g_pVirtualBox = NULL;
 
 // this mutex protects all of the below
Index: /trunk/src/VBox/Main/webservice/vboxweb.h
===================================================================
--- /trunk/src/VBox/Main/webservice/vboxweb.h	(revision 35457)
+++ /trunk/src/VBox/Main/webservice/vboxweb.h	(revision 35458)
@@ -55,5 +55,4 @@
  ****************************************************************************/
 
-extern ComPtr<IVirtualBox> g_pVirtualBox;
 extern bool g_fVerbose;