Index: /trunk/Doxyfile.Core
===================================================================
--- /trunk/Doxyfile.Core	(revision 65087)
+++ /trunk/Doxyfile.Core	(revision 65088)
@@ -638,5 +638,10 @@
     "ComSafeArrayIn(aType,aArg)=aType *aArg" \
     "ComSafeArrayOut(aType, aArg)=aType **aArg" \
-    DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP(a)=
+    DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP(a)= \
+    DECLARE_NOT_AGGREGATABLE(a)= \
+    DECLARE_CLASSFACTORY()= \
+    DECLARE_CLASSFACTORY_SINGLETON(a)= \
+    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(a,b)= \
+    "DECLARE_EMPTY_CTOR_DTOR(a):=a(); virtual ~a();"
 
 # COM hacks from From http://www.stack.nl/~dimitri/doxygen/preprocessing.html
Index: /trunk/include/VBox/vmm/pdmnvram.h
===================================================================
--- /trunk/include/VBox/vmm/pdmnvram.h	(revision 65087)
+++ /trunk/include/VBox/vmm/pdmnvram.h	(revision 65088)
@@ -54,4 +54,5 @@
      *          there are not variables with a higher index.
      *
+     * @param   pInterface      Pointer to this interface structure.
      * @param   idxVariable     The variable index. By starting @a idxVariable at 0
      *                          and increasing it with each call, this can be used
@@ -75,5 +76,5 @@
      *
      * @returns VBox status code.
-     * @param   pInterance      Pointer to this interface structure.
+     * @param   pInterface      Pointer to this interface structure.
      * @param   cVariables      The number of variables.
      */
@@ -84,14 +85,15 @@
      *
      * @returns VBox status code.
+     * @param   pInterface      Pointer to this interface structure.
      * @param   idxVariable     The variable index. This will start at 0 and advance
      *                          up to @a cVariables - 1.
      * @param   pVendorUuid     The vendor UUID of the variable.
      * @param   pszName         The variable name buffer.
-     * @param   pcchName        On input this hold the name buffer size (including
+     * @param   cchName         On input this hold the name buffer size (including
      *                          the space for the terminator char).  On successful
      *                          return it holds the strlen() value for @a pszName.
      * @param   fAttributes     The value attributes.
      * @param   pbValue         The value buffer.
-     * @param   pcbValue        On input the size of the value buffer, on output the
+     * @param   cbValue         On input the size of the value buffer, on output the
      *                          actual number of bytes returned.
      */
@@ -104,5 +106,5 @@
      *
      * @returns VBox status code, @a rc on success.
-     * @param   pInterance      Pointer to this interface structure.
+     * @param   pInterface      Pointer to this interface structure.
      * @param   rc              The VBox status code for the whole store operation.
      */
Index: /trunk/src/VBox/Main/glue/NativeEventQueue.cpp
===================================================================
--- /trunk/src/VBox/Main/glue/NativeEventQueue.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/glue/NativeEventQueue.cpp	(revision 65088)
@@ -600,6 +600,6 @@
  *  Posts an event to this event loop asynchronously.
  *
- *  @param  event   the event to post, must be allocated using |new|
- *  @return         TRUE if successful and false otherwise
+ *  @param  pEvent  the event to post, must be allocated using |new|
+ *  @return         @c TRUE if successful and false otherwise
  */
 BOOL NativeEventQueue::postEvent(NativeEvent *pEvent)
Index: /trunk/src/VBox/Main/include/ApplianceImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/ApplianceImpl.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/ApplianceImpl.h	(revision 65088)
@@ -178,5 +178,5 @@
     void i_convertDiskAttachmentValues(const ovf::HardDiskController &hdc,
                                        uint32_t ulAddressOnParent,
-                                       Utf8Str &controllerType,
+                                       Utf8Str &controllerName,
                                        int32_t &lControllerPort,
                                        int32_t &lDevice);
Index: /trunk/src/VBox/Main/include/BandwidthGroupImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/BandwidthGroupImpl.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/BandwidthGroupImpl.h	(revision 65088)
@@ -37,5 +37,5 @@
     // public initializer/uninitializer for internal purposes only
     HRESULT init(BandwidthControl *aParent,
-                 const Utf8Str &aName,
+                 const com::Utf8Str &aName,
                  BandwidthGroupType_T aType,
                  LONG64 aMaxBytesPerSec);
Index: /trunk/src/VBox/Main/include/ConsoleImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/ConsoleImpl.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/ConsoleImpl.h	(revision 65088)
@@ -401,5 +401,5 @@
      *
      *  @sa SafeVMPtr, SafeVMPtrQuiet
-     *  @obsolete Use SafeVMPtr
+     *  @note Obsolete, use SafeVMPtr
      */
     typedef AutoVMCallerBase<false, false> AutoVMCaller;
@@ -410,5 +410,5 @@
      *
      *  @note Temporarily locks the argument for writing.
-    *  @obsolete Use SafeVMPtrQuiet
+     *  @note Obsolete, use SafeVMPtrQuiet
      */
     typedef AutoVMCallerBase<true, false> AutoVMCallerQuiet;
@@ -419,5 +419,5 @@
      *
      *  @note Temporarily locks the argument for writing.
-     *  @obsolete Use SafeVMPtr
+     *  @note Obsolete, use SafeVMPtr
      */
     typedef AutoVMCallerBase<false, true> AutoVMCallerWeak;
@@ -429,5 +429,5 @@
      *
      *  @note Temporarily locks the argument for writing.
-     *  @obsolete Use SafeVMPtrQuiet
+     *  @note Obsolete, use SafeVMPtrQuiet
      */
     typedef AutoVMCallerBase<true, true> AutoVMCallerQuietWeak;
Index: /trunk/src/VBox/Main/include/HostPower.h
===================================================================
--- /trunk/src/VBox/Main/include/HostPower.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/HostPower.h	(revision 65088)
@@ -45,5 +45,5 @@
 };
 
