Index: /trunk/src/VBox/Main/include/GuestDirectoryImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestDirectoryImpl.h	(revision 51320)
+++ /trunk/src/VBox/Main/include/GuestDirectoryImpl.h	(revision 51321)
@@ -1,10 +1,9 @@
-
 /* $Id$ */
 /** @file
- * VirtualBox Main - XXX.
+ * VirtualBox Main - Guest directory handling implementation.
  */
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -44,5 +43,4 @@
     /** @}  */
 
-
 public:
     /** @name Public internal methods.
Index: /trunk/src/VBox/Main/include/GuestFileImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestFileImpl.h	(revision 51320)
+++ /trunk/src/VBox/Main/include/GuestFileImpl.h	(revision 51321)
@@ -1,6 +1,5 @@
-
 /* $Id$ */
 /** @file
- * VirtualBox Main - Guest file handling.
+ * VirtualBox Main - Guest file handling implementation.
  */
 
@@ -30,7 +29,4 @@
 class GuestProcess;
 
-/**
- * TODO
- */
 class ATL_NO_VTABLE GuestFile :
     public GuestFileWrap,
@@ -48,5 +44,4 @@
     void    FinalRelease(void);
     /** @}  */
-
 
 public:
@@ -77,5 +72,6 @@
 private:
 
-    // Wrapped IGuestFile properties.
+    /** Wrapped @name IGuestFile properties.
+     * @{ */
     HRESULT getCreationMode(ULONG *aCreationMode);
     HRESULT getDisposition(com::Utf8Str &aDisposition);
@@ -87,6 +83,8 @@
     HRESULT getOffset(LONG64 *aOffset);
     HRESULT getStatus(FileStatus_T *aStatus);
+    /** @}  */
 
-    // Wrapped IGuestFile methods.
+    /** Wrapped @name IGuestFile methods.
+     * @{ */
     HRESULT close();
     HRESULT queryInfo(ComPtr<IFsObjInfo> &aObjInfo);
@@ -108,4 +106,5 @@
                     ULONG aTimeoutMS,
                     ULONG *aWritten);
+    /** @}  */
 
     /** This can safely be used without holding any locks.
Index: /trunk/src/VBox/Main/include/GuestFsObjInfoImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestFsObjInfoImpl.h	(revision 51320)
+++ /trunk/src/VBox/Main/include/GuestFsObjInfoImpl.h	(revision 51321)
@@ -1,6 +1,5 @@
-
 /* $Id$ */
 /** @file
- * VirtualBox Main - XXX.
+ * VirtualBox Main - Guest file system object information implementation.
  */
 
@@ -23,7 +22,4 @@
 #include "GuestCtrlImplPrivate.h"
 
-/**
- * TODO
- */
 class ATL_NO_VTABLE GuestFsObjInfo :
     public GuestFsObjInfoWrap
@@ -39,8 +35,10 @@
     HRESULT FinalConstruct(void);
     void    FinalRelease(void);
+    /** @}  */
 
 private:
 
-    // Wrapped GuestFsObjInfo properties.
+    /** Wrapped @name IGuestFsObjInfo properties.
+     * @{ */
     HRESULT getAccessTime(LONG64 *aAccessTime);
     HRESULT getAllocatedSize(LONG64 *aAllocatedSize);
@@ -62,4 +60,5 @@
     HRESULT getUserFlags(ULONG *aUserFlags);
     HRESULT getUserName(com::Utf8Str &aUserName);
+    /** @}  */
 
     GuestFsObjData mData;
Index: /trunk/src/VBox/Main/include/GuestProcessImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestProcessImpl.h	(revision 51320)
+++ /trunk/src/VBox/Main/include/GuestProcessImpl.h	(revision 51321)
@@ -1,10 +1,9 @@
-
 /* $Id$ */
 /** @file
- * VirtualBox Main - Guest process handling.
+ * VirtualBox Main - Guest process handling implementation.
  */
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43,5 +42,4 @@
     void    FinalRelease(void);
     /** @}  */
-
 
 public:
@@ -91,38 +89,40 @@
 
 private:
