Index: /trunk/src/VBox/Main/include/DisplayImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/DisplayImpl.h	(revision 67913)
+++ /trunk/src/VBox/Main/include/DisplayImpl.h	(revision 67914)
@@ -589,4 +589,4 @@
 };
 
-#endif // ____H_DISPLAYIMPL
+#endif // !____H_DISPLAYIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */
Index: /trunk/src/VBox/Main/include/HGCMObjects.h
===================================================================
--- /trunk/src/VBox/Main/include/HGCMObjects.h	(revision 67913)
+++ /trunk/src/VBox/Main/include/HGCMObjects.h	(revision 67914)
@@ -1,5 +1,4 @@
 /* $Id$ */
 /** @file
- *
  * HGCMObjects - Host-Guest Communication Manager objects header.
  */
@@ -17,9 +16,6 @@
  */
 
-#ifndef __HGCMOBJECTS__H
-#define __HGCMOBJECTS__H
-
-#define LOG_GROUP_MAIN_OVERRIDE LOG_GROUP_HGCM
-#include "Logging.h"
+#ifndef ___HGCMOBJECTS__H
+#define ___HGCMOBJECTS__H
 
 #include <iprt/assert.h>
@@ -115,3 +111,3 @@
 void     hgcmObjSetHandleCount(uint32_t u32HandleCount);
 
-#endif /* __HGCMOBJECTS__H */
+#endif /* !___HGCMOBJECTS__H */
Index: /trunk/src/VBox/Main/src-client/AdditionsFacilityImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/AdditionsFacilityImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/AdditionsFacilityImpl.cpp	(revision 67914)
@@ -17,9 +17,12 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_ADDITIONSFACILITY
+#include "LoggingNew.h"
+
 #include "AdditionsFacilityImpl.h"
 #include "Global.h"
 
 #include "AutoCaller.h"
-#include "Logging.h"
+
 
 /* static */
Index: /trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp	(revision 67914)
@@ -1,6 +1,4 @@
 /* $Id$ */
-
 /** @file
- *
  * VirtualBox bus slots assignment manager
  */
@@ -17,4 +15,8 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
+#define LOG_GROUP LOG_GROUP_MAIN
+#include "LoggingNew.h"
+
 #include "BusAssignmentManager.h"
 
Index: /trunk/src/VBox/Main/src-client/ClientTokenHolder.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ClientTokenHolder.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/ClientTokenHolder.cpp	(revision 67914)
@@ -16,4 +16,7 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
+#define LOG_GROUP LOG_GROUP_MAIN_SESSION
+#include "LoggingNew.h"
 
 #include <iprt/asm.h>
Index: /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 67914)
@@ -15,4 +15,7 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
+#define LOG_GROUP LOG_GROUP_MAIN_CONSOLE
+#include "LoggingNew.h"
 
 /** @todo Move the TAP mess back into the driver! */
@@ -78,5 +81,4 @@
 #include "VBoxEvents.h"
 #include "AutoCaller.h"
-#include "Logging.h"
 #include "ThreadTask.h"
 
Index: /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp	(revision 67914)
@@ -25,4 +25,6 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_MAIN_CONSOLE
+#include "LoggingNew.h"
 
 // VBoxNetCfg-win.h needs winsock2.h and thus MUST be included before any other
@@ -50,5 +52,4 @@
 
 #include "AutoCaller.h"
-#include "Logging.h"
 
 #include <iprt/base64.h>
Index: /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp	(revision 67914)
@@ -20,4 +20,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_MAIN_CONSOLE
+#include "LoggingNew.h"
+
 #include "ConsoleImpl.h"
 #include "Global.h"
@@ -25,5 +28,4 @@
 
 #include "AutoCaller.h"
-#include "Logging.h"
 #include "HashedPw.h"
 
