diff --git a/examples/ClientTests/compact/Assemblies.xml b/examples/ClientTests/compact/Assemblies.xml
index 322901dcd86bc91f7a958f0b1ebbb6bc99de7b31..f50440d2dfa8bb59bb0431684dd89f13a1d0fb5e 100644
--- a/examples/ClientTests/compact/Assemblies.xml
+++ b/examples/ClientTests/compact/Assemblies.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
 <!-- #==========================================================================
      #  AIDA Detector description implementation 
diff --git a/examples/ClientTests/compact/Bitfield_SidesTest.xml b/examples/ClientTests/compact/Bitfield_SidesTest.xml
index d9a0881b07b7eaa2254a485e3542f072068966c4..de85c9fe21897a0190f352a0ee0134ddc551edad 100644
--- a/examples/ClientTests/compact/Bitfield_SidesTest.xml
+++ b/examples/ClientTests/compact/Bitfield_SidesTest.xml
@@ -2,7 +2,7 @@
 <lccdd>
 
 <!-- #==========================================================================
-     #  AIDA Detector description implementation 
+     #  AIDA Detector desciption implementation 
      #==========================================================================
      # Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
      # All rights reserved.
diff --git a/examples/ClientTests/compact/BoxTrafos.xml b/examples/ClientTests/compact/BoxTrafos.xml
index b74063966ec2ca0770ea4476b1b827d83c3d3b6c..163a673d0782df888b0c2c5c4dd5b1df9b51878f 100644
--- a/examples/ClientTests/compact/BoxTrafos.xml
+++ b/examples/ClientTests/compact/BoxTrafos.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
   
 <!-- #==========================================================================
diff --git a/examples/ClientTests/compact/CaloEndcapReflection.xml b/examples/ClientTests/compact/CaloEndcapReflection.xml
index 2ac37b678d1be4c2730ea8a73e2166589a25b5d4..e1a27dd90f6a7ec2f4f1a083978552cbfcd72c67 100644
--- a/examples/ClientTests/compact/CaloEndcapReflection.xml
+++ b/examples/ClientTests/compact/CaloEndcapReflection.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="clic_sid_cdr"
         title="CLIC Silicon Detector CDR"
diff --git a/examples/ClientTests/compact/CheckShape.xml b/examples/ClientTests/compact/CheckShape.xml
index 12a6d2db9d3d19df3e2ff157c2b6af99b7941db4..afeec1e11343289b75ac7565d06f4ea46b9c1e1f 100644
--- a/examples/ClientTests/compact/CheckShape.xml
+++ b/examples/ClientTests/compact/CheckShape.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
   
   <info name=   "ShapeCheck"
 	title=  "Checking individual shapes in D4hep by comparing the mesh vertices"
diff --git a/examples/ClientTests/compact/Check_Air.xml b/examples/ClientTests/compact/Check_Air.xml
index 1a32e3fe4460a96f015fea7bf09c632ff5c9e602..e394758d1caf0e19b7a1c7f533d9f32c3c5d0709 100644
--- a/examples/ClientTests/compact/Check_Air.xml
+++ b/examples/ClientTests/compact/Check_Air.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
   
   <info name=   "ShapeCheck"
 	title=  "Checking individual shapes in D4hep by comparing the mesh vertices"
diff --git a/examples/ClientTests/compact/Check_Air_NTP.xml b/examples/ClientTests/compact/Check_Air_NTP.xml
index 3c324f0fd177935baaa666e57d339f176413466e..5aa5f0d798e8cd628c33ed6d3f4a5194fbbae933 100644
--- a/examples/ClientTests/compact/Check_Air_NTP.xml
+++ b/examples/ClientTests/compact/Check_Air_NTP.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
   
   <info name=   "ShapeCheck"
 	title=  "Checking individual shapes in D4hep by comparing the mesh vertices"
