Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c	(revision 68103)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c	(revision 68104)
@@ -56,4 +56,8 @@
 
 
+/** @todo We only need HGCM, not physical memory, so other guests should also
+ *        switch to calling vbglR0HGCMInit() and vbglR0HGCMTerminate() instead
+ *        of VbglR0SfInit() and VbglR0SfTerm(). */
+#ifndef RT_OS_LINUX
 DECLVBGL(int) VbglR0SfInit(void)
 {
@@ -65,4 +69,5 @@
     VbglTerminate();
 }
+#endif
 
 DECLVBGL(int) VbglR0SfConnect(PVBGLSFCLIENT pClient)
Index: /trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c
===================================================================
--- /trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c	(revision 68103)
+++ /trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c	(revision 68104)
@@ -33,4 +33,5 @@
 #include "revision-generated.h"
 #include "product-generated.h"
+#include "VBGLInternal.h"
 
 MODULE_DESCRIPTION(VBOX_PRODUCT " VFS Module for Host File System Access");
@@ -602,8 +603,8 @@
     }
 
-    rcVBox = VbglR0SfInit();
+    rcVBox = VbglR0HGCMInit();
     if (RT_FAILURE(rcVBox))
     {
-        LogRelFunc(("VbglR0SfInit failed, rc=%d\n", rcVBox));
+        LogRelFunc(("VbglR0HGCMInit failed, rc=%d\n", rcVBox));
         rcRet = -EPROTO;
         goto fail0;
@@ -649,5 +650,5 @@
 
 fail1:
-    VbglR0SfTerm();
+    VbglR0HGCMTerminate();
 
 fail0:
@@ -661,5 +662,5 @@
 
     VbglR0SfDisconnect(&client_handle);
-    VbglR0SfTerm();
+    VbglR0HGCMTerminate();
     unregister_filesystem(&vboxsf_fs_type);
 }