Index: /trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp	(revision 67914)
@@ -15,4 +15,7 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
+#define LOG_GROUP LOG_GROUP_MAIN_CONSOLE
+#include "LoggingNew.h"
 
 #include "ConsoleVRDPServer.h"
@@ -35,5 +38,4 @@
 #include "Global.h"
 #include "AutoCaller.h"
-#include "Logging.h"
 
 #include <iprt/asm.h>
@@ -48,4 +50,5 @@
 #include <VBox/com/listeners.h>
 #include <VBox/HostServices/VBoxCrOpenGLSvc.h>
+
 
 class VRDPConsoleListener
Index: /trunk/src/VBox/Main/src-client/DisplayImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/DisplayImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/DisplayImpl.cpp	(revision 67914)
@@ -16,4 +16,7 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_DISPLAY
+#include "LoggingNew.h"
+
 #include "DisplayImpl.h"
 #include "DisplayUtils.h"
@@ -24,5 +27,4 @@
 
 #include "AutoCaller.h"
-#include "Logging.h"
 
 /* generated header */
Index: /trunk/src/VBox/Main/src-client/DisplayImplLegacy.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/DisplayImplLegacy.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/DisplayImplLegacy.cpp	(revision 67914)
@@ -1,5 +1,5 @@
 /* $Id$ */
 /** @file
- * VirtualBox IDisplay implementation
+ * VirtualBox IDisplay implementation, helpers for legacy GAs.
  *
  * Methods and helpers to support old guest additions 3.x or older.
@@ -19,10 +19,11 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_DISPLAY
+#include "LoggingNew.h"
+
 #include "DisplayImpl.h"
 #include "ConsoleImpl.h"
 #include "ConsoleVRDPServer.h"
 #include "VMMDev.h"
-
-#include "Logging.h"
 
 /* generated header */
Index: /trunk/src/VBox/Main/src-client/DisplaySourceBitmapImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/DisplaySourceBitmapImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/DisplaySourceBitmapImpl.cpp	(revision 67914)
@@ -1,5 +1,4 @@
 /* $Id$ */
 /** @file
- *
  * Bitmap of a guest screen implementation.
  */
@@ -17,6 +16,8 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_DISPLAYSOURCEBITMAP
+#include "LoggingNew.h"
+
 #include "DisplayImpl.h"
-#include "Logging.h"
 
 /*
Index: /trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp	(revision 67914)
@@ -21,4 +21,6 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
+#include "LoggingNew.h"
+
 #include <VBox/log.h>
 #include "DrvAudioVRDE.h"
Index: /trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp	(revision 67914)
@@ -34,5 +34,6 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
-#include <VBox/log.h>
+#include "LoggingNew.h"
+
 #include "DrvAudioVideoRec.h"
 #include "ConsoleImpl.h"
Index: /trunk/src/VBox/Main/src-client/EbmlWriter.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/EbmlWriter.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/EbmlWriter.cpp	(revision 67914)
@@ -16,4 +16,6 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_DISPLAY
+#include "LoggingNew.h"
 
 #include <list>
@@ -36,5 +38,4 @@
 #include "EbmlWriter.h"
 #include "EbmlMkvIDs.h"
-#include "Logging.h"
 
 
Index: /trunk/src/VBox/Main/src-client/EbmlWriter.h
===================================================================
--- /trunk/src/VBox/Main/src-client/EbmlWriter.h	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/EbmlWriter.h	(revision 67914)
@@ -145,3 +145,3 @@
 };
 
-#endif /* ____EBMLWRITER */
+#endif /* !____EBMLWRITER */
Index: /trunk/src/VBox/Main/src-client/EmulatedUSBImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/EmulatedUSBImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/EmulatedUSBImpl.cpp	(revision 67914)
@@ -1,5 +1,4 @@
 /* $Id$ */
 /** @file
- *
  * Emulated USB manager implementation.
  */
@@ -17,9 +16,9 @@
  */
 