-# ifdef RT_OS_WINDOWS
+# if defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING)
 /**
  * The Windows hosted Power Service.
@@ -64,5 +64,6 @@
     RTTHREAD    mThread;
 };
-#elif defined(RT_OS_LINUX)
+# endif
+# if defined(RT_OS_LINUX) || defined(DOXYGEN_RUNNING)
 /**
  * The Linux hosted Power Service.
@@ -87,5 +88,6 @@
 };
 
-# elif defined(RT_OS_DARWIN) /* RT_OS_WINDOWS */
+# endif
+# if defined(RT_OS_DARWIN) || defined(DOXYGEN_RUNNING)
 /**
  * The Darwin hosted Power Service.
@@ -116,5 +118,5 @@
     bool mCritical; /* Indicate if the battery was in the critical state last checked */
 };
-# endif /* RT_OS_DARWIN */
+# endif
 
 #endif /* !____H_HOSTPOWER */
Index: /trunk/src/VBox/Main/include/PCIDeviceAttachmentImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/PCIDeviceAttachmentImpl.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/PCIDeviceAttachmentImpl.h	(revision 65088)
@@ -37,5 +37,5 @@
     // public initializer/uninitializer for internal purposes only
     HRESULT init(IMachine *    aParent,
-                 const Utf8Str &aName,
+                 const Utf8Str &aDevName,
                  LONG          aHostAddess,
                  LONG          aGuestAddress,
Index: /trunk/src/VBox/Main/include/SharedFolderImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/SharedFolderImpl.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/SharedFolderImpl.h	(revision 65088)
@@ -36,7 +36,7 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(Machine *aMachine, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);
+    HRESULT init(Machine *aMachine, const com::Utf8Str &aName, const com::Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);
     HRESULT initCopy(Machine *aMachine, SharedFolder *aThat);
-    HRESULT init(Console *aConsole, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);
+    HRESULT init(Console *aConsole, const com::Utf8Str &aName, const com::Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);
 //     HRESULT init(VirtualBox *aVirtualBox, const Utf8Str &aName, const Utf8Str &aHostPath, bool aWritable, bool aAutoMount, bool fFailOnError);
     void uninit();
Index: /trunk/src/VBox/Main/include/SnapshotImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/SnapshotImpl.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/SnapshotImpl.h	(revision 65088)
@@ -40,6 +40,6 @@
     HRESULT init(VirtualBox *aVirtualBox,
                  const Guid &aId,
-                 const Utf8Str &aName,
-                 const Utf8Str &aDescription,
+                 const com::Utf8Str &aName,
+                 const com::Utf8Str &aDescription,
                  const RTTIMESPEC &aTimeStamp,
                  SnapshotMachine *aMachine,
@@ -80,5 +80,5 @@
 
     ComObjPtr<Snapshot> i_findChildOrSelf(IN_GUID aId);
-    ComObjPtr<Snapshot> i_findChildOrSelf(const Utf8Str &aName);
+    ComObjPtr<Snapshot> i_findChildOrSelf(const com::Utf8Str &aName);
 
     void i_updateSavedStatePaths(const Utf8Str &strOldPath,
Index: /trunk/src/VBox/Main/include/StorageControllerImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/StorageControllerImpl.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/StorageControllerImpl.h	(revision 65088)
@@ -34,5 +34,5 @@
     // public initializer/uninitializer for internal purposes only
     HRESULT init(Machine *aParent,
-                 const Utf8Str &aName,
+                 const com::Utf8Str &aName,
                  StorageBus_T aBus,
                  ULONG aInstance,
Index: /trunk/src/VBox/Main/include/USBControllerImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/USBControllerImpl.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/USBControllerImpl.h	(revision 65088)
@@ -42,5 +42,5 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(Machine *aParent, const Utf8Str &aName, USBControllerType_T enmType);
+    HRESULT init(Machine *aParent, const com::Utf8Str &aName, USBControllerType_T enmType);
     HRESULT init(Machine *aParent, USBController *aThat, bool fReshare = false);
     HRESULT initCopy(Machine *aParent, USBController *aThat);
Index: /trunk/src/VBox/Main/include/USBGetDevices.h
===================================================================
--- /trunk/src/VBox/Main/include/USBGetDevices.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/USBGetDevices.h	(revision 65088)
@@ -63,5 +63,5 @@
 /**
  * Free a linked list of USB devices created by the Linux enumeration code.
- * @param  pHead  Pointer to the first device in the linked list
+ * @param  ppHead  Pointer to the first device in the linked list
  */
 DECLINLINE(void) deviceListFree(PUSBDEVICE *ppHead)
Index: /trunk/src/VBox/Main/include/USBProxyBackend.h
===================================================================
--- /trunk/src/VBox/Main/include/USBProxyBackend.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/USBProxyBackend.h	(revision 65088)
@@ -42,5 +42,5 @@
 public:
 
-    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackend)
+    DECLARE_EMPTY_CTOR_DTOR(USBProxyBackend)
 
     HRESULT FinalConstruct();
@@ -131,5 +131,5 @@
 
 
-# ifdef RT_OS_DARWIN
+# if defined(RT_OS_DARWIN) || defined(DOXYGEN_RUNNING)
 #  include <VBox/param.h>
 #  undef PAGE_SHIFT
@@ -145,5 +145,5 @@
 {
 public:
-    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendDarwin)
+    DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendDarwin)
 
     int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
@@ -182,5 +182,5 @@
 
 
-# ifdef RT_OS_LINUX
+# if defined(RT_OS_LINUX) || defined(DOXYGEN_RUNNING)
 #  include <stdio.h>
 #  ifdef VBOX_USB_WITH_SYSFS
@@ -194,5 +194,5 @@
 {
 public:
-    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendLinux)
+    DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendLinux)
 
     int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
@@ -237,5 +237,5 @@
 
 
-# ifdef RT_OS_OS2
+# if defined(RT_OS_OS2) || defined(DOXYGEN_RUNNING)
 #  include <usbcalls.h>
 
@@ -246,8 +246,8 @@
 {
 public:
-    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackend)
-
-    virtual int captureDevice (HostUSBDevice *aDevice);
-    virtual int releaseDevice (HostUSBDevice *aDevice);
+    DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendOs2)
+
+    virtual int captureDevice(HostUSBDevice *aDevice);
+    virtual int releaseDevice(HostUSBDevice *aDevice);
 
 protected:
