Index: /trunk/include/VBox/VBoxGuestLib.h
===================================================================
--- /trunk/include/VBox/VBoxGuestLib.h	(revision 68102)
+++ /trunk/include/VBox/VBoxGuestLib.h	(revision 68103)
@@ -286,4 +286,19 @@
  * @{
  */
+
+/**
+ * Initializes HGCM in the R0 guest library.  Must be called before any HGCM
+ * connections are made.  Is called by VbglInitClient().
+ *
+ * @return VBox status code.
+ */
+DECLVBGL(int) VbglR0HGCMInit(void);
+
+/**
+ * Terminates HGCM in the R0 guest library.  Is called by VbglTerminate().
+ *
+ * @return VBox status code.
+ */
+DECLVBGL(int) VbglR0HGCMTerminate(void);
 
 /**
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp	(revision 68102)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp	(revision 68103)
@@ -55,5 +55,5 @@
  * @return VBox status code.
  */
-int vbglR0HGCMInit(void)
+DECLVBGL(int) VbglR0HGCMInit(void)
 {
     AssertReturn(mutexHGCMHandle == NIL_RTSEMFASTMUTEX, VINF_ALREADY_INITIALIZED);
@@ -66,5 +66,5 @@
  * @return VBox status code.
  */
-int vbglR0HGCMTerminate(void)
+DECLVBGL(int) VbglR0HGCMTerminate(void)
 {
     RTSemFastMutexDestroy(mutexHGCMHandle);
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/Init.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/Init.cpp	(revision 68102)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/Init.cpp	(revision 68103)
@@ -255,5 +255,5 @@
 
 # ifdef VBOX_WITH_HGCM
-            rc = vbglR0HGCMInit ();
+            rc = VbglR0HGCMInit ();
 # endif /* VBOX_WITH_HGCM */
 
@@ -278,5 +278,5 @@
 {
 # ifdef VBOX_WITH_HGCM
-    vbglR0HGCMTerminate ();
+    VbglR0HGCMTerminate ();
 # endif
 
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h	(revision 68102)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h	(revision 68103)
@@ -139,8 +139,4 @@
 
 #ifdef VBOX_WITH_HGCM
-# ifndef VBGL_VBOXGUEST
-int                         vbglR0HGCMInit(void);
-int                         vbglR0HGCMTerminate(void);
-# endif
 struct VBGLHGCMHANDLEDATA  *vbglHGCMHandleAlloc(void);
 void                        vbglHGCMHandleFree(struct VBGLHGCMHANDLEDATA *pHandle);