-#define LOG_GROUP_MAIN_OVERRIDE LOG_GROUP_MAIN_EMULATEDUSB
+#define LOG_GROUP LOG_GROUP_MAIN_EMULATEDUSB
+#include "LoggingNew.h"
 
 #include "EmulatedUSBImpl.h"
 #include "ConsoleImpl.h"
-#include "Logging.h"
 
 #include <VBox/vmm/pdmusb.h>
Index: /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp	(revision 67914)
@@ -15,4 +15,7 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
+#define LOG_GROUP LOG_GROUP_GUEST_CONTROL
+#include "LoggingNew.h"
 
 #include "GuestImpl.h"
@@ -44,10 +47,4 @@
 
 #include <memory>
-
-#ifdef LOG_GROUP
- #undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_GUEST_CONTROL
-#include <VBox/log.h>
 
 
Index: /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp	(revision 67914)
@@ -20,4 +20,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_GUEST_CONTROL
+#include "LoggingNew.h"
+
 #ifndef VBOX_WITH_GUEST_CONTROL
 # error "VBOX_WITH_GUEST_CONTROL must defined in this file"
@@ -33,10 +36,4 @@
 # include <iprt/file.h>
 #endif /* DEBUG */
-
-#ifdef LOG_GROUP
- #undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_GUEST_CONTROL
-#include <VBox/log.h>
 
 
Index: /trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp	(revision 67914)
@@ -20,4 +20,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_GUEST_CONTROL //LOG_GROUP_MAIN_GUESTDIRECTORY
+#include "LoggingNew.h"
+
 #ifndef VBOX_WITH_GUEST_CONTROL
 # error "VBOX_WITH_GUEST_CONTROL must defined in this file"
@@ -31,10 +34,4 @@
 
 #include <VBox/com/array.h>
-
-#ifdef LOG_GROUP
- #undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_GUEST_CONTROL
-#include <VBox/log.h>
 
 
Index: /trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp	(revision 67914)
@@ -1,6 +1,5 @@
 /* $Id$ */
 /** @file
- * Private guest drag and drop code, used by GuestDnDTarget +
- * GuestDnDSource.
+ * Private guest drag and drop code, used by GuestDnDTarget + GuestDnDSource.
  */
 
@@ -17,4 +16,7 @@
  */
 
+#define LOG_GROUP LOG_GROUP_GUEST_DND
+#include "LoggingNew.h"
+
 #include "GuestImpl.h"
 #include "AutoCaller.h"
@@ -39,11 +41,5 @@
 # include <VBox/version.h>
 
