Index: /trunk/include/VBox/com/array.h
===================================================================
--- /trunk/include/VBox/com/array.h	(revision 60700)
+++ /trunk/include/VBox/com/array.h	(revision 60701)
@@ -4,5 +4,5 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1536,5 +1536,5 @@
     {
         NOREF(aVarType);
-        return SafeArrayCreateEx(VT_DISPATCH, 1, aBound, (PVOID)&_ATL_IIDOF(I));
+        return SafeArrayCreateEx(VT_DISPATCH, 1, aBound, (PVOID)&COM_IIDOF(I));
     }
 };
@@ -1617,7 +1617,7 @@
             rc = SafeArrayGetIID(arg, &guid);
             AssertComRCReturnVoid(rc);
-            AssertMsgReturnVoid(InlineIsEqualGUID(_ATL_IIDOF(I), guid),
+            AssertMsgReturnVoid(InlineIsEqualGUID(COM_IIDOF(I), guid),
                                 ("Expected IID {%RTuuid}, got {%RTuuid}.\n",
-                                 &_ATL_IIDOF(I), &guid));
+                                 &COM_IIDOF(I), &guid));
 
             rc = SafeArrayAccessData(arg, (void HUGEP **)&m.raw);
Index: /trunk/include/VBox/com/listeners.h
===================================================================
--- /trunk/include/VBox/com/listeners.h	(revision 60700)
+++ /trunk/include/VBox/com/listeners.h	(revision 60701)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2010-2015 Oracle Corporation
+ * Copyright (C) 2010-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -56,12 +56,12 @@
 template <class T, class TParam = void *>
 class ListenerImpl :
-     public CComObjectRootEx<CComMultiThreadModel>,
+     public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>,
      VBOX_SCRIPTABLE_IMPL(IEventListener)
 {
-    T*                mListener;
+    T* mListener;
 
 #ifdef RT_OS_WINDOWS
     /* FTM stuff */
-    CComPtr <IUnknown>   m_pUnkMarshaler;
+    ComPtr<IUnknown> m_pUnkMarshaler;
 #else
     nsAutoRefCnt mRefCnt;
@@ -103,5 +103,5 @@
     {
 #ifdef RT_OS_WINDOWS
-       return CoCreateFreeThreadedMarshaler(this, &m_pUnkMarshaler.p);
+       return CoCreateFreeThreadedMarshaler(this, &m_pUnkMarshaler.m_p);
 #else
        return S_OK;
@@ -113,5 +113,5 @@
       uninit();
 #ifdef RT_OS_WINDOWS
-      m_pUnkMarshaler.Release();
+      m_pUnkMarshaler.setNull();
 #endif
     }
@@ -130,5 +130,5 @@
         COM_INTERFACE_ENTRY(IEventListener)
         COM_INTERFACE_ENTRY2(IDispatch, IEventListener)
-        COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, m_pUnkMarshaler.p)
+        COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, m_pUnkMarshaler.m_p)
     END_COM_MAP()
 #else