diff --git a/examples/ClientTests/compact/Check_Air_STP.xml b/examples/ClientTests/compact/Check_Air_STP.xml
index df04fd9880626f293266ede6743c4f8dceaf601b..dde52d82805420cf182828938f2a76009a5fced6 100644
--- a/examples/ClientTests/compact/Check_Air_STP.xml
+++ b/examples/ClientTests/compact/Check_Air_STP.xml
@@ -1,5 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
-  
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <info name=   "ShapeCheck"
 	title=  "Checking individual shapes in D4hep by comparing the mesh vertices"
 	author= "Markus Frank"
diff --git a/examples/ClientTests/compact/Check_Shape_Box.xml b/examples/ClientTests/compact/Check_Shape_Box.xml
index 0d85e779001430d1ca4fef84ecbedc534904e763..b1bef04f23041464b3a2f15333e450e7519b7521 100644
--- a/examples/ClientTests/compact/Check_Shape_Box.xml
+++ b/examples/ClientTests/compact/Check_Shape_Box.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Box_Reflect_DetElement.xml b/examples/ClientTests/compact/Check_Shape_Box_Reflect_DetElement.xml
index 7c60ec4edc3e78e28bb4ee32fbd1f6e54664df16..93072f41158e579e27a66059ec0ce7ff78be7151 100644
--- a/examples/ClientTests/compact/Check_Shape_Box_Reflect_DetElement.xml
+++ b/examples/ClientTests/compact/Check_Shape_Box_Reflect_DetElement.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Cone.xml b/examples/ClientTests/compact/Check_Shape_Cone.xml
index cb00f7672ee1bd8b28fe4417b0e5d046fdc323e9..da1f3d01421f69a0b74396cb6078392f1d3b17be 100644
--- a/examples/ClientTests/compact/Check_Shape_Cone.xml
+++ b/examples/ClientTests/compact/Check_Shape_Cone.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_ConeSegment.xml b/examples/ClientTests/compact/Check_Shape_ConeSegment.xml
index bcb0edda4ea813b6b5f344e0cc63d7d4fa9758e6..7f9061673e2116cfe1f6bdddf2a60101f5b2f9fe 100644
--- a/examples/ClientTests/compact/Check_Shape_ConeSegment.xml
+++ b/examples/ClientTests/compact/Check_Shape_ConeSegment.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_CutTube.xml b/examples/ClientTests/compact/Check_Shape_CutTube.xml
index cd899a1d9e3c001794ab1f029aaf238d788c6d5c..b6abfc959d8b8d5fe88ddc3a4b6f128fc4d21c22 100644
--- a/examples/ClientTests/compact/Check_Shape_CutTube.xml
+++ b/examples/ClientTests/compact/Check_Shape_CutTube.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_EightPointSolid.xml b/examples/ClientTests/compact/Check_Shape_EightPointSolid.xml
index 389ebe44cae49b161859f99465530ed61986c111..3416f93df23706d294777458808c490bf39488b1 100644
--- a/examples/ClientTests/compact/Check_Shape_EightPointSolid.xml
+++ b/examples/ClientTests/compact/Check_Shape_EightPointSolid.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_DetElement.xml b/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_DetElement.xml
index f57e381206d4daa9e4a86c38bb2a050446aa400e..09d4b94cb7f54e1def686c37c255c1d7ff7f74e5 100644
--- a/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_DetElement.xml
+++ b/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_DetElement.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_Volume.xml b/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_Volume.xml
index bce121beed421361a0a656c2a0671c3eab205cd1..f7b7c9351382c76e751ea6888fc1d520c45142c7 100644
--- a/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_Volume.xml
+++ b/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_Volume.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_Z.xml b/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_Z.xml
index fbb097688c2e3abbe4a2e852780322639f87e059..ca519744bebbef775fceec80515ee87e46ce629f 100644
--- a/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_Z.xml
+++ b/examples/ClientTests/compact/Check_Shape_Eightpoint_Reflect_Z.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_ElTube.xml b/examples/ClientTests/compact/Check_Shape_ElTube.xml
index e6a0e6945088f5acb4ede2170bbd6d57d9564ff8..8e9cc3c4226933ab26c48e5ff0ba34ff1237b6f5 100644
--- a/examples/ClientTests/compact/Check_Shape_ElTube.xml
+++ b/examples/ClientTests/compact/Check_Shape_ElTube.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_ExtrudedPolygon.xml b/examples/ClientTests/compact/Check_Shape_ExtrudedPolygon.xml
index f098c1f95dbc000e9325568058a9279b3873f29d..c94eb802aca494d708124f1ae1131c599f09b37d 100644
--- a/examples/ClientTests/compact/Check_Shape_ExtrudedPolygon.xml
+++ b/examples/ClientTests/compact/Check_Shape_ExtrudedPolygon.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Hyperboloid.xml b/examples/ClientTests/compact/Check_Shape_Hyperboloid.xml
index babcd27ab37feb0b3e84e097f4685ca8515bec55..8882b0e86ea206b3a2630fea1482c260d78c7205 100644
--- a/examples/ClientTests/compact/Check_Shape_Hyperboloid.xml
+++ b/examples/ClientTests/compact/Check_Shape_Hyperboloid.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Paraboloid.xml b/examples/ClientTests/compact/Check_Shape_Paraboloid.xml
index c4d7a06af7c44df76e2b3554c2a5191529dd7d32..930e89ef39c54eb90f560b50e6c7368c569e38dd 100644
--- a/examples/ClientTests/compact/Check_Shape_Paraboloid.xml
+++ b/examples/ClientTests/compact/Check_Shape_Paraboloid.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Polycone.xml b/examples/ClientTests/compact/Check_Shape_Polycone.xml
index 21d61cc0a1712c4cf5529a9ddf6c4ed9ccab34dc..d1306f7e0e77cca440c7d965521b0aa2fc8e6b18 100644
--- a/examples/ClientTests/compact/Check_Shape_Polycone.xml
+++ b/examples/ClientTests/compact/Check_Shape_Polycone.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Polyhedra.xml b/examples/ClientTests/compact/Check_Shape_Polyhedra.xml
index cfa0079c7d860f849a87d751c1f361c518143aa7..d8ff0ffc0e7c86ca417f9c69dea6294311001c94 100644
--- a/examples/ClientTests/compact/Check_Shape_Polyhedra.xml
+++ b/examples/ClientTests/compact/Check_Shape_Polyhedra.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml b/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml
index e9e011f98613d921ab9975c37d9ce64e01645854..2efbd110517c703e07a3c4dcba25f440d8644b10 100644
--- a/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml
+++ b/examples/ClientTests/compact/Check_Shape_PseudoTrap.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_PseudoTrap2.xml b/examples/ClientTests/compact/Check_Shape_PseudoTrap2.xml
index dbe2fcecac276bb1634ca23bf637e3105cfd183c..9d742586f645a755d8e657022de2347da36ce0ff 100644
--- a/examples/ClientTests/compact/Check_Shape_PseudoTrap2.xml
+++ b/examples/ClientTests/compact/Check_Shape_PseudoTrap2.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_PseudoTrap3.xml b/examples/ClientTests/compact/Check_Shape_PseudoTrap3.xml
index 67646b615b9a422bef5de15a551a3add8a0228be..c29386325f20b4ad98790eb6effea5f4a09c1914 100644
--- a/examples/ClientTests/compact/Check_Shape_PseudoTrap3.xml
+++ b/examples/ClientTests/compact/Check_Shape_PseudoTrap3.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <define>
     <constant name="CheckShape_create1" value="1"/>
   </define>