-# ifdef LOG_GROUP
-#  undef LOG_GROUP
-# endif
-# define LOG_GROUP LOG_GROUP_GUEST_DND
-# include <VBox/log.h>
-
-/**
+/** @page pg_main_dnd  Dungeons & Dragons - Overview
  * Overview:
  *
Index: /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp	(revision 67914)
@@ -20,4 +20,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_GUEST_DND //LOG_GROUP_MAIN_GUESTDNDSOURCE
+#include "LoggingNew.h"
+
 #include "GuestImpl.h"
 #include "GuestDnDSourceImpl.h"
@@ -39,9 +42,4 @@
 #include <VBox/com/array.h>
 
-#ifdef LOG_GROUP
- #undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_GUEST_DND
-#include <VBox/log.h>
 
 /**
Index: /trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp	(revision 67914)
@@ -20,4 +20,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_GUEST_DND //LOG_GROUP_MAIN_GUESTDNDTARGET
+#include "LoggingNew.h"
+
 #include "GuestImpl.h"
 #include "GuestDnDTargetImpl.h"
@@ -41,10 +44,4 @@
 #include <VBox/GuestHost/DragAndDrop.h>
 #include <VBox/HostServices/Service.h>
-
-#ifdef LOG_GROUP
- #undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_GUEST_DND
-#include <VBox/log.h>
 
 
Index: /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp	(revision 67914)
@@ -20,4 +20,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_GUEST_CONTROL //LOG_GROUP_MAIN_GUESTFILE
+#include "LoggingNew.h"
+
 #ifndef VBOX_WITH_GUEST_CONTROL
 # error "VBOX_WITH_GUEST_CONTROL must defined in this file"
@@ -38,10 +41,4 @@
 #include <VBox/com/array.h>
 #include <VBox/com/listeners.h>
-
-#ifdef LOG_GROUP
- #undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_GUEST_CONTROL
-#include <VBox/log.h>
 
 
Index: /trunk/src/VBox/Main/src-client/GuestFsObjInfoImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestFsObjInfoImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestFsObjInfoImpl.cpp	(revision 67914)
@@ -20,4 +20,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_GUEST_CONTROL // LOG_GROUP_MAIN_GUESTFSOBJINFO
+#include "LoggingNew.h"
+
 #ifndef VBOX_WITH_GUEST_CONTROL
 # error "VBOX_WITH_GUEST_CONTROL must defined in this file"
@@ -31,9 +34,4 @@
 #include <VBox/com/array.h>
 
-#ifdef LOG_GROUP
- #undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_GUEST_CONTROL
-#include <VBox/log.h>
 
 
Index: /trunk/src/VBox/Main/src-client/GuestImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestImpl.cpp	(revision 67914)
@@ -16,4 +16,7 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_GUEST
+#include "LoggingNew.h"
+
 #include "GuestImpl.h"
 #ifdef VBOX_WITH_GUEST_CONTROL
@@ -29,5 +32,4 @@
 
 #include "AutoCaller.h"
-#include "Logging.h"
 #include "Performance.h"
 #include "VBoxEvents.h"
Index: /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp	(revision 67914)
@@ -29,4 +29,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_GUEST_CONTROL //LOG_GROUP_MAIN_GUESTPROCESS
+#include "LoggingNew.h"
+
 #ifndef VBOX_WITH_GUEST_CONTROL
 # error "VBOX_WITH_GUEST_CONTROL must defined in this file"
@@ -52,10 +55,4 @@
 
 #include <VBox/com/array.h>
-
-#ifdef LOG_GROUP
- #undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_GUEST_CONTROL
-#include <VBox/log.h>
 
 
Index: /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp	(revision 67914)
@@ -20,4 +20,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_GUEST_CONTROL //LOG_GROUP_MAIN_GUESTSESSION
+#include "LoggingNew.h"
+
 #include "GuestImpl.h"
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -44,10 +47,4 @@
 #include <VBox/com/listeners.h>
 #include <VBox/version.h>
-
-#ifdef LOG_GROUP
- #undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_GUEST_CONTROL
-#include <VBox/log.h>
 
 
Index: /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp	(revision 67914)
@@ -20,4 +20,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_GUEST_CONTROL //LOG_GROUP_MAIN_GUESTSESSION
+#include "LoggingNew.h"
+
 #include "GuestImpl.h"
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -37,10 +40,4 @@
 #include <iprt/file.h> /* For CopyTo/From. */
 #include <iprt/path.h>
-
-#ifdef LOG_GROUP
- #undef LOG_GROUP
-#endif
-#define LOG_GROUP LOG_GROUP_GUEST_CONTROL
-#include <VBox/log.h>
 
 
Index: /trunk/src/VBox/Main/src-client/HGCM.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/HGCM.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/HGCM.cpp	(revision 67914)
@@ -1,5 +1,4 @@
 /* $Id$ */
 /** @file
- *
  * HGCM (Host-Guest Communication Manager)
  */
@@ -17,6 +16,6 @@
  */
 
-#define LOG_GROUP_MAIN_OVERRIDE LOG_GROUP_HGCM
-#include "Logging.h"
+#define LOG_GROUP LOG_GROUP_HGCM
+#include "LoggingNew.h"
 
 #include "HGCM.h"