@@ -273,8 +273,8 @@
     APIRET (APIENTRY *mpfnUsbQueryDeviceReport)(ULONG, PULONG, PVOID);
 };
-# endif /* RT_OS_LINUX */
-
-
-# ifdef RT_OS_SOLARIS
+# endif /* RT_OS_OS2 */
+
+
+# if defined(RT_OS_SOLARIS) || defined(DOXYGEN_RUNNING)
 #  include <libdevinfo.h>
 
@@ -285,5 +285,5 @@
 {
 public:
-    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendSolaris)
+    DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendSolaris)
 
     int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
@@ -293,6 +293,6 @@
     virtual void removeFilter (void *aID);
 
-    virtual int captureDevice (HostUSBDevice *aDevice);
-    virtual int releaseDevice (HostUSBDevice *aDevice);
+    virtual int captureDevice(HostUSBDevice *aDevice);
+    virtual int releaseDevice(HostUSBDevice *aDevice);
     virtual void captureDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess);
     virtual void releaseDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess);
@@ -313,5 +313,5 @@
 
 
-# ifdef RT_OS_WINDOWS
+# if defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING)
 /**
  * The Windows hosted USB Proxy Backend.
@@ -320,5 +320,5 @@
 {
 public:
-    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendWindows)
+    DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendWindows)
 
     int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
@@ -328,6 +328,6 @@
     virtual void removeFilter (void *aID);
 
-    virtual int captureDevice (HostUSBDevice *aDevice);
-    virtual int releaseDevice (HostUSBDevice *aDevice);
+    virtual int captureDevice(HostUSBDevice *aDevice);
+    virtual int releaseDevice(HostUSBDevice *aDevice);
 
     virtual bool i_isDevReEnumerationRequired();
@@ -344,5 +344,5 @@
 # endif /* RT_OS_WINDOWS */
 
-# ifdef RT_OS_FREEBSD
+# if defined(RT_OS_FREEBSD) || defined(DOXYGEN_RUNNING)
 /**
  * The FreeBSD hosted USB Proxy Backend.
@@ -351,5 +351,5 @@
 {
 public:
-    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendFreeBSD)
+    DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendFreeBSD)
 
     int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
@@ -402,5 +402,5 @@
 {
 public:
-    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendUsbIp)
+    DECLARE_EMPTY_CTOR_DTOR(USBProxyBackendUsbIp)
 
     int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
Index: /trunk/src/VBox/Main/include/VirtualBoxBase.h
===================================================================
--- /trunk/src/VBox/Main/include/VirtualBoxBase.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/VirtualBoxBase.h	(revision 65088)
@@ -593,5 +593,5 @@
      * translation"). See VirtualBoxBase::translate() for more info.
      *
-     * @param aSourceText   String to translate.
+     * @param pcszSourceText String to translate.
      * @param aComment      Comment to the string to resolve possible
      *                      ambiguities (NULL means no comment).
@@ -641,6 +641,6 @@
  * of a class derived from VirtualBoxBase cannot be instantiated.
  *
- * @param X The class name, e.g. "Class".
- * @param IX The interface name which this class implements, e.g. "IClass".
+ * @param cls The class name, e.g. "Class".
+ * @param iface The interface name which this class implements, e.g. "IClass".
  */
 #ifdef VBOX_WITH_XPCOM
Index: /trunk/src/VBox/Main/include/VirtualBoxImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/VirtualBoxImpl.h	(revision 65087)
+++ /trunk/src/VBox/Main/include/VirtualBoxImpl.h	(revision 65088)
@@ -179,5 +179,5 @@
                                 ComObjPtr<Machine> *aMachine = NULL);
 
-    HRESULT i_validateMachineGroup(const Utf8Str &aGroup, bool fPrimary);
+    HRESULT i_validateMachineGroup(const com::Utf8Str &aGroup, bool fPrimary);
     HRESULT i_convertMachineGroups(const std::vector<com::Utf8Str> aMachineGroups, StringsList *pllMachineGroups);
 
Index: /trunk/src/VBox/Main/src-all/ExtPackUtil.cpp
===================================================================
--- /trunk/src/VBox/Main/src-all/ExtPackUtil.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-all/ExtPackUtil.cpp	(revision 65088)
@@ -272,5 +272,5 @@
  * @returns NULL on success, pointer to an error message on failure (caller
  *          deletes it).