diff --git a/examples/ClientTests/compact/Check_Shape_Sphere.xml b/examples/ClientTests/compact/Check_Shape_Sphere.xml
index 78c5ed8c8d4d652e7710c1607ebd97f201d72896..59eed9848452b4e1717475836f30c67d6e7b1d8e 100644
--- a/examples/ClientTests/compact/Check_Shape_Sphere.xml
+++ b/examples/ClientTests/compact/Check_Shape_Sphere.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Tessellated.xml b/examples/ClientTests/compact/Check_Shape_Tessellated.xml
index 0ac4940407f7b31b589597f4a1ccae213b451207..d219e6f6363166d57f45010879cfef7c8c034683 100644
--- a/examples/ClientTests/compact/Check_Shape_Tessellated.xml
+++ b/examples/ClientTests/compact/Check_Shape_Tessellated.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Torus.xml b/examples/ClientTests/compact/Check_Shape_Torus.xml
index afb14cf7ff771c2cb35a3f5465fc282dbc8da462..dd2ee12f99b0a17cabaffdb49a2917212a15d533 100644
--- a/examples/ClientTests/compact/Check_Shape_Torus.xml
+++ b/examples/ClientTests/compact/Check_Shape_Torus.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Trap.xml b/examples/ClientTests/compact/Check_Shape_Trap.xml
index 779779cfd5381f25378138ff9207cfa928cf1552..90d70e5a44fc69f005073794a516fb76016500c3 100644
--- a/examples/ClientTests/compact/Check_Shape_Trap.xml
+++ b/examples/ClientTests/compact/Check_Shape_Trap.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Trapezoid.xml b/examples/ClientTests/compact/Check_Shape_Trapezoid.xml
index c2f6b751ea1b6fd818d9f213123fb88d1fb4f626..06e19dfd5dcf6bfb1e7322fe6849ba4a516697eb 100644
--- a/examples/ClientTests/compact/Check_Shape_Trapezoid.xml
+++ b/examples/ClientTests/compact/Check_Shape_Trapezoid.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Trd1.xml b/examples/ClientTests/compact/Check_Shape_Trd1.xml
index a0174cba4c8a57d4a35f51b4f4c86a267beb8607..06b126fce2f6c80fb2fa57e12a928b69ef86af15 100644
--- a/examples/ClientTests/compact/Check_Shape_Trd1.xml
+++ b/examples/ClientTests/compact/Check_Shape_Trd1.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Trd2.xml b/examples/ClientTests/compact/Check_Shape_Trd2.xml
index be5f9998371abf2ae42f93ff72e091e7b30ddb3c..fb939718d7833c8702efa4df56334dd10d8b9927 100644
--- a/examples/ClientTests/compact/Check_Shape_Trd2.xml
+++ b/examples/ClientTests/compact/Check_Shape_Trd2.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml b/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml
index 362b5c049f811deb756794beebf965d81d74e0d7..4cd165ed3209096659fe9bee0132ee19703d65d6 100644
--- a/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml
+++ b/examples/ClientTests/compact/Check_Shape_TruncatedTube.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_Tube.xml b/examples/ClientTests/compact/Check_Shape_Tube.xml
index 25375097854c3bb2b3b65c1f611ca68f08b50a76..bd2c882c3903089e155f84ec57329f12beb879dc 100644
--- a/examples/ClientTests/compact/Check_Shape_Tube.xml
+++ b/examples/ClientTests/compact/Check_Shape_Tube.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_TubeDivision.xml b/examples/ClientTests/compact/Check_Shape_TubeDivision.xml
index 551f0cc6a07de17f16f3ffce443d7721f895565c..448c636a12fa176f7e885c4d2206d19890ffca1a 100644
--- a/examples/ClientTests/compact/Check_Shape_TubeDivision.xml
+++ b/examples/ClientTests/compact/Check_Shape_TubeDivision.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/Check_Shape_TwistedTube.xml b/examples/ClientTests/compact/Check_Shape_TwistedTube.xml
index dfb01c435f93426f9cb023d46befa9ce091e590c..8deb3b27ca9c8da18246ebac64a0f099acab7bd3 100644
--- a/examples/ClientTests/compact/Check_Shape_TwistedTube.xml
+++ b/examples/ClientTests/compact/Check_Shape_TwistedTube.xml
@@ -1,4 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <includes>
     <gdmlFile ref="CheckShape.xml"/>
   </includes>
