diff --git a/DDEve/DDEve/DDEve.C b/DDEve/DDEve/DDEve.C
index 9acec4cc1cd2c9b4aa4be5c1dc4492350ac9f658..2a30eb1844eb1a4677450f33e7c07083f14e02d3 100644
--- a/DDEve/DDEve/DDEve.C
+++ b/DDEve/DDEve/DDEve.C
@@ -12,8 +12,11 @@
 //
 //==========================================================================
 
+// C/C++ include files
 #include <string>
 #include <cerrno>
+
+// ROOT include files
 #include "TError.h"
 #include "TSystem.h"
 
diff --git a/DDEve/DDEve/DDG4IO.C b/DDEve/DDEve/DDG4IO.C
index fbed3af2a5ccbb65d8196161c1dcf63b25676da2..fb90825fc0b5c67845f201b5a354d6bdebc34755 100644
--- a/DDEve/DDEve/DDG4IO.C
+++ b/DDEve/DDEve/DDG4IO.C
@@ -25,7 +25,11 @@ namespace DD4hep { namespace Simulation {
     typedef Geant4HitData SimpleHit;
   }}
 #else
+
+// C/C++ include files
 #include <typeinfo>
+
+// ROOT include files
 #include "TROOT.h"
 #include "TClass.h"
 
diff --git a/DDG4/examples/TEve.C b/DDG4/examples/TEve.C
index db561507917243dfcfb837894c19c2e17759a105..af45add8c50803ac1936e3d0fd5a4e6773d9e298 100644
--- a/DDG4/examples/TEve.C
+++ b/DDG4/examples/TEve.C
@@ -10,6 +10,8 @@
 //
 //====================================================================
 #include "DD4hep/LCDD.h"
+
+// ROOT include files
 #include "TGeoManager.h"
 #include "TEveGeoNode.h"
 #include "TGLViewer.h"
diff --git a/DDG4/examples/initAClick.C b/DDG4/examples/initAClick.C
index 80e4f30d893b24aef293a6ed1df7b77b55eb8b5e..78afdea0e2966bed6b182561c3b747304bd60c28 100644
--- a/DDG4/examples/initAClick.C
+++ b/DDG4/examples/initAClick.C
@@ -1,6 +1,23 @@
+// $Id: $
+//==========================================================================
+//  AIDA Detector description implementation for LCD
+//--------------------------------------------------------------------------
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
+// All rights reserved.
+//
+// For the licensing terms see $DD4hepINSTALL/LICENSE.
+// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
+//
+// Author     : M.Frank
+//
+//==========================================================================
+
+// ROOT include files
 #include "TInterpreter.h"
 #include "TSystem.h"
 #include "RVersion.h"
+
+// C/C++ include files
 #include <iostream>
 #include <string>
 
@@ -14,6 +31,7 @@ string make_str(const char* data)  {
   return string(data);
 }
 
+/// Process a single command in the ROOT interpreter
 int processCommand(const char* command, bool end_process)   {
   int status;
   // Disabling auto-parse is a hack required by a bug in ROOT
@@ -27,6 +45,7 @@ int processCommand(const char* command, bool end_process)   {
   return status;
 }
 
+/// Process a ROOT AClick given a file
 int processMacro(const char* macro, bool end_process)   {
   int status;
   string cmd = ".X ";
@@ -35,6 +54,7 @@ int processMacro(const char* macro, bool end_process)   {
   return processCommand(cmd.c_str(), end_process);
 }
 
+/// Initialize the ROOT environment to compile and execute a ROOT AClick
 int initAClick(const char* command=0)  {
   string rootsys = make_str(gSystem->Getenv("ROOTSYS"));
   string g4_base = make_str(gSystem->Getenv("G4INSTALL"));
diff --git a/DDG4/examples/run.C b/DDG4/examples/run.C
index 763b4ac86c122c93c49a7ef83317c435d9b746b1..0e1fc31c6cdef44ba53db4667c292d018333dc61 100644
--- a/DDG4/examples/run.C
+++ b/DDG4/examples/run.C
@@ -1,5 +1,24 @@
+// $Id: $
+//==========================================================================
+//  AIDA Detector description implementation for LCD
+//--------------------------------------------------------------------------
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
+// All rights reserved.
+//
+// For the licensing terms see $DD4hepINSTALL/LICENSE.
+// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
+//
+// Author     : M.Frank
+//
+//==========================================================================
+
+// ROOT include files
 #include "TInterpreter.h"
+
+// C/C++ include files
 #include <string>
+
+// Run a ROOT macro
 void run(const char* macro)  {
   char cmd[1024];
   const char* dd4hep_install = getenv("DD4hepINSTALL");