-    /** Wrapped @name IProcess data .
-     * @{ */
-     HRESULT getArguments(std::vector<com::Utf8Str> &aArguments);
-     HRESULT getEnvironment(std::vector<com::Utf8Str> &aEnvironment);
-     HRESULT getEventSource(ComPtr<IEventSource> &aEventSource);
-     HRESULT getExecutablePath(com::Utf8Str &aExecutablePath);
-     HRESULT getExitCode(LONG *aExitCode);
-     HRESULT getName(com::Utf8Str &aName);
-     HRESULT getPID(ULONG *aPID);
-     HRESULT getStatus(ProcessStatus_T *aStatus);
+    /** Wrapped @name IProcess properties.
+     * @{ */
+    HRESULT getArguments(std::vector<com::Utf8Str> &aArguments);
+    HRESULT getEnvironment(std::vector<com::Utf8Str> &aEnvironment);
+    HRESULT getEventSource(ComPtr<IEventSource> &aEventSource);
+    HRESULT getExecutablePath(com::Utf8Str &aExecutablePath);
+    HRESULT getExitCode(LONG *aExitCode);
+    HRESULT getName(com::Utf8Str &aName);
+    HRESULT getPID(ULONG *aPID);
+    HRESULT getStatus(ProcessStatus_T *aStatus);
+    /** @}  */
 
     /** Wrapped @name IProcess methods.
      * @{ */
-     HRESULT waitFor(ULONG aWaitFor,
-                     ULONG aTimeoutMS,
-                     ProcessWaitResult_T *aReason);
-     HRESULT waitForArray(const std::vector<ProcessWaitForFlag_T> &aWaitFor,
-                          ULONG aTimeoutMS,
-                          ProcessWaitResult_T *aReason);
-     HRESULT read(ULONG aHandle,
-                  ULONG aToRead,
+    HRESULT waitFor(ULONG aWaitFor,
+                    ULONG aTimeoutMS,
+                    ProcessWaitResult_T *aReason);
+    HRESULT waitForArray(const std::vector<ProcessWaitForFlag_T> &aWaitFor,
+                         ULONG aTimeoutMS,
+                         ProcessWaitResult_T *aReason);
+    HRESULT read(ULONG aHandle,
+                 ULONG aToRead,
+                 ULONG aTimeoutMS,
+                 std::vector<BYTE> &aData);
+    HRESULT write(ULONG aHandle,
+                  ULONG aFlags,
+                  const std::vector<BYTE> &aData,
                   ULONG aTimeoutMS,
-                  std::vector<BYTE> &aData);
-     HRESULT write(ULONG aHandle,
-                   ULONG aFlags,
-                   const std::vector<BYTE> &aData,
-                   ULONG aTimeoutMS,
-                   ULONG *aWritten);
-     HRESULT writeArray(ULONG aHandle,
-                        const std::vector<ProcessInputFlag_T> &aFlags,
-                        const std::vector<BYTE> &aData,
-                        ULONG aTimeoutMS,
-                        ULONG *aWritten);
-     HRESULT terminate();
+                  ULONG *aWritten);
+    HRESULT writeArray(ULONG aHandle,
+                       const std::vector<ProcessInputFlag_T> &aFlags,
+                       const std::vector<BYTE> &aData,
+                       ULONG aTimeoutMS,
+                       ULONG *aWritten);
+    HRESULT terminate(void);
+    /** @}  */
 
     /**
Index: /trunk/src/VBox/Main/include/GuestSessionImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestSessionImpl.h	(revision 51320)
+++ /trunk/src/VBox/Main/include/GuestSessionImpl.h	(revision 51321)
@@ -1,3 +1,2 @@
-
 /* $Id$ */
 /** @file
@@ -259,5 +258,6 @@
 private:
 
-    // Wrapped GuestSession Properties
+    /** Wrapped @name IGuestSession properties.
+     * @{ */
     HRESULT getUser(com::Utf8Str &aUser);
     HRESULT getDomain(com::Utf8Str &aDomain);
@@ -274,6 +274,8 @@
     HRESULT getFiles(std::vector<ComPtr<IGuestFile> > &aFiles);
     HRESULT getEventSource(ComPtr<IEventSource> &aEventSource);
-
-    // Wrapped GuestSession Methods
+    /** @}  */
+
+    /** Wrapped @name IGuestSession methods.
+     * @{ */
     HRESULT close();
     HRESULT copyFrom(const com::Utf8Str &aSource,
@@ -377,5 +379,5 @@
                          ULONG aTimeoutMS,
                          GuestSessionWaitResult_T *aReason);
-
+    /** @}  */
 
     /** Map of guest directories. The key specifies the internal directory ID. */