diff --git a/examples/ClientTests/compact/DuplicateSysID.xml b/examples/ClientTests/compact/DuplicateSysID.xml
index 3874f949622ee6fb30cb642c4a96a8bc46d162c4..18a63a94ad191bff05ed3aa6ade5ac9c04392776 100644
--- a/examples/ClientTests/compact/DuplicateSysID.xml
+++ b/examples/ClientTests/compact/DuplicateSysID.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
   
   <info name="alignment_boxes"
 	title="Alignment test with 2 simple boxes"
diff --git a/examples/ClientTests/compact/FCC_HcalBarrel.xml b/examples/ClientTests/compact/FCC_HcalBarrel.xml
index b49ff65575f5bab9bf9df61af9d9713a1065f7a4..d8ce0e2ad1f995b9c3784b736e2a56687bf5a89a 100644
--- a/examples/ClientTests/compact/FCC_HcalBarrel.xml
+++ b/examples/ClientTests/compact/FCC_HcalBarrel.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
     <includes>
         <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
diff --git a/examples/ClientTests/compact/GdmlDetector.xml b/examples/ClientTests/compact/GdmlDetector.xml
index a595e59809da5dceb38a0af0050741041ede9acb..c1cd8b1e276f6926fa69a36024eaf6f17f1f381c 100644
--- a/examples/ClientTests/compact/GdmlDetector.xml
+++ b/examples/ClientTests/compact/GdmlDetector.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <includes>
     <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