Index: /trunk/src/VBox/Main/src-client/HGCMObjects.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/HGCMObjects.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/HGCMObjects.cpp	(revision 67914)
@@ -16,6 +16,6 @@
  */
 
-#define LOG_GROUP_MAIN_OVERRIDE LOG_GROUP_HGCM
-#include "Logging.h"
+#define LOG_GROUP LOG_GROUP_HGCM
+#include "LoggingNew.h"
 
 #include "HGCMObjects.h"
Index: /trunk/src/VBox/Main/src-client/HGCMThread.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/HGCMThread.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/HGCMThread.cpp	(revision 67914)
@@ -16,6 +16,6 @@
  */
 
-#define LOG_GROUP_MAIN_OVERRIDE LOG_GROUP_HGCM
-#include "Logging.h"
+#define LOG_GROUP LOG_GROUP_HGCM
+#include "LoggingNew.h"
 
 #include "HGCMThread.h"
Index: /trunk/src/VBox/Main/src-client/KeyboardImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/KeyboardImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/KeyboardImpl.cpp	(revision 67914)
@@ -16,9 +16,11 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_KEYBOARD
+#include "LoggingNew.h"
+
 #include "KeyboardImpl.h"
 #include "ConsoleImpl.h"
 
 #include "AutoCaller.h"
-#include "Logging.h"
 
 #include <VBox/com/array.h>
Index: /trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp	(revision 67914)
@@ -20,4 +20,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_MAIN_MACHINEDEBUGGER
+#include "LoggingNew.h"
+
 #include "MachineDebuggerImpl.h"
 
@@ -26,5 +29,4 @@
 
 #include "AutoCaller.h"
-#include "Logging.h"
 
 #include <VBox/vmm/em.h>
Index: /trunk/src/VBox/Main/src-client/MouseImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/MouseImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/MouseImpl.cpp	(revision 67914)
@@ -16,4 +16,7 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_MOUSE
+#include "LoggingNew.h"
+
 #include <iprt/cpp/utils.h>
 
@@ -24,5 +27,4 @@
 
 #include "AutoCaller.h"
-#include "Logging.h"
 
 #include <VBox/vmm/pdmdrv.h>
Index: /trunk/src/VBox/Main/src-client/Nvram.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/Nvram.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/Nvram.cpp	(revision 67914)
@@ -20,4 +20,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_DEV_EFI
+#include "LoggingNew.h"
+
 #include "Nvram.h"
 #include "ConsoleImpl.h"
Index: /trunk/src/VBox/Main/src-client/PCIRawDevImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/PCIRawDevImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/PCIRawDevImpl.cpp	(revision 67914)
@@ -16,5 +16,7 @@
  */
 
-#include "Logging.h"
+#define LOG_GROUP LOG_GROUP_DEV_PCI_RAW
+#include "LoggingNew.h"
+
 #include "PCIRawDevImpl.h"
 #include "PCIDeviceAttachmentImpl.h"
Index: /trunk/src/VBox/Main/src-client/RemoteUSBBackend.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/RemoteUSBBackend.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/RemoteUSBBackend.cpp	(revision 67914)
@@ -17,4 +17,6 @@
 
 #define LOG_GROUP LOG_GROUP_USB_REMOTE
+#include "LoggingNew.h"
+
 #include "ConsoleImpl.h"
 #include "ConsoleVRDPServer.h"
Index: /trunk/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp	(revision 67914)
@@ -1,8 +1,5 @@
 /* $Id$ */
-
 /** @file
- *
- * VirtualBox IHostUSBDevice COM interface implementation
- * for remote (VRDP) USB devices
+ * VirtualBox IHostUSBDevice COM interface implementation for remote (VRDP) USB devices.
  */
 
@@ -19,8 +16,10 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_HOSTUSBDEVICE
+#include "LoggingNew.h"
+
 #include "RemoteUSBDeviceImpl.h"
 
 #include "AutoCaller.h"