- * @param   a_pszDir        The directory containing the description file.
+ * @param   hVfsFile        The file handle of the description file.
  * @param   a_pExtPackDesc  Where to store the extension pack descriptor.
  * @param   a_pObjInfo      Where to store the object info for the file (unix
@@ -678,5 +678,5 @@
  *
  * @returns VBox status code, failures with message.
- * @param   hManifestFile       The xml from the extension pack.
+ * @param   hXmlFile            The xml from the extension pack.
  * @param   pszExtPackName      The expected extension pack name.  This can be
  *                              NULL, in which we don't have any expectations.
Index: /trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp
===================================================================
--- /trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp	(revision 65088)
@@ -267,4 +267,12 @@
  *  recognize that the created error info object represents a warning rather
  *  than an error.
+ *
+ *  @param  aResultCode
+ *  @param  aIID
+ *  @param  pcszComponent
+ *  @param  aText
+ *  @param  aWarning
+ *  @param  aLogIt
+ *  @param  aResultDetail
  */
 /* static */
@@ -447,6 +455,5 @@
  * virtual getClassIID() and getComponentName() methods which are automatically
  * defined by the VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT macro.
- * @param aResultCode
- * @param pcsz
+ * @param   aResultCode
  * @return
  */
@@ -466,5 +473,6 @@
  * virtual getClassIID() and getComponentName() methods which are automatically
  * defined by the VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT macro.
- * @param aResultCode
+ * @param   aResultCode
+ * @param   pcsz
  * @return
  */
@@ -488,5 +496,5 @@
  * virtual getClassIID() and getComponentName() methods which are automatically
  * defined by the VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT macro.
- * @param ei
+ * @param   ei
  * @return
  */
Index: /trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c
===================================================================
--- /trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c	(revision 65087)
+++ /trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c	(revision 65088)
@@ -280,7 +280,4 @@
 /**
  * Pure virtual method implementation referenced by VirtualBox_p.c
- *
- * @returns New reference count.
- * @param   pThis               Buffer to release.
  */
 void __cdecl _purecall(void)                                                              /* see DLLDUMMYPURECALL in RpcProxy.h */
@@ -370,8 +367,4 @@
  * @param   pszSubRoot      The path to the where the classes are registered,
  *                          NULL if @a hkeyRoot.
- * @param   hkeyAltRoot     The registry root tree constant for the alternative
- *                          registrations (remove only).
- * @param   pszAltSubRoot   The path to where classes could also be registered,
- *                          but shouldn't be in our setup.
  * @param   fDelete         Whether to delete registrations first.
  * @param   fUpdate         Whether to update registrations.
@@ -1267,4 +1260,5 @@
  *
  * @returns COM status code.
+ * @param   pState
  * @param   pwszVBoxDir         The VirtualBox application directory.
  * @param   fIs32On64           Set if this is the 32-bit on 64-bit component.
@@ -1423,8 +1417,4 @@
  *
  * @param   pState              The registry modifier state.
- * @param   pwszVBoxDir         The VirtualBox install directory (unicode),
- *                              trailing slash.
- * @param   fIs32On64           Set if we're registering the 32-bit proxy stub
- *                              on a 64-bit system.
  */
 static void vbpsUpdateInterfaceRegistrations(VBPSREGSTATE *pState)
Index: /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 65088)
@@ -286,6 +286,6 @@
  * Helper that calls CFGMR3InsertString and throws an RTCError if that
  * fails (C-string variant).
- * @param   pParent         See CFGMR3InsertStringN.
- * @param   pcszNodeName    See CFGMR3InsertStringN.
+ * @param   pNode           See CFGMR3InsertStringN.
+ * @param   pcszName        See CFGMR3InsertStringN.
  * @param   pcszValue       The string value.
  */
@@ -304,6 +304,6 @@
  * Helper that calls CFGMR3InsertString and throws an RTCError if that
  * fails (Utf8Str variant).
- * @param   pParent         See CFGMR3InsertStringN.
- * @param   pcszNodeName    See CFGMR3InsertStringN.
+ * @param   pNode           See CFGMR3InsertStringN.
+ * @param   pcszName        See CFGMR3InsertStringN.
  * @param   rStrValue       The string value.
  */
@@ -324,7 +324,7 @@
  * fails (Bstr variant).
  *
- * @param   pParent         See CFGMR3InsertStringN.
- * @param   pcszNodeName    See CFGMR3InsertStringN.
- * @param   rBstrValue       The string value.
+ * @param   pNode           See CFGMR3InsertStringN.
+ * @param   pcszName        See CFGMR3InsertStringN.
+ * @param   rBstrValue      The string value.
  */
 static void InsertConfigString(PCFGMNODE pNode,
Index: /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp	(revision 65088)
@@ -530,5 +530,5 @@
  * @copydoc SSMSTRMOPS::pfnClose
  */
-static DECLCALLBACK(int) teleporterTcpOpClose(void *pvUser, bool fCanceled)
+static DECLCALLBACK(int) teleporterTcpOpClose(void *pvUser, bool fCancelled)
 {
     TeleporterState *pState = (TeleporterState *)pvUser;
@@ -538,5 +538,5 @@
         TELEPORTERTCPHDR EofHdr;
         EofHdr.u32Magic = TELEPORTERTCPHDR_MAGIC;
-        EofHdr.cb       = fCanceled ? UINT32_MAX : 0;
+        EofHdr.cb       = fCancelled ? UINT32_MAX : 0;
         int rc = RTTcpWrite(pState->mhSocket, &EofHdr, sizeof(EofHdr));
         if (RT_FAILURE(rc))
Index: /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 65088)
@@ -562,9 +562,9 @@
 
 /**
- * Returns @true if the passed in error code indicates an error which came from the guest side,
- * or @false if not.
+ * Returns @c true if the passed in error code indicates an error which came
+ * from the guest side, or @c false if not.
  *
- * @return  bool                @true if the passed in error code indicates an error which came from the guest side,
- *                              or @false if not.
+ * @return  bool                @c true if the passed in error code indicates an error which came
+ *                              from the guest side, or @c false if not.
  * @param   rc                  Error code to check.
  */
Index: /trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp	(revision 65088)
@@ -889,7 +889,7 @@
  * @interface_method_impl{DBGFINFOHLP,pfnPrintfV}
  */
-static DECLCALLBACK(void) MachineDebuggerInfoPrintfV(PCDBGFINFOHLP pHlp, const char *pszFormat, va_list va)
-{
-    RTStrFormatV(MachineDebuggerInfoOutput, (void *)pHlp, NULL,  NULL, pszFormat, va);
+static DECLCALLBACK(void) MachineDebuggerInfoPrintfV(PCDBGFINFOHLP pHlp, const char *pszFormat, va_list args)
+{
+    RTStrFormatV(MachineDebuggerInfoOutput, (void *)pHlp, NULL,  NULL, pszFormat, args);
 }
 
Index: /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp	(revision 65088)
@@ -174,5 +174,5 @@
                                               const char *pszUser, const char *pszDomain,
                                               uint32_t uState,
-                                              const uint8_t *puDetails, uint32_t cbDetails)
+                                              const uint8_t *pabDetails, uint32_t cbDetails)
 {
     PDRVMAINVMMDEV pDrv = RT_FROM_MEMBER(pInterface, DRVMAINVMMDEV, Connector);
@@ -186,5 +186,5 @@
 
     pGuest->i_onUserStateChange(Bstr(pszUser), Bstr(pszDomain), (VBoxGuestUserState)uState,
-                                puDetails, cbDetails);
+                                pabDetails, cbDetails);
 }
 