diff --git a/examples/ClientTests/compact/InhibitConstants.xml b/examples/ClientTests/compact/InhibitConstants.xml
index 4f7b88b5ded27d2ae942885e2c1576e1d5b284ff..43320cd2251578209e18d4499e42409d1d2db0fb 100644
--- a/examples/ClientTests/compact/InhibitConstants.xml
+++ b/examples/ClientTests/compact/InhibitConstants.xml
@@ -1,5 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <define>
     <constant name="Detector_InhibitConstants" value="1"/>;
diff --git a/examples/ClientTests/compact/IronCylinder.xml b/examples/ClientTests/compact/IronCylinder.xml
index 66040629373dfb22d07ff899c1013ba3b671d43f..9c3bad059016d28bbdb4a9af9caf763a374f95e4 100644
--- a/examples/ClientTests/compact/IronCylinder.xml
+++ b/examples/ClientTests/compact/IronCylinder.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <includes>
     <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
diff --git a/examples/ClientTests/compact/LheD_tracker.xml b/examples/ClientTests/compact/LheD_tracker.xml
index fcd399041c7d0dfbe5dfaeb8d188de72419d42e2..71cb64dea0af78a1a3ab611526f7cd59363b0db6 100644
--- a/examples/ClientTests/compact/LheD_tracker.xml
+++ b/examples/ClientTests/compact/LheD_tracker.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="LHeD_cdr"
         title="LHe Detector - based on CLIC Silicon Detector CDR"
diff --git a/examples/ClientTests/compact/MT.xml b/examples/ClientTests/compact/MT.xml
index 1c0b9a606eba5bbcbfef53b921238411c1f730f5..b506713308619f4cd313ec796079bd3f6fda0dfb 100644
--- a/examples/ClientTests/compact/MT.xml
+++ b/examples/ClientTests/compact/MT.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <includes>
     <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
diff --git a/examples/ClientTests/compact/MagnetFields.xml b/examples/ClientTests/compact/MagnetFields.xml
index db55719d60f74411efae81408af5f805af3176f3..3c998eab93206e561f936e2a84c5def3b34fd785 100644
--- a/examples/ClientTests/compact/MagnetFields.xml
+++ b/examples/ClientTests/compact/MagnetFields.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="clic_sid_cdr"
         title="CLIC Silicon Detector CDR"
diff --git a/examples/ClientTests/compact/MaterialTester.xml b/examples/ClientTests/compact/MaterialTester.xml
index 4f04ea559289093ede605546527aac91e87909b5..ad44db927693a0a6d4164695256685a23a36f770 100644
--- a/examples/ClientTests/compact/MaterialTester.xml
+++ b/examples/ClientTests/compact/MaterialTester.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <define>
     <constant name="world_size" value="30*m"/>
diff --git a/examples/ClientTests/compact/MiniTel.xml b/examples/ClientTests/compact/MiniTel.xml
index f97ab7668dfef3d43793d72431f33189a43d7167..fef30f56688c525c40f8ac3ed3d55575a3dc1931 100644
--- a/examples/ClientTests/compact/MiniTel.xml
+++ b/examples/ClientTests/compact/MiniTel.xml
@@ -1,5 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="Sensor"
 	title="Sensor for New experiment"