-#include "Logging.h"
 
 #include <iprt/cpp/utils.h>
@@ -30,4 +29,5 @@
 #include <VBox/RemoteDesktop/VRDE.h>
 #include <VBox/vrdpusb.h>
+
 
 // constructor / destructor
Index: /trunk/src/VBox/Main/src-client/SessionImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/SessionImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/SessionImpl.cpp	(revision 67914)
@@ -16,4 +16,7 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_SESSION
+#include "LoggingNew.h"
+
 #include "SessionImpl.h"
 #include "ConsoleImpl.h"
@@ -22,8 +25,8 @@
 
 #include "AutoCaller.h"
-#include "Logging.h"
 
 #include <VBox/err.h>
 #include <iprt/process.h>
+
 
 /**
Index: /trunk/src/VBox/Main/src-client/USBDeviceImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/USBDeviceImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/USBDeviceImpl.cpp	(revision 67914)
@@ -16,10 +16,13 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_USBDEVICE
+#include "LoggingNew.h"
+
 #include "USBDeviceImpl.h"
 
 #include "AutoCaller.h"
-#include "Logging.h"
 
 #include <iprt/cpp/utils.h>
+
 
 // constructor / destructor
Index: /trunk/src/VBox/Main/src-client/UsbCardReader.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/UsbCardReader.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/UsbCardReader.cpp	(revision 67914)
@@ -21,4 +21,6 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_USB_CARDREADER
+#include "LoggingNew.h"
+
 #include "UsbCardReader.h"
 #include "ConsoleImpl.h"
Index: /trunk/src/VBox/Main/src-client/UsbWebcamInterface.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/UsbWebcamInterface.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/UsbWebcamInterface.cpp	(revision 67914)
@@ -18,4 +18,6 @@
 
 #define LOG_GROUP LOG_GROUP_USB_WEBCAM
+#include "LoggingNew.h"
+
 #include "UsbWebcamInterface.h"
 #include "ConsoleImpl.h"
Index: /trunk/src/VBox/Main/src-client/VBoxDriversRegister.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/VBoxDriversRegister.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/VBoxDriversRegister.cpp	(revision 67914)
@@ -21,4 +21,7 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_MAIN
+#include "LoggingNew.h"
+
 #include "MouseImpl.h"
 #include "KeyboardImpl.h"
@@ -41,8 +44,7 @@
 #endif
 
-#include "Logging.h"
-
 #include <VBox/vmm/pdmdrv.h>
 #include <VBox/version.h>
+
 
 /**
Index: /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/VMMDevInterface.cpp	(revision 67914)
@@ -16,4 +16,7 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_VMMDEVINTERFACES
+#include "LoggingNew.h"
+
 #include "VMMDev.h"
 #include "ConsoleImpl.h"
@@ -21,6 +24,4 @@
 #include "GuestImpl.h"
 #include "MouseImpl.h"
-
-#include "Logging.h"
 
 #include <VBox/vmm/pdmdrv.h>
Index: /trunk/src/VBox/Main/src-client/VideoRec.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/VideoRec.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/VideoRec.cpp	(revision 67914)
@@ -16,5 +16,6 @@
  */
 
-#define LOG_GROUP LOG_GROUP_MAIN
+#define LOG_GROUP LOG_GROUP_MAIN_DISPLAY
+#include "LoggingNew.h"
 
 #include <stdexcept>
Index: /trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp	(revision 67913)
+++ /trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp	(revision 67914)
@@ -16,9 +16,11 @@
  */
 
+#define LOG_GROUP LOG_GROUP_MAIN_VIRTUALBOXCLIENT
+#include "LoggingNew.h"
+
 #include "VirtualBoxClientImpl.h"
 
 #include "AutoCaller.h"
 #include "VBoxEvents.h"
-#include "Logging.h"
 #include "VBox/com/ErrorInfo.h"