@@ -312,5 +312,5 @@
  *
  * @param   pInterface          Pointer to this interface.
- * @param   newCapabilities     New capabilities.
+ * @param   fNewCaps            New capabilities.
  * @thread  The emulation thread.
  */
Index: /trunk/src/VBox/Main/src-client/VideoRec.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/VideoRec.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-client/VideoRec.cpp	(revision 65088)
@@ -466,8 +466,13 @@
  * @returns IPRT status code.
  * @param   pCtx                Pointer to video recording context to initialize Framebuffer width.
- * @param   uScreeen            Screen number.
- * @param   strFile             File to save the recorded data
- * @param   uTargetWidth        Width of the target image in the video recoriding file (movie)
- * @param   uTargetHeight       Height of the target image in video recording file.
+ * @param   uScreen             Screen number.
+ * @param   pszFile             File to save the recorded data
+ * @param   uWidth              Width of the target image in the video recoriding file (movie)
+ * @param   uHeight             Height of the target image in video recording file.
+ * @param   uRate               Rate.
+ * @param   uFps                FPS.
+ * @param   uMaxTime
+ * @param   uMaxFileSize
+ * @param   pszOptions
  */
 int VideoRecStrmInit(PVIDEORECCONTEXT pCtx, uint32_t uScreen, const char *pszFile,
@@ -710,7 +715,5 @@
  *
  * @returns IPRT status code.
- * @param   pCtx  Pointer to video recording context.
- * @param   uSourceWidth      Width of the source image.
- * @param   uSourceHeight     Height of the source image.
+ * @param   pStrm             Stream.
  */
 static int videoRecEncodeAndWrite(PVIDEORECSTREAM pStrm)
@@ -756,5 +759,5 @@
  *
  * @returns IPRT status code.
- * @param   pCtx      Pointer to video recording context.
+ * @param   pStrm      Strm.
  */
 static int videoRecRGBToYUV(PVIDEORECSTREAM pStrm)
Index: /trunk/src/VBox/Main/src-server/ApplianceImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/ApplianceImpl.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/ApplianceImpl.cpp	(revision 65088)
@@ -270,5 +270,5 @@
  * Private helper func that suggests a VirtualBox guest OS type
  * for the given OVF operating system type.
- * @param osTypeVBox
+ * @param strType
  * @param c
  * @param cStr
@@ -446,5 +446,5 @@
 /**
  * Public method implementation.
- * @param
+ * @param   aPath
  * @return
  */
@@ -463,5 +463,5 @@
 /**
  * Public method implementation.
- * @param
+ * @param aDisks
  * @return
  */
@@ -531,5 +531,5 @@
 /**
  * Public method implementation.
- * @param
+ * @param   aVirtualSystemDescriptions
  * @return
  */
@@ -553,5 +553,5 @@
 /**
  * Public method implementation.
- * @param aDisks
+ * @param aMachines
  * @return
  */
@@ -1564,6 +1564,6 @@
  * @param aType Type of description for the new item.
  * @param strRef Reference item; only used with hard disk controllers.
- * @param aOrigValue Corresponding original value from OVF.
- * @param aAutoValue Initial configuration value (can be overridden by caller with setFinalValues).
+ * @param aOvfValue Corresponding original value from OVF.
+ * @param aVBoxValue Initial configuration value (can be overridden by caller with setFinalValues).
  * @param ulSizeMB Weight for IProgress
  * @param strExtraConfig Extra configuration; meaning dependent on type.
Index: /trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp	(revision 65088)
@@ -892,4 +892,5 @@
  * Opens a source file (for reading obviously).
  *
+ * @param   stack
  * @param   rstrSrcPath         The source file to open.
  * @param   pszManifestEntry    The manifest entry of the source file.  This is
@@ -993,4 +994,7 @@
 /**
  *
+ * @param   stack               Import stack.
+ * @param   rstrSrcPath         Source path.
+ * @param   rstrDstPath         Destination path.
  * @param   pszManifestEntry    The manifest entry of the source file.  This is
  *                              used when constructing our manifest using a pass
@@ -1041,4 +1045,7 @@
 /**
  *
+ * @param   stack
+ * @param   rstrSrcPath
+ * @param   rstrDstPath
  * @param   pszManifestEntry    The manifest entry of the source file.  This is
  *                              used when constructing our manifest using a pass
@@ -1988,6 +1995,6 @@
  * 1) from the public Appliance::ImportMachines().
  *
- * @param aLocInfo
- * @param aProgress
+ * @param locInfo
+ * @param progress
  * @return
  */
@@ -2364,5 +2371,5 @@
             lControllerPort = (long)ulAddressOnParent;
             lDevice = (long)0;
-        break;
+            break;
 
         case ovf::HardDiskController::SCSI:
@@ -2374,6 +2381,6 @@
             lControllerPort = (long)ulAddressOnParent;
             lDevice = (long)0;
+            break;
         }
-        break;
 
         default: break;