diff --git a/examples/ClientTests/compact/MiniTel_json.xml b/examples/ClientTests/compact/MiniTel_json.xml
index a599063502e6263b51e7d7335aeff1ca779024d2..3ccdcc5c0e8334dd23c0c5dc388d5e4f301e1d4f 100644
--- a/examples/ClientTests/compact/MiniTel_json.xml
+++ b/examples/ClientTests/compact/MiniTel_json.xml
@@ -1,5 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="Sensor"
 	title="Sensor for New experiment"
diff --git a/examples/ClientTests/compact/MultiCollections.xml b/examples/ClientTests/compact/MultiCollections.xml
index 4ca447f56ad81aa6438d268131ee7c9ce3248746..6ab985ef7aac95cc187d715ff8dec9dcb16132e2 100644
--- a/examples/ClientTests/compact/MultiCollections.xml
+++ b/examples/ClientTests/compact/MultiCollections.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="Nested_Detectors_test"
         title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/MultiSegmentCollections.xml b/examples/ClientTests/compact/MultiSegmentCollections.xml
index af78497781f3bdf4c8fdd93e818ba86d98d9f30b..185396c5cede288c2eff812575c31fbdffbefa74 100644
--- a/examples/ClientTests/compact/MultiSegmentCollections.xml
+++ b/examples/ClientTests/compact/MultiSegmentCollections.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="Nested_Detectors_test"
         title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/MultiSegmentations.xml b/examples/ClientTests/compact/MultiSegmentations.xml
index d6e11bdde19e98d16077ce758cf9645a96bdac86..042e02e87285c441a2e9390d5138f9ca81084888 100644
--- a/examples/ClientTests/compact/MultiSegmentations.xml
+++ b/examples/ClientTests/compact/MultiSegmentations.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="Nested_Detectors_test"
         title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/NamespaceConstants.xml b/examples/ClientTests/compact/NamespaceConstants.xml
index 9a05242e018c8caff88f4e7f1014a26602d90dfd..086f5ae8359ba4fe3be45d7c1aa957266bfe94e9 100644
--- a/examples/ClientTests/compact/NamespaceConstants.xml
+++ b/examples/ClientTests/compact/NamespaceConstants.xml
@@ -1,5 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <define>
     <constant name="world_side"             value="2*m"/>
diff --git a/examples/ClientTests/compact/NestedBoxReflection.xml b/examples/ClientTests/compact/NestedBoxReflection.xml
index f722a62bccca182ea760d34d6e89811bc5c2ba13..ca4db5eaf1ea1d48298d9a8cf93d4b06ed49706b 100644
--- a/examples/ClientTests/compact/NestedBoxReflection.xml
+++ b/examples/ClientTests/compact/NestedBoxReflection.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <includes>
     <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
diff --git a/examples/ClientTests/compact/NestedDetectors.xml b/examples/ClientTests/compact/NestedDetectors.xml
index 8c1a03d1f8a855f47f5bc85377f18687140f9b2b..1c12a956f7782ac48a40ffdfb635f282e4c026a3 100644
--- a/examples/ClientTests/compact/NestedDetectors.xml
+++ b/examples/ClientTests/compact/NestedDetectors.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="Nested_Detectors_test"
         title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/NestedSimple.xml b/examples/ClientTests/compact/NestedSimple.xml
index 8f56ca742f6facd59dfa7adf8e190b85bc0da728..93aea049421920b217ef49c60bce168de978d7b6 100644
--- a/examples/ClientTests/compact/NestedSimple.xml
+++ b/examples/ClientTests/compact/NestedSimple.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="Nested_Detectors_test"
         title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/NestedSolenoid.xml b/examples/ClientTests/compact/NestedSolenoid.xml
index d79333629d511b6291d6e6be8038ec554df87868..b45eb29c9f228679ae5dc8e8dbac70dc7124ba5b 100644
--- a/examples/ClientTests/compact/NestedSolenoid.xml
+++ b/examples/ClientTests/compact/NestedSolenoid.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <display>
     <vis name="VIS1" alpha="1" r="0"    g="0.3"  b="0.3" showDaughters="true" visible="true"/>
