Index: /trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h	(revision 42357)
+++ /trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h	(revision 42358)
@@ -173,5 +173,5 @@
     GuestProcessWaitResult GetResult(void) { return mWaitResult; }
 
-    int Signal(ProcessWaitResult enmResult, int rc = VINF_SUCCESS);
+    int Signal(ProcessWaitResult_T enmResult, int rc = VINF_SUCCESS);
 
 protected:
Index: /trunk/src/VBox/Main/include/GuestProcessImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestProcessImpl.h	(revision 42357)
+++ /trunk/src/VBox/Main/include/GuestProcessImpl.h	(revision 42358)
@@ -94,5 +94,5 @@
     int prepareExecuteEnv(const char *pszEnv, void **ppvList, ULONG *pcbList, ULONG *pcEnvVars);
     int sendCommand(uint32_t uFunction, uint32_t uParms, PVBOXHGCMSVCPARM paParms);
-    int signalWaiters(ProcessWaitResult enmWaitResult, int rc = VINF_SUCCESS);
+    int signalWaiters(ProcessWaitResult_T enmWaitResult, int rc = VINF_SUCCESS);
     static DECLCALLBACK(int) startProcessThread(RTTHREAD Thread, void *pvUser);
     /** @}  */
Index: /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp	(revision 42357)
+++ /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp	(revision 42358)
@@ -63,5 +63,5 @@
     }
 
-    LogFlowThisFuncLeaveRC(rc);
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -120,16 +120,16 @@
 
 GuestCtrlCallback::GuestCtrlCallback(void)
-    : mType(VBOXGUESTCTRLCALLBACKTYPE_UNKNOWN),
-      uFlags(0),
-      pvData(NULL),
-      cbData(0)
+    : pvData(NULL),
+      cbData(0),
+     mType(VBOXGUESTCTRLCALLBACKTYPE_UNKNOWN),
+      uFlags(0)
 {
 }
 
 GuestCtrlCallback::GuestCtrlCallback(eVBoxGuestCtrlCallbackType enmType)
-    : mType(VBOXGUESTCTRLCALLBACKTYPE_UNKNOWN),
-      uFlags(0),
-      pvData(NULL),
-      cbData(0)
+    : pvData(NULL),
+      cbData(0),
+      mType(VBOXGUESTCTRLCALLBACKTYPE_UNKNOWN),
+      uFlags(0)
 {
     int rc = Init(enmType);
@@ -234,5 +234,5 @@
 }
 
-int GuestProcessEvent::Signal(ProcessWaitResult enmResult, int rc /*= VINF_SUCCESS*/)
+int GuestProcessEvent::Signal(ProcessWaitResult_T enmResult, int rc /*= VINF_SUCCESS*/)
 {
     mWaitResult.mRC = rc;
Index: /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 42357)
+++ /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 42358)
@@ -544,5 +544,5 @@
 
     BOOL fSignal = FALSE;
-    ProcessWaitResult enmWaitResult;
+    ProcessWaitResult_T enmWaitResult;
     uint32_t uWaitFlags = mData.mWaitEvent
                         ? mData.mWaitEvent->GetWaitFlags() : 0;
@@ -762,5 +762,5 @@
 }
 
-int GuestProcess::signalWaiters(ProcessWaitResult enmWaitResult, int rc /*= VINF_SUCCESS*/)
+int GuestProcess::signalWaiters(ProcessWaitResult_T enmWaitResult, int rc /*= VINF_SUCCESS*/)
 {
     LogFlowFunc(("enmWaitResult=%d, rc=%Rrc, mWaitCount=%RU32, mWaitEvent=%p\n",