Index: /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 85300)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 85301)
@@ -7362,5 +7362,5 @@
     {
         *aCanShow = TRUE;
-        HRESULT hrc = CreateCanShowWindowEvent(ptrEvent.asOutParam(), mEventSource);
+        HRESULT hrc = ::CreateCanShowWindowEvent(ptrEvent.asOutParam(), mEventSource);
         if (SUCCEEDED(hrc))
         {
@@ -7387,5 +7387,5 @@
     else
     {
-        HRESULT hrc = CreateShowWindowEvent(ptrEvent.asOutParam(), mEventSource, 0);
+        HRESULT hrc = ::CreateShowWindowEvent(ptrEvent.asOutParam(), mEventSource, 0);
         if (SUCCEEDED(hrc))
         {
Index: /trunk/src/VBox/Main/src-client/MouseImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/MouseImpl.cpp	(revision 85300)
+++ /trunk/src/VBox/Main/src-client/MouseImpl.cpp	(revision 85301)
@@ -269,6 +269,6 @@
 
     ComPtr<IEvent> ptrEvent;
-    rc = CreateGuestMouseEvent(ptrEvent.asOutParam(), mEventSource,
-                               (GuestMouseEventMode_T)0, 0 /*x*/, 0 /*y*/, 0 /*z*/, 0 /*w*/, 0 /*buttons*/);
+    rc = ::CreateGuestMouseEvent(ptrEvent.asOutParam(), mEventSource,
+                                 (GuestMouseEventMode_T)0, 0 /*x*/, 0 /*y*/, 0 /*z*/, 0 /*w*/, 0 /*buttons*/);
     AssertComRCReturnRC(rc);
     mMouseEvent.init(ptrEvent, mEventSource);
Index: /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 85300)
+++ /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 85301)
@@ -3245,6 +3245,6 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateMediumRegisteredEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                              aMediumId.toUtf16().raw(), aDevType, aRegistered);
+    HRESULT hrc = ::CreateMediumRegisteredEvent(ptrEvent.asOutParam(), m->pEventSource,
+                                                aMediumId.toUtf16().raw(), aDevType, aRegistered);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3254,5 +3254,5 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateMediumConfigChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aMedium);
+    HRESULT hrc = ::CreateMediumConfigChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aMedium);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3262,5 +3262,5 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateMediumChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aMediumAttachment);
+    HRESULT hrc = ::CreateMediumChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aMediumAttachment);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3273,6 +3273,6 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateStorageControllerChangedEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                                      aMachineId.toUtf16().raw(), Bstr(aControllerName).raw());
+    HRESULT hrc = ::CreateStorageControllerChangedEvent(ptrEvent.asOutParam(), m->pEventSource,
+                                                        aMachineId.toUtf16().raw(), Bstr(aControllerName).raw());
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3282,5 +3282,5 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateStorageDeviceChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aStorageDevice, fRemoved, fSilent);
+    HRESULT hrc = ::CreateStorageDeviceChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aStorageDevice, fRemoved, fSilent);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3293,5 +3293,5 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateMachineStateChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aState);
+    HRESULT hrc = ::CreateMachineStateChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aState);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3304,5 +3304,5 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateMachineDataChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aTemporary);
+    HRESULT hrc = ::CreateMachineDataChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aTemporary);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3321,5 +3321,5 @@
 
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateExtraDataCanChangeEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aKey, aValue);
+    HRESULT hrc = ::CreateExtraDataCanChangeEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aKey, aValue);
     AssertComRCReturn(hrc, TRUE);
 
@@ -3357,5 +3357,5 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateExtraDataChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aKey, aValue);
+    HRESULT hrc = ::CreateExtraDataChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aKey, aValue);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3368,5 +3368,5 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateMachineRegisteredEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aRegistered);
+    HRESULT hrc = ::CreateMachineRegisteredEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aRegistered);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3380,5 +3380,5 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateSessionStateChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aState);
+    HRESULT hrc = ::CreateSessionStateChangedEvent(ptrEvent.asOutParam(), m->pEventSource, aId.toUtf16().raw(), aState);
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3391,17 +3391,5 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateSnapshotTakenEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                           aMachineId.toUtf16().raw(), aSnapshotId.toUtf16().raw());
-    AssertComRCReturnVoid(hrc);
-    i_postEvent(new AsyncEvent(this, ptrEvent));
-}
-
-/**
- *  @note Doesn't lock any object.
- */
-void VirtualBox::i_onSnapshotDeleted(const Guid &aMachineId, const Guid &aSnapshotId)
-{
-    ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateSnapshotDeletedEvent(ptrEvent.asOutParam(), m->pEventSource,
+    HRESULT hrc = ::CreateSnapshotTakenEvent(ptrEvent.asOutParam(), m->pEventSource,
                                              aMachineId.toUtf16().raw(), aSnapshotId.toUtf16().raw());
     AssertComRCReturnVoid(hrc);
@@ -3412,9 +3400,9 @@
  *  @note Doesn't lock any object.
  */
-void VirtualBox::i_onSnapshotRestored(const Guid &aMachineId, const Guid &aSnapshotId)
+void VirtualBox::i_onSnapshotDeleted(const Guid &aMachineId, const Guid &aSnapshotId)
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateSnapshotRestoredEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                              aMachineId.toUtf16().raw(), aSnapshotId.toUtf16().raw());
+    HRESULT hrc = ::CreateSnapshotDeletedEvent(ptrEvent.asOutParam(), m->pEventSource,
+                                               aMachineId.toUtf16().raw(), aSnapshotId.toUtf16().raw());
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));
@@ -3423,4 +3411,16 @@
 /**
  *  @note Doesn't lock any object.
+ */
+void VirtualBox::i_onSnapshotRestored(const Guid &aMachineId, const Guid &aSnapshotId)
+{
+    ComPtr<IEvent> ptrEvent;
+    HRESULT hrc = ::CreateSnapshotRestoredEvent(ptrEvent.asOutParam(), m->pEventSource,
+                                                aMachineId.toUtf16().raw(), aSnapshotId.toUtf16().raw());
+    AssertComRCReturnVoid(hrc);
+    i_postEvent(new AsyncEvent(this, ptrEvent));
+}
+
+/**
+ *  @note Doesn't lock any object.
  *  @todo +d
  */
@@ -3428,6 +3428,6 @@
 {
     ComPtr<IEvent> ptrEvent;
-    HRESULT hrc = CreateSnapshotChangedEvent(ptrEvent.asOutParam(), m->pEventSource,
-                                             aMachineId.toUtf16().raw(), aSnapshotId.toUtf16().raw());
+    HRESULT hrc = ::CreateSnapshotChangedEvent(ptrEvent.asOutParam(), m->pEventSource,
+                                               aMachineId.toUtf16().raw(), aSnapshotId.toUtf16().raw());
     AssertComRCReturnVoid(hrc);
     i_postEvent(new AsyncEvent(this, ptrEvent));