diff --git a/examples/ClientTests/compact/ReflectionMatrices.xml b/examples/ClientTests/compact/ReflectionMatrices.xml
index f0bb6ce677f2c164108b56dc2f853b31f13a42cb..2f66785fffbf29309a7776ef48de2fcaf15c294c 100644
--- a/examples/ClientTests/compact/ReflectionMatrices.xml
+++ b/examples/ClientTests/compact/ReflectionMatrices.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <includes>
     <gdmlFile  ref="${DD4hepINSTALL}/DDDetectors/compact/elements.xml"/>
diff --git a/examples/ClientTests/compact/SectorBarrelCalorimeter.xml b/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
index a39e530b23f7e4a4225d57b8d3b51ad744df0923..1bce28e24791437367f4604043b45afd950b7970 100644
--- a/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
+++ b/examples/ClientTests/compact/SectorBarrelCalorimeter.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="clic_sid_cdr"
         title="CLIC Silicon Detector CDR"
diff --git a/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml b/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml
index 781035c6fa889e0d36b28739cb83963d7d4aff61..fec7bc7d87280c7d78261b678abc6dfee56cfb3d 100644
--- a/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml
+++ b/examples/ClientTests/compact/SiBarrelMultiSensitiveDetector.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="Nested_Detectors_test"
         title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml b/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml
index 645ec5e0e6040c4d495d92d4274ddd843e8d3404..bf04371e81385ab63c60031b9aaf83563db1bdf7 100644
--- a/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml
+++ b/examples/ClientTests/compact/SiBarrelMultiSensitiveLongVolID.xml
@@ -1,4 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
 
   <info name="Nested_Detectors_test"
         title="Test for nested detector descriptions"
diff --git a/examples/ClientTests/compact/SiliconBlock.xml b/examples/ClientTests/compact/SiliconBlock.xml
index b6635d021e3c9331e31e287f8a8f88e5dc31f66d..d8f86668b97673a301292698415d0bff56531eb8 100644
--- a/examples/ClientTests/compact/SiliconBlock.xml
+++ b/examples/ClientTests/compact/SiliconBlock.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
  
   <info name="SiliconBlock"
 	title="Test with 2 simple silicon boxes"
diff --git a/examples/ClientTests/compact/TrackingRegion.xml b/examples/ClientTests/compact/TrackingRegion.xml
index e6bb54ce0649b75cc23bb6940aec7f8c1938105e..c8716f1d2698b11d69699a6dd57528abbc296fa4 100644
--- a/examples/ClientTests/compact/TrackingRegion.xml
+++ b/examples/ClientTests/compact/TrackingRegion.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
  
   <info name="SiliconBlock"
 	title="Test with 2 simple silicon boxes"
diff --git a/examples/ClientTests/compact/VolumeDivisionTest.xml b/examples/ClientTests/compact/VolumeDivisionTest.xml
index b6e5805b761fe16b1723520722a453cd7e062d91..c6f8a99895dc5bddf6be3e6635d414b436a56523 100644
--- a/examples/ClientTests/compact/VolumeDivisionTest.xml
+++ b/examples/ClientTests/compact/VolumeDivisionTest.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
+
   <define>
     <constant name="world_size" value="30*m"/>
     <constant name="world_x" value="world_size"/>
diff --git a/examples/ClientTests/compact/WorldVolume.xml b/examples/ClientTests/compact/WorldVolume.xml
index 698b0e2da6dbb2ad43d615c4642d7a60ccad6602..ee9c4d3626ed2acf1c1ad613185a8bcc139c8a8d 100644
--- a/examples/ClientTests/compact/WorldVolume.xml
+++ b/examples/ClientTests/compact/WorldVolume.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
+<!-- #==========================================================================
+     #  AIDA Detector description implementation 
+     #==========================================================================
+     # 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.
+     #
+     #==========================================================================
+-->
  
   <info name="SiliconBlock"
 	title="Test with 2 simple silicon boxes"