@@ -3448,7 +3455,7 @@
  *  4)  Create the VirtualBox machine with the modfified machine config.
  *
- * @param config
- * @param pNewMachine
- * @param stack
+ * @param   vsdescThis
+ * @param   pReturnNewMachine 
+ * @param   stack
  */
 void Appliance::i_importVBoxMachine(ComObjPtr<VirtualSystemDescription> &vsdescThis,
Index: /trunk/src/VBox/Main/src-server/HostDnsService.h
===================================================================
--- /trunk/src/VBox/Main/src-server/HostDnsService.h	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/HostDnsService.h	(revision 65088)
@@ -116,5 +116,5 @@
 };
 
-# ifdef RT_OS_DARWIN
+# if defined(RT_OS_DARWIN) || defined(DOXYGEN_RUNNING)
 class HostDnsServiceDarwin : public HostDnsMonitor
 {
@@ -135,5 +135,5 @@
 };
 # endif
-# ifdef RT_OS_WINDOWS
+# if defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING)
 class HostDnsServiceWin : public HostDnsMonitor
 {
@@ -155,5 +155,6 @@
 };
 # endif
-# if defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX) || defined(RT_OS_OS2) || defined(RT_OS_FREEBSD)
+# if defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX) || defined(RT_OS_OS2) || defined(RT_OS_FREEBSD) \
+    || defined(DOXYGEN_RUNNING)
 class HostDnsServiceResolvConf: public HostDnsMonitor
 {
@@ -176,5 +177,5 @@
     Data *m;
 };
-#  if defined(RT_OS_SOLARIS)
+#  if defined(RT_OS_SOLARIS) || defined(DOXYGEN_RUNNING)
 /**
  * XXX: https://blogs.oracle.com/praks/entry/file_events_notification
@@ -190,5 +191,6 @@
 };
 
-#  elif defined(RT_OS_LINUX)
+#  endif
+#  if defined(RT_OS_LINUX) || defined(DOXYGEN_RUNNING)
 class HostDnsServiceLinux : public HostDnsServiceResolvConf
 {
@@ -205,5 +207,6 @@
 };
 
-#  elif defined(RT_OS_FREEBSD)
+#  endif
+#  if defined(RT_OS_FREEBSD) || defined(DOXYGEN_RUNNING)
 class HostDnsServiceFreebsd: public HostDnsServiceResolvConf
 {
@@ -216,5 +219,6 @@
 };
 
-#  elif defined(RT_OS_OS2)
+#  endif
+#  if defined(RT_OS_OS2) || defined(DOXYGEN_RUNNING)
 class HostDnsServiceOs2 : public HostDnsServiceResolvConf
 {
Index: /trunk/src/VBox/Main/src-server/HostImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/HostImpl.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/HostImpl.cpp	(revision 65088)
@@ -1154,5 +1154,5 @@
  *
  * @returns COM status code
- * @param   os address of result variable
+ * @param   aOperatingSystem result variable
  */
 HRESULT Host::getOperatingSystem(com::Utf8Str &aOperatingSystem)
Index: /trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp	(revision 65088)
@@ -66,4 +66,5 @@
  * @param   aInterfaceName name of the network interface
  * @param   aGuid GUID of the host network interface
+ * @param   ifType interface type
  */
 HRESULT HostNetworkInterface::init(Bstr aInterfaceName, Bstr aShortName, Guid aGuid, HostNetworkInterfaceType_T ifType)
@@ -363,8 +364,8 @@
 
 /**
- * Returns the IP V6 network mask of the host network interface.
- *
- * @returns COM status code
- * @param   aIPV6Mask address of result pointer
+ * Returns the IP V6 network mask prefix length of the host network interface.
+ *
+ * @returns COM status code
+ * @param   aIPV6NetworkMaskPrefixLength address of result pointer
  */
 HRESULT HostNetworkInterface::getIPV6NetworkMaskPrefixLength(ULONG *aIPV6NetworkMaskPrefixLength)
Index: /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp	(revision 65088)
@@ -639,6 +639,6 @@
 /**
  * Internal implementation for Snapshot::updateSavedStatePaths (below).
- * @param aOldPath
- * @param aNewPath
+ * @param   strOldPath
+ * @param   strNewPath
  */
 void Snapshot::i_updateSavedStatePathsImpl(const Utf8Str &strOldPath,
@@ -714,11 +714,11 @@
  *  Intended to be called by Machine::openConfigLoader() only.
  *
- *  @param aOldPath old path (full)
- *  @param aNewPath new path (full)
+ *  @param  strOldPath old path (full)
+ *  @param  strNewPath new path (full)
  *
  *  @note Locks the machine (for the snapshots tree) +  this object + children for writing.
  */
 void Snapshot::i_updateSavedStatePaths(const Utf8Str &strOldPath,
-                                      const Utf8Str &strNewPath)
+                                       const Utf8Str &strNewPath)
 {
     LogFlowThisFunc(("aOldPath={%s} aNewPath={%s}\n", strOldPath.c_str(), strNewPath.c_str()));
@@ -1858,5 +1858,8 @@
  * @note Locks VirtualBox and this object for writing.
  *
- * @param aSuccess Whether Console was successful with the client-side snapshot things.
+ * @param   task
+ * @param   alock
+ * @param   aSuccess    Whether Console was successful with the client-side
+ *                      snapshot things.
  * @return
  */
@@ -2617,5 +2620,5 @@
  * @note Locks the machine + the snapshot + the media tree for writing!
  *
- * @param pTask Task data.
+ * @param task Task data.
  */
 void SessionMachine::i_deleteSnapshotHandler(DeleteSnapshotTask &task)
Index: /trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp	(revision 65088)
@@ -39,5 +39,5 @@
  *  @param  aFilter     The filter.
  *  @param  aIdx        The field index.
- *  @param  aStr        The output string.
+ *  @param  rstrOut     The output string.
  */
 static void i_usbFilterFieldToString(PCUSBFILTER aFilter, USBFILTERIDX aIdx, Utf8Str &rstrOut)
Index: /trunk/src/VBox/Main/src-server/USBProxyBackend.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/USBProxyBackend.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/USBProxyBackend.cpp	(revision 65088)
@@ -559,5 +559,5 @@
  *
  * @returns Pointer to the head of the sorted doubly linked list.
- * @param   aDevices        Head pointer (can be both singly and doubly linked list).
+ * @param   pDevices        Head pointer (can be both singly and doubly linked list).
  */
 static PUSBDEVICE sortDevices(PUSBDEVICE pDevices)
Index: /trunk/src/VBox/Main/src-server/USBProxyService.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/USBProxyService.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/USBProxyService.cpp	(revision 65088)
@@ -264,4 +264,5 @@
  * @param   aMachine        The machine to attach the device to.
  * @param   aId             The UUID of the USB device to capture and attach.
+ * @param   aCaptureFilename
  *
  * @returns COM status code and error info.
@@ -423,4 +424,6 @@
  *
  * @param   aMachine        The machine to detach devices from.
+ * @param   aDone
+ * @param   aAbnormal
  *
  * @returns COM status code, perhaps with error info.
Index: /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 65088)
@@ -3188,5 +3188,5 @@
  *
  * @param aId Machine UUID to look for.
- * @param aPermitInaccessible If true, inaccessible machines will be found;
+ * @param fPermitInaccessible If true, inaccessible machines will be found;
  *                  if false, this will fail if the given machine is inaccessible.
  * @param aSetError If true, set errorinfo if the machine is not found.
@@ -3349,6 +3349,6 @@
  * Validates a machine group.
  *
- * @param aMachineGroup     Machine group.
- * @param fPrimary          Set if this is the primary group.
+ * @param aGroup    Machine group.
+ * @param fPrimary  Set if this is the primary group.
  *
  * @return S_OK or E_INVALIDARG
@@ -3452,5 +3452,5 @@
  * object that matches either of them (not necessarily both) is returned.
  *
- * @param aLocation     Full location specification. Must not be empty.
+ * @param strLocation   Full location specification. Must not be empty.
  * @param aSetError     If @c true , the appropriate error info is set in case
  *                      when the hard disk is not found.
@@ -3773,5 +3773,5 @@
  * directory as the current directory.
  *
- * @param  aPath    Path to calculate the absolute path for.
+ * @param  strPath  Path to calculate the absolute path for.
  * @param  aResult  Where to put the result (used only on success, can be the
  *                  same Utf8Str instance as passed in @a aPath).
@@ -4823,6 +4823,6 @@
  * directory which is normally unknown.
  *
- * @param aFileName     Full file name which path is checked/created.
- * @param aCreate       Flag if the path should be created if it doesn't exist.
+ * @param strFileName   Full file name which path is checked/created.
+ * @param fCreate       Flag if the path should be created if it doesn't exist.
  *
  * @return Extended error information on failure to check/create the path.
Index: /trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp	(revision 65088)
@@ -169,14 +169,14 @@
                                                             kStateNetworkGlobalDNSKey);
     /**
-     * 0:vvl@nb-mbp-i7-2(0)# scutil
-     * > get State:/Network/Global/DNS
-     * > d.show
-     * <dictionary> {
+     * # scutil
+     * \> get State:/Network/Global/DNS
+     * \> d.show
+     * \<dictionary\> {
      * DomainName : vvl-domain
-     * SearchDomains : <array> {
+     * SearchDomains : \<array\> {
      * 0 : vvl-domain
      * 1 : de.vvl-domain.com
      * }
-     * ServerAddresses : <array> {
+     * ServerAddresses : \<array\> {
      * 0 : 192.168.1.4
      * 1 : 192.168.1.1
Index: /trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp	(revision 65088)
@@ -540,6 +540,7 @@
  * @param   puMbits     Where to store the link speed.
  */
-int NetIfGetLinkSpeed(const char * /*pcszIfName*/, uint32_t * /*puMbits*/)
-{
+int NetIfGetLinkSpeed(const char *pcszIfName, uint32_t *puMbits)
+{
+    RT_NOREF(pcszIfName, puMbits);
     return VERR_NOT_IMPLEMENTED;
 }
Index: /trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp	(revision 65088)
@@ -327,7 +327,7 @@
  * @param pcszModel   the product ID string
  * @param pszDesc    where to store the description string (optional)
- * @param cchDesc    the size of the buffer in @pszDesc
+ * @param cchDesc    the size of the buffer in @a pszDesc
  * @param pszUdi     where to store the UDI string (optional)
- * @param cchUdi     the size of the buffer in @pszUdi
+ * @param cchUdi     the size of the buffer in @a pszUdi
  */
 /* static */
Index: /trunk/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp	(revision 65088)
@@ -77,13 +77,13 @@
                 }
 
-                LogRel(("USBProxyServiceOs2: failed to register change notification, rc=%d\n", rc));
+                LogRel(("USBProxyBackendOs2: failed to register change notification, rc=%d\n", rc));
             }
             else
-                LogRel(("USBProxyServiceOs2: failed to load usbcalls\n"));
+                LogRel(("USBProxyBackendOs2: failed to load usbcalls\n"));
 
             DosFreeModule(mhmod);
         }
         else
-            LogRel(("USBProxyServiceOs2: failed to load usbcalls, rc=%d\n", rc));
+            LogRel(("USBProxyBackendOs2: failed to load usbcalls, rc=%d\n", rc));
         mhmod = NULLHANDLE;
     }
@@ -99,5 +99,5 @@
  * Stop all service threads and free the device chain.
  */
-USBProxyServiceOs2::~USBProxyServiceOs2()
+USBProxyBackendOs2::~USBProxyBackendOs2()
 {
     LogFlowThisFunc(("\n"));
@@ -128,5 +128,5 @@
 
 
-int USBProxyServiceOs2::captureDevice(HostUSBDevice *aDevice)
+int USBProxyBackendOs2::captureDevice(HostUSBDevice *aDevice)
 {
     AssertReturn(aDevice, VERR_GENERAL_FAILURE);
@@ -147,5 +147,5 @@
 
 
-int USBProxyServiceOs2::releaseDevice(HostUSBDevice *aDevice)
+int USBProxyBackendOs2::releaseDevice(HostUSBDevice *aDevice)
 {
     AssertReturn(aDevice, VERR_GENERAL_FAILURE);
@@ -166,5 +166,5 @@
 
 
-bool USBProxyServiceOs2::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters,
+bool USBProxyBackendOs2::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters,
                                            SessionMachine **aIgnoreMachine)
 {
@@ -176,5 +176,5 @@
 
 
-int USBProxyServiceOs2::wait(RTMSINTERVAL aMillies)
+int USBProxyBackendOs2::wait(RTMSINTERVAL aMillies)
 {
     int rc = DosWaitEventSem(mhev, aMillies);
@@ -183,5 +183,5 @@
 
 
-int USBProxyServiceOs2::interruptWait(void)
+int USBProxyBackendOs2::interruptWait(void)
 {
     int rc = DosPostEventSem(mhev);
@@ -193,5 +193,5 @@
 #include <stdio.h>
 
-PUSBDEVICE USBProxyServiceOs2::getDevices(void)
+PUSBDEVICE USBProxyBackendOs2::getDevices(void)
 {
     /*
Index: /trunk/src/VBox/Main/webservice/vboxweb.cpp
===================================================================
--- /trunk/src/VBox/Main/webservice/vboxweb.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/webservice/vboxweb.cpp	(revision 65088)
@@ -1536,5 +1536,5 @@
  *
  * @param soap
- * @param str
+ * @param pcsz
  * @param extype
  * @param ex
@@ -1607,5 +1607,5 @@
  * Return a safe C++ string from the given COM UUID,
  * without crashing if the UUID is empty.
- * @param bstr
+ * @param uuid
  * @return
  */
@@ -1798,7 +1798,4 @@
  *
  * Preconditions: Caller must have locked g_pWebsessionsLockHandle.
- *
- * @param username
- * @param password
  */
 WebServiceSession::WebServiceSession()
@@ -1989,5 +1986,5 @@
  * Preconditions: Caller must have locked g_pWebsessionsLockHandle.
  *
- * @param pcu pointer to a COM object.
+ * @param pObject pointer to a COM object.
  * @return The existing ManagedObjectRef that represents the COM object, or NULL if there's none yet.
  */
@@ -2364,7 +2361,7 @@
  * client to clean up itself.
  *
- * @param
- * @param vbox__IWebsessionManager_USCORElogon
- * @param vbox__IWebsessionManager_USCORElogonResponse
+ * @param soap
+ * @param req
+ * @param resp
  * @return
  */
@@ -2454,7 +2451,6 @@
  * hard-coded implementation for IWebsessionManager::logoff.
  *
- * @param
- * @param vbox__IWebsessionManager_USCORElogon
- * @param vbox__IWebsessionManager_USCORElogonResponse
+ * @param req
+ * @param resp
  * @return
  */
Index: /trunk/src/VBox/Main/xml/Settings.cpp
===================================================================
--- /trunk/src/VBox/Main/xml/Settings.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/xml/Settings.cpp	(revision 65088)
@@ -876,5 +876,6 @@
  * For pre-1.4 files, this gets called with the \<DiskRegistry\> chunk instead.
  *
- * @param elmMediaRegistry
+ * @param   elmMediaRegistry
+ * @param   mr
  */
 void ConfigFileBase::readMediaRegistry(const xml::ElementNode &elmMediaRegistry,
@@ -1818,5 +1819,5 @@
  * from both MainConfigFile (for host filters) and MachineConfigFile (for machine
  * filters).
- * @param elmDeviceFilters
+ * @param elmDeviceSources
  * @param ll
  */
@@ -1863,5 +1864,5 @@
  * variables contain meaningful values (either from the file or defaults).
  *
- * @param strFilename
+ * @param pstrFilename
  */
 MainConfigFile::MainConfigFile(const Utf8Str *pstrFilename)
@@ -4571,5 +4572,6 @@
  * for earlier versions.
  *
- * @param elmStorageControllers
+ * @param   elmStorageControllers
+ * @param   strg
  */
 void MachineConfigFile::readStorageControllers(const xml::ElementNode &elmStorageControllers,
Index: /trunk/src/VBox/Main/xml/ovfreader.cpp
===================================================================
--- /trunk/src/VBox/Main/xml/ovfreader.cpp	(revision 65087)
+++ /trunk/src/VBox/Main/xml/ovfreader.cpp	(revision 65088)
@@ -120,6 +120,6 @@
  * and handles the contained child elements (which can be "Section" or "Content" elements).
  *
- * @param pcszPath Path spec of the XML file, for error messages.
- * @param pReferencesElement "References" element from OVF, for looking up file specifications; can be NULL if no such element is present.
+ * @param pReferencesElem "References" element from OVF, for looking up file specifications;
+ *                        can be NULL if no such element is present.
  * @param pCurElem Element whose children are to be analyzed here.
  * @return
@@ -295,6 +295,4 @@
  * Gets called indirectly from IAppliance::read().
  *
- * @param pcszPath Path spec of the XML file, for error messages.
- * @param pSectionElem Section element for which this helper is getting called.
  * @return
  */
@@ -322,6 +320,5 @@
  * Gets called indirectly from IAppliance::read().
  *
- * @param pcszPath
- * @param pContentElem
+ * @param pelmVirtualSystem
  * @return
  */
