diff --git a/DDAlign/src/plugins/AlignmentParser.cpp b/DDAlign/src/plugins/AlignmentParser.cpp
index ae840d820a1c4c0a687ecd694a7feb26ecd870e2..1d4939fcc8fd3be618fb4b8fc356cd58e738cf4f 100644
--- a/DDAlign/src/plugins/AlignmentParser.cpp
+++ b/DDAlign/src/plugins/AlignmentParser.cpp
@@ -344,7 +344,7 @@ static long setup_Alignment(lcdd_t& lcdd, const xml_h& e) {
   bool open_trans = e.hasChild(_ALU(close_transaction));
   bool close_trans = e.hasChild(_ALU(close_transaction));
 
-  GlobalAlignmentCache::install(lcdd);
+  GlobalAlignmentCache* cache = GlobalAlignmentCache::install(lcdd);
   /// Check if transaction already present. If not, open, else issue an error
   if ( open_trans )   {
     if ( AlignmentStack::exists() )  {
@@ -355,7 +355,6 @@ static long setup_Alignment(lcdd_t& lcdd, const xml_h& e) {
   AlignmentStack& stack = AlignmentStack::get();
   (DD4hep::Converter<DD4hep::alignment>(lcdd,lcdd.world().ptr(),&stack))(e);
   if ( close_trans )  {
-    GlobalAlignmentCache* cache = lcdd.extension<Alignments::GlobalAlignmentCache>();
     cache->commit(stack);
     AlignmentStack::get().release();
   }
diff --git a/DDCore/include/DD4hep/ComponentProperties.h b/DDCore/include/DD4hep/ComponentProperties.h
index e757b3519666b6be6627ecb47c765688b45fb4d4..bef20e83c0dace45793d734e4797ccff1926e270 100644
--- a/DDCore/include/DD4hep/ComponentProperties.h
+++ b/DDCore/include/DD4hep/ComponentProperties.h
@@ -16,8 +16,8 @@
 #define DD4HEP_DDG4_COMPONENTPROPERTIES_H
 
 // Framework include files
-#include "DD4hep/Primitives.h"
-#include "DD4hep/Exceptions.h"
+//#include "DD4hep/Primitives.h"
+//#include "DD4hep/Exceptions.h"
 
 // C/C++ include files
 #include <algorithm>
diff --git a/DDCore/include/DD4hep/Handle.h b/DDCore/include/DD4hep/Handle.h
index 2835e8a851141878469547c5245e636fccf3ef33..67f86716b79ae2511a6253b6adeb25c68a68f206 100644
--- a/DDCore/include/DD4hep/Handle.h
+++ b/DDCore/include/DD4hep/Handle.h
@@ -258,15 +258,15 @@ namespace DD4hep {
   {      return _ptrToString((void*)p, fmt);       }
 
   /// String conversions: string to boolean value  \ingroup DD4HEP_GEOMETRY
-  bool _toBool(const std::string& value);
+  bool   _toBool(const std::string& value);
   /// String conversions: string to integer value  \ingroup DD4HEP_GEOMETRY
-  short _toShort(const std::string& value);
+  short  _toShort(const std::string& value);
   /// String conversions: string to integer value  \ingroup DD4HEP_GEOMETRY
-  int _toInt(const std::string& value);
+  int    _toInt(const std::string& value);
   /// String conversions: string to long integer value  \ingroup DD4HEP_GEOMETRY
-  long _toLong(const std::string& value);
+  long   _toLong(const std::string& value);
   /// String conversions: string to float value  \ingroup DD4HEP_GEOMETRY
-  float _toFloat(const std::string& value);
+  float  _toFloat(const std::string& value);
   /// String conversions: string to double value  \ingroup DD4HEP_GEOMETRY
   double _toDouble(const std::string& value);
 
diff --git a/DDCore/include/DD4hep/Parsers.h b/DDCore/include/DD4hep/Parsers.h
index 0cc735fe53556e083d563fe7a90d17b93748aa7b..87f6479c29e5647d48805a2740a1079dfb6ef40a 100644
--- a/DDCore/include/DD4hep/Parsers.h
+++ b/DDCore/include/DD4hep/Parsers.h
@@ -24,9 +24,6 @@
 #include <set>
 #include <map>
 #include <deque>
-#include "Math/Point3D.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
 
 // ============================================================================
 #define PARSERS_DECL_FOR_SINGLE(Type)                 \
@@ -557,6 +554,21 @@ namespace DD4hep {
       //
       return 1;                            //  RETURN
     }
+    // ========================================================================
+  }//                                          end of namespace Parsers
+  // ==========================================================================
+}//                                            end of namespace DD4hep
+
+#ifndef DD4HEP_PARSERS_NO_ROOT
+
+#include "Math/Point3D.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+
+/// Namespace for the AIDA detector description toolkit
+namespace DD4hep {
+  /// Namespace for the AIDA detector for utilities using boost::spirit parsers
+  namespace Parsers {
 
     // ========================================================================
     /// parse 3D-point
@@ -731,11 +743,11 @@ namespace DD4hep {
      *   @date 2009-09-05
      */
     PARSERS_DECL_FOR_LIST(ROOT::Math::PxPyPzEVector)
-
     // ========================================================================
   }//                                          end of namespace Parsers
   // ==========================================================================
 }//                                            end of namespace DD4hep
+#endif
 // ============================================================================
 // The END
 // ============================================================================
diff --git a/DDCore/include/DD4hep/Primitives.h b/DDCore/include/DD4hep/Primitives.h
index 06e472875c0d3b02517c75a4c20c2caa57b77f77..c9fb3a352fbfdff5600937d443314a962ae720ec 100644
--- a/DDCore/include/DD4hep/Primitives.h
+++ b/DDCore/include/DD4hep/Primitives.h
@@ -15,10 +15,10 @@
 #ifndef DD4HEP_DD4HEP_PRIMITIVES_H
 #define DD4HEP_DD4HEP_PRIMITIVES_H
 
-#include "DDSegmentation/Segmentation.h"
-
 // C/C++ include files
+#include <map>
 #include <limits>
+#include <typeinfo>
 #include <algorithm>
 #include <stdexcept>
 
@@ -29,6 +29,9 @@ namespace DD4hep {
   namespace DDSegmentation  {
     class BitField64;
     class BitFieldValue;
+    /// Useful typedefs to differentiate cell IDs and volume IDs
+    typedef long long int CellID;
+    typedef long long int VolumeID;
   }
 
   /// We need it so often: one-at-time 32 bit hash function
@@ -70,6 +73,7 @@ namespace DD4hep {
 
   /// ABI information about type names
   std::string typeName(const std::type_info& type);
+  /// Check type infos for equivalence (dynamic casts) using ABI information
   void typeinfoCheck(const std::type_info& typ1, const std::type_info& typ2, const std::string& text = "");
   /// Throw exception when handles are check for validity
   void invalidHandleError(const std::type_info& type);
diff --git a/DDCore/include/DD4hep/ToStream.h b/DDCore/include/DD4hep/ToStream.h
index ba7ece7845d300b839d688296c69cf890784cfe4..67410f891b5679e97c3f821fefb4c817d9a30eca 100644
--- a/DDCore/include/DD4hep/ToStream.h
+++ b/DDCore/include/DD4hep/ToStream.h
@@ -27,9 +27,6 @@
 #include <deque>
 #include <string>
 #include <sstream>
-#include "Math/Point3D.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
 
 // ============================================================================
 /** @file DD4hep/ToStream.h
@@ -306,6 +303,20 @@ namespace DD4hep {
       s.flags(orig_flags);
       return s.str();
     }
+    // ========================================================================
+  }//                                            end of namespace DD4hep::Utils
+  // ==========================================================================
+}//                                                     end of namespace DD4hep
+
+#ifndef DD4HEP_PARSERS_NO_ROOT
+#include "Math/Point3D.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+/// Namespace for the AIDA detector description toolkit
+namespace DD4hep {
+  // ==========================================================================
+  /// Utility namespace to support boost::spirit
+  namespace Utils {
     // ============================================================================
     /// print XYZ point
     std::ostream& toStream(const ROOT::Math::XYZPoint& obj, std::ostream& s);
@@ -313,11 +324,11 @@ namespace DD4hep {
     std::ostream& toStream(const ROOT::Math::XYZVector& obj, std::ostream& s);
     /// print Lorentz vector
     std::ostream& toStream(const ROOT::Math::PxPyPzEVector& obj, std::ostream& s);
-
     // ========================================================================
   }//                                            end of namespace DD4hep::Utils
   // ==========================================================================
 }//                                                     end of namespace DD4hep
+#endif
 // ============================================================================
 // The END
 // ============================================================================
diff --git a/DDCore/include/DD4hep/objects/BasicGrammar_inl.h b/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
index 6ba6274fda52cec6c1bdd4621a96444dcbb58c2d..997e3635a3fcc43056fcb0e55a8dd46f5215d83f 100644
--- a/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
+++ b/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
@@ -29,8 +29,11 @@
 #ifdef DD4HEP_USE_BOOST
 #include "DD4hep/Parsers.h"
 #include "DD4hep/ToStream.h"
-#endif
 #include "XML/Evaluator.h"
+namespace DD4hep { XmlTools::Evaluator& g4Evaluator();  }
+namespace {  static XmlTools::Evaluator& s__eval(DD4hep::g4Evaluator());  }
+#endif
+
 #include "Math/Point3D.h"
 #include "Math/Vector3D.h"
 #include "Math/Vector4D.h"
@@ -43,9 +46,6 @@
 #include <map>
 #include <deque>
 
-namespace DD4hep { XmlTools::Evaluator& g4Evaluator();  }
-namespace {  static XmlTools::Evaluator& s__eval(DD4hep::g4Evaluator());  }
-
 /// Namespace for the AIDA detector description toolkit
 namespace DD4hep {
 
@@ -271,12 +271,16 @@ namespace DD4hep {
       s.erase(idx, 5);
     while (s[0] == ' ')
       s.erase(0, 1);
+#ifdef DD4HEP_USE_BOOST
     double result = s__eval.evaluate(s.c_str());
     if (s__eval.status() != XmlTools::Evaluator::OK) {
       return 0;
     }
     *p = (T)result;
     return 1;
+#else
+    return 0;
+#endif
   }
 
   /// String evaluator
diff --git a/DDCore/src/AlignmentData.cpp b/DDCore/src/AlignmentData.cpp
index 6319fece5e2f46233c7fc51969187d8f3be44ac9..53310d0e9a7fd197bd49b61464bf7495c5312a78 100644
--- a/DDCore/src/AlignmentData.cpp
+++ b/DDCore/src/AlignmentData.cpp
@@ -16,6 +16,7 @@
 #include "DD4hep/AlignmentData.h"
 #include "DD4hep/MatrixHelpers.h"
 #include "DD4hep/InstanceCount.h"
+#include "DD4hep/Primitives.h"
 
 // ROOT include files
 #include "TGeoMatrix.h"
diff --git a/DDCore/src/BasicGrammar.cpp b/DDCore/src/BasicGrammar.cpp
index 9506cda6eb77a3a63f7833808cdd6581267fc3c1..b66123a56cc592670012841f78b81a4110b8eb56 100644
--- a/DDCore/src/BasicGrammar.cpp
+++ b/DDCore/src/BasicGrammar.cpp
@@ -13,7 +13,7 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Handle.h"
+#include "DD4hep/Primitives.h"
 #include "DD4hep/Exceptions.h"
 #include "DD4hep/BasicGrammar.h"
 
diff --git a/DDCore/src/ComponentProperties.cpp b/DDCore/src/ComponentProperties.cpp
index e9ab5986dc9750ca84c25097c4b0781c67b72525..6734afc0bce93bc036a2a378ed5f723ed0214874 100644
--- a/DDCore/src/ComponentProperties.cpp
+++ b/DDCore/src/ComponentProperties.cpp
@@ -14,6 +14,7 @@
 
 // Framework include files
 #include "DD4hep/Printout.h"
+#include "DD4hep/Primitives.h"
 #include "DD4hep/BasicGrammar.h"
 #include "DD4hep/ComponentProperties.h"
 
diff --git a/DDCore/src/parsers/GrammarsV2.h b/DDCore/src/parsers/GrammarsV2.h
index 5342418e0aee65948683f9df808e7fe7a981b4a6..f06bcb5becbea24eb18c6d65538ea75dde9b641e 100644
--- a/DDCore/src/parsers/GrammarsV2.h
+++ b/DDCore/src/parsers/GrammarsV2.h
@@ -30,15 +30,7 @@
 //==============================================================================
 // Boost:
 //==============================================================================
-#ifdef __GNUC__
-#define __DD4HEP_LOCAL_GNUC__ __GNUC__
-#undef __GNUC__
-// Boost spits out an error if __GNUC__ is defined!
-#include <boost/spirit/include/qi.hpp>
-#define __GNUC__ __DD4HEP_LOCAL_GNUC__
-#else
 #include <boost/spirit/include/qi.hpp>
-#endif
 #include <boost/fusion/include/unused.hpp>
 #include <boost/fusion/include/std_pair.hpp>
 
@@ -50,10 +42,6 @@
 
 #include <boost/spirit/repository/include/qi_confix.hpp>
 
-#include "Math/Point3D.h"
-#include "Math/Vector3D.h"
-#include "Math/Vector4D.h"
-
 //==============================================================================
 namespace DD4hep {  namespace Parsers {
     //==============================================================================
@@ -383,8 +371,18 @@ namespace DD4hep {  namespace Parsers {
       // ----------------------------------------------------------------------------
     }; // END KeyValueGrammar
     // We don't register KeyalueGrammar because it's a special parser
+    // ============================================================================
+  }} //   DD4hep::Parsers
 
 
+//==============================================================================
+#ifndef DD4HEP_PARSERS_NO_ROOT
+#include "Math/Point3D.h"
+#include "Math/Vector3D.h"
+#include "Math/Vector4D.h"
+
+namespace DD4hep {  namespace Parsers {
+
     // ============================================================================
     template< typename Iterator, typename PointT, typename Skipper>
     struct Pnt3DGrammar : qi::grammar<Iterator, PointT(), Skipper> {
@@ -500,5 +498,6 @@ namespace DD4hep {  namespace Parsers {
     };
     // ============================================================================
   }} //   DD4hep::Parsers
+#endif
 //============================================================================
 #endif
diff --git a/DDCore/src/parsers/ParserStandardList_Mapint_bool.cpp b/DDCore/src/parsers/ParserStandardList_Mapint_bool.cpp
index c674004c50b0e252b36f07664f625dde1570e293..09812a49be43e9b387d875d0da7874299cf051e8 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapint_bool.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapint_bool.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapint_bool.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapint_double.cpp b/DDCore/src/parsers/ParserStandardList_Mapint_double.cpp
index 0dd096d73ed0947069494b7be90ff87bc3d99ad6..1fe4237749a2ec124d811bf1aa563fc80d3cf679 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapint_double.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapint_double.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapint_double.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapint_float.cpp b/DDCore/src/parsers/ParserStandardList_Mapint_float.cpp
index 10a1fed51e045048e04726fb47e2067a1d1c04fa..c648532324220afb97c348db6a370776d49d9f6a 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapint_float.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapint_float.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapint_float.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapint_int.cpp b/DDCore/src/parsers/ParserStandardList_Mapint_int.cpp
index fb2d86e59cf9937beae1db98d6fa7fba44285de8..78f3f82ed37dbaeeea6c4becbd7e9dff287d2967 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapint_int.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapint_int.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapint_int.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapint_long.cpp b/DDCore/src/parsers/ParserStandardList_Mapint_long.cpp
index 9cb8995149912e8c53dcd8f1ae9eeb6990d3b70f..1f4d3bb5c7656e27ea72316864c3365d59d04368 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapint_long.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapint_long.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapint_long.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapint_string.cpp b/DDCore/src/parsers/ParserStandardList_Mapint_string.cpp
index 8da76795fec6d9ffe3fe31c6468ba09d38c4a83e..13b0bec08c6b823b511a7ac6b3bdb90724d621a4 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapint_string.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapint_string.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapint_string.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapped_bool.cpp b/DDCore/src/parsers/ParserStandardList_Mapped_bool.cpp
index 0adc35d5d099a380d83009f80bd5019da4c59f22..5062a74d89b54cc9b598cab04df47ecb6faf883d 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapped_bool.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapped_bool.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapped_bool.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapped_double.cpp b/DDCore/src/parsers/ParserStandardList_Mapped_double.cpp
index 695e95986140535ece236fd561f01b507886da3c..378ce13ea113f6f27d176fa21a3ed7276ed77a2c 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapped_double.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapped_double.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapped_double.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapped_float.cpp b/DDCore/src/parsers/ParserStandardList_Mapped_float.cpp
index 8c3c3fb1f7a725b3ce62a0dad353f066d4054ec2..77bc0e9217cc6e3b9754f9c5e6b9aa0b725d68f1 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapped_float.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapped_float.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapped_float.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapped_int.cpp b/DDCore/src/parsers/ParserStandardList_Mapped_int.cpp
index 2c27ffc03baf8511f5308cf0249240c0d16c0db7..9e51c4731aafefe7f13c7ecffdf95fa39ec44af6 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapped_int.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapped_int.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapped_int.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapped_long.cpp b/DDCore/src/parsers/ParserStandardList_Mapped_long.cpp
index 6dd4597a5b1b2854658404318b801846b7cba4f8..415360f81e0cfc76cd40eaf722f1a0cb4d6ae1f6 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapped_long.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapped_long.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapped_long.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapped_string.cpp b/DDCore/src/parsers/ParserStandardList_Mapped_string.cpp
index 0c7e329072cb0b0f2f1f95e6dc22f3033776476d..2b85b89de89dc06650d98e8a7dd70b8bae45d2df 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapped_string.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapped_string.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapped_string.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapstring_bool.cpp b/DDCore/src/parsers/ParserStandardList_Mapstring_bool.cpp
index af53eb1f0a5ab3851bd39c59fe66154bae93ba7e..b65fa263cc39c8fc7a9f1d00d539dfddd90e07cf 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapstring_bool.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapstring_bool.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapstring_bool.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapstring_double.cpp b/DDCore/src/parsers/ParserStandardList_Mapstring_double.cpp
index 81c6ce5bc8b603adec9d682a5ce41c580acd0a56..1069c398760fe333ccb349fc6636acd440385abd 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapstring_double.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapstring_double.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapstring_double.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapstring_float.cpp b/DDCore/src/parsers/ParserStandardList_Mapstring_float.cpp
index a3261a123976e1e670d82bc31205d5b60a18be74..215867a58bc26ef96adac885faa2973eb3280ecb 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapstring_float.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapstring_float.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapstring_float.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapstring_int.cpp b/DDCore/src/parsers/ParserStandardList_Mapstring_int.cpp
index ea03bc11318394feccc6f801a24d555f5da9e679..aae0436f4c5711a827abd5b41d9b0bfda9af7dff 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapstring_int.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapstring_int.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapstring_int.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapstring_long.cpp b/DDCore/src/parsers/ParserStandardList_Mapstring_long.cpp
index 3d3acd17300791832f8ea07045af76abd0700f73..70601bdda20d7dbed5b53c59961184db2e99bc9a 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapstring_long.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapstring_long.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapstring_long.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_Mapstring_string.cpp b/DDCore/src/parsers/ParserStandardList_Mapstring_string.cpp
index fb80bfde686cc02fd6d9b6e9f79f3b996c77ee0a..815bdc05cb47e838cd5148fbb52d5696939449b3 100644
--- a/DDCore/src/parsers/ParserStandardList_Mapstring_string.cpp
+++ b/DDCore/src/parsers/ParserStandardList_Mapstring_string.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_Mapstring_string.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_list_bool.cpp b/DDCore/src/parsers/ParserStandardList_list_bool.cpp
index 24890030d6ec635a4063b23ad5448fb7af76f241..57211c4f8d8e341f78083bcaf7773b2c799b9d62 100644
--- a/DDCore/src/parsers/ParserStandardList_list_bool.cpp
+++ b/DDCore/src/parsers/ParserStandardList_list_bool.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_list_bool.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_list_double.cpp b/DDCore/src/parsers/ParserStandardList_list_double.cpp
index 28c910501c66cf513b2b5f75188ba5d22aec511a..0569d65fe06fa08813bc966dfda4c0bb38b4cd79 100644
--- a/DDCore/src/parsers/ParserStandardList_list_double.cpp
+++ b/DDCore/src/parsers/ParserStandardList_list_double.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_list_double.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_list_float.cpp b/DDCore/src/parsers/ParserStandardList_list_float.cpp
index d3fc19d61dc106568b6a4096fca2e967fb03814c..69157cd58bda99404ae647c7d7a796018749eab9 100644
--- a/DDCore/src/parsers/ParserStandardList_list_float.cpp
+++ b/DDCore/src/parsers/ParserStandardList_list_float.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_list_float.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_list_int.cpp b/DDCore/src/parsers/ParserStandardList_list_int.cpp
index 4de5ba3b0efbd2369113dbd43b6859c885bf297f..4046c477dc6232e447b4c01535422478afddf4e0 100644
--- a/DDCore/src/parsers/ParserStandardList_list_int.cpp
+++ b/DDCore/src/parsers/ParserStandardList_list_int.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_list_int.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_list_long.cpp b/DDCore/src/parsers/ParserStandardList_list_long.cpp
index d2d869aff3431e6ecc77013978c051b5a57b9c0d..4833f9b5442c6c87d0d8ec045c11b89bea577fe9 100644
--- a/DDCore/src/parsers/ParserStandardList_list_long.cpp
+++ b/DDCore/src/parsers/ParserStandardList_list_long.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_list_long.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_list_string.cpp b/DDCore/src/parsers/ParserStandardList_list_string.cpp
index 7e1f28046ba57e115002010f80ad216e6828c86a..c39aba3cb06f56a87cdd28ee2ad2f26cb8635428 100644
--- a/DDCore/src/parsers/ParserStandardList_list_string.cpp
+++ b/DDCore/src/parsers/ParserStandardList_list_string.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_list_string.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_set_bool.cpp b/DDCore/src/parsers/ParserStandardList_set_bool.cpp
index c7a383d7e5d7ad5af0638bdd9a28ffea225990be..60c2b56b5697af5e372f09fb549da7bd98157dc8 100644
--- a/DDCore/src/parsers/ParserStandardList_set_bool.cpp
+++ b/DDCore/src/parsers/ParserStandardList_set_bool.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_set_bool.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_set_double.cpp b/DDCore/src/parsers/ParserStandardList_set_double.cpp
index bea498ad30465b20c5702157cba0c1aeba377e4a..dcc952f803d7e7d8702cbe362fd96b9ac9809d0c 100644
--- a/DDCore/src/parsers/ParserStandardList_set_double.cpp
+++ b/DDCore/src/parsers/ParserStandardList_set_double.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_set_double.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_set_float.cpp b/DDCore/src/parsers/ParserStandardList_set_float.cpp
index 413d2fa0dcbb35e3231b6b4225a2718660398f73..06706be405f7501570872d4929e283c41becded4 100644
--- a/DDCore/src/parsers/ParserStandardList_set_float.cpp
+++ b/DDCore/src/parsers/ParserStandardList_set_float.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_set_float.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_set_int.cpp b/DDCore/src/parsers/ParserStandardList_set_int.cpp
index a906733c198071818df032a8d312a2a12b5e94ce..5155901d072122433e39cbb3894874bf97de05b7 100644
--- a/DDCore/src/parsers/ParserStandardList_set_int.cpp
+++ b/DDCore/src/parsers/ParserStandardList_set_int.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_set_int.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_set_long.cpp b/DDCore/src/parsers/ParserStandardList_set_long.cpp
index e9cded7dc81306a1b854245de181a3e46a33638b..76bcb87e45d85a229beea5db2c51084ae8de26a7 100644
--- a/DDCore/src/parsers/ParserStandardList_set_long.cpp
+++ b/DDCore/src/parsers/ParserStandardList_set_long.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_set_long.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_set_string.cpp b/DDCore/src/parsers/ParserStandardList_set_string.cpp
index 30f3647d8250bb00de2a2fe2219a7449fdb93b88..f9672785c2c563b8e01605b81788fe76e4f5315d 100644
--- a/DDCore/src/parsers/ParserStandardList_set_string.cpp
+++ b/DDCore/src/parsers/ParserStandardList_set_string.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_set_string.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_vector_bool.cpp b/DDCore/src/parsers/ParserStandardList_vector_bool.cpp
index f8bd2cd7d3e2ef21eb0e8160149ed952db578e19..8351f08ad86090c8717e17995378fe10ccb824b8 100644
--- a/DDCore/src/parsers/ParserStandardList_vector_bool.cpp
+++ b/DDCore/src/parsers/ParserStandardList_vector_bool.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_vector_bool.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_vector_double.cpp b/DDCore/src/parsers/ParserStandardList_vector_double.cpp
index 7455f78600ca18a15d384e7b6ce35c246dc43df5..d25a8d440c3e6c22a5188ade807e5c18d1d8ff4a 100644
--- a/DDCore/src/parsers/ParserStandardList_vector_double.cpp
+++ b/DDCore/src/parsers/ParserStandardList_vector_double.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_vector_double.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_vector_float.cpp b/DDCore/src/parsers/ParserStandardList_vector_float.cpp
index 2b11899283bf1deb86667686a254781ae338de53..c4a6039804d3893f823ad54dc8bae8183bedeafd 100644
--- a/DDCore/src/parsers/ParserStandardList_vector_float.cpp
+++ b/DDCore/src/parsers/ParserStandardList_vector_float.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_vector_float.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_vector_int.cpp b/DDCore/src/parsers/ParserStandardList_vector_int.cpp
index 698b6662adc2031bc42b9091930aff6d7454facd..ae6503de45feb22abb02334325245108e5102589 100644
--- a/DDCore/src/parsers/ParserStandardList_vector_int.cpp
+++ b/DDCore/src/parsers/ParserStandardList_vector_int.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_vector_int.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_vector_long.cpp b/DDCore/src/parsers/ParserStandardList_vector_long.cpp
index 3c4c523336d26ab04b17776a69e29da515da5018..e35adedcede16019a86562449c337578b39dba0c 100644
--- a/DDCore/src/parsers/ParserStandardList_vector_long.cpp
+++ b/DDCore/src/parsers/ParserStandardList_vector_long.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_vector_long.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParserStandardList_vector_string.cpp b/DDCore/src/parsers/ParserStandardList_vector_string.cpp
index 2eda0c809596d5896ebf9c9f9424ab83577746eb..9c335ed3759073dbb4e62c97d90a272170ec7cd2 100644
--- a/DDCore/src/parsers/ParserStandardList_vector_string.cpp
+++ b/DDCore/src/parsers/ParserStandardList_vector_string.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParserStandardList_vector_string.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersFactory.h b/DDCore/src/parsers/ParsersFactory.h
index 84815d46d6697a069dab5f2c2c4a6343caa3459b..c1d6b07dac2828524b7e5c6877889bacdbfcb2d5 100644
--- a/DDCore/src/parsers/ParsersFactory.h
+++ b/DDCore/src/parsers/ParsersFactory.h
@@ -27,6 +27,7 @@
 // ============================================================================
 // DD4hep
 // ============================================================================
+#include "UsedParser.h"
 #include "GrammarsV2.h"
 // ============================================================================
 namespace DD4hep  {
diff --git a/DDCore/src/parsers/ParsersObjects_PxPyPzEVector.cpp b/DDCore/src/parsers/ParsersObjects_PxPyPzEVector.cpp
index 33695e903e88ff63166621977653666bdaad2313..7548c159011a456f1711714ab64efb939094bccd 100644
--- a/DDCore/src/parsers/ParsersObjects_PxPyPzEVector.cpp
+++ b/DDCore/src/parsers/ParsersObjects_PxPyPzEVector.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParsersObjects_PxPyPzEVector.cpp 2190 2016-04-08 08:31:42Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -12,6 +12,7 @@
 //==========================================================================
 // Include files
 //==========================================================================
+#ifndef DD4HEP_PARSERS_NO_ROOT
 #include "ParsersStandardListCommon.h"
 
 namespace ROOT {  namespace Math {
@@ -39,5 +40,5 @@ namespace DD4hep {
     IMPLEMENT_MAPPED_PARSERS(pair,_L)
   }
 }
-
+#endif
 
diff --git a/DDCore/src/parsers/ParsersObjects_XYZPoint.cpp b/DDCore/src/parsers/ParsersObjects_XYZPoint.cpp
index 230369987916f51eab83a3dfd2544d219305ed04..fcb75ee3a757792803e1f8a22059d78ac9a4ba00 100644
--- a/DDCore/src/parsers/ParsersObjects_XYZPoint.cpp
+++ b/DDCore/src/parsers/ParsersObjects_XYZPoint.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParsersObjects_XYZPoint.cpp 2119 2016-03-03 14:10:32Z markus.frank@cern.ch $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -12,6 +12,7 @@
 //==========================================================================
 // Include files
 //==========================================================================
+#ifndef DD4HEP_PARSERS_NO_ROOT
 #include "ParsersStandardListCommon.h"
 
 namespace ROOT {  namespace Math {
@@ -37,5 +38,5 @@ namespace DD4hep {
     IMPLEMENT_MAPPED_PARSERS(pair,ROOT::Math::XYZPoint)
   }
 }
-
+#endif
 
diff --git a/DDCore/src/parsers/ParsersObjects_XYZVector.cpp b/DDCore/src/parsers/ParsersObjects_XYZVector.cpp
index 859ad9acfdd340712c7e7f8f5ca1ddcd0aba4939..2bcee48d7580994ec387adc4060f7083cf45801d 100644
--- a/DDCore/src/parsers/ParsersObjects_XYZVector.cpp
+++ b/DDCore/src/parsers/ParsersObjects_XYZVector.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ParsersObjects_XYZVector.cpp 2119 2016-03-03 14:10:32Z markus.frank@cern.ch $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -12,6 +12,7 @@
 //==========================================================================
 // Include files
 //==========================================================================
+#ifndef DD4HEP_PARSERS_NO_ROOT
 #include "ParsersStandardListCommon.h"
 
 namespace ROOT {  namespace Math {
@@ -50,5 +51,4 @@ namespace DD4hep {
     IMPLEMENT_MAPPED_PARSERS(pair,ROOT::Math::XYZVector)
   }
 }
-
-
+#endif
diff --git a/DDCore/src/parsers/ParsersStandardListCommon.h b/DDCore/src/parsers/ParsersStandardListCommon.h
index 44f9678a4043e20a2c9e57445f825b2595f27f8a..2231bd8e5910d57f545b1cdb6f2ad353cf203fba 100644
--- a/DDCore/src/parsers/ParsersStandardListCommon.h
+++ b/DDCore/src/parsers/ParsersStandardListCommon.h
@@ -14,8 +14,6 @@
 // ============================================================================
 // Include files
 // ============================================================================
-#include "DD4hep/Parsers.h"
-#include "DD4hep/ToStream.h"
 #include "ParsersFactory.h"
 
 
@@ -63,6 +61,7 @@
       IMPLEMENT_STL_PARSERS(InnerType)                     \
       IMPLEMENT_MAPPED_PARSERS(pair,InnerType)            }}
 
+#ifndef DD4HEP_PARSERS_NO_ROOT
 // ============================================================================
 namespace DD4hep {
   namespace Parsers {
@@ -79,5 +78,6 @@ namespace DD4hep {
     }
   }
 }
+#endif
 // ============================================================================
 #endif /* PARSERS_STANDARD_LIST_COMMON_H */
diff --git a/DDCore/src/parsers/ParsersStandardMiscCommon.h b/DDCore/src/parsers/ParsersStandardMiscCommon.h
index 6e8bf4d5a82625cd29b80f26d13855cb394144c7..757abf0d9c1621f0e2e0fe08bae26ccb1eea393b 100644
--- a/DDCore/src/parsers/ParsersStandardMiscCommon.h
+++ b/DDCore/src/parsers/ParsersStandardMiscCommon.h
@@ -14,7 +14,6 @@
 // ============================================================================
 // Include files
 // ============================================================================
-#include "DD4hep/Parsers.h"
 #include "ParsersFactory.h"
 // ============================================================================
 #endif /* PARSERS_STANDARD_MISC_COMMON_H */
diff --git a/DDCore/src/parsers/ParsersStandardSingle.cpp b/DDCore/src/parsers/ParsersStandardSingle.cpp
index e663d1ff48222b3ab8e54f98dee25528f23bbc2e..e6046c4e3e4668b270b9867b0373c98e7ae91ad9 100644
--- a/DDCore/src/parsers/ParsersStandardSingle.cpp
+++ b/DDCore/src/parsers/ParsersStandardSingle.cpp
@@ -9,7 +9,6 @@
 // For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
 //
 //==========================================================================
-#include "DD4hep/Parsers.h"
 #include "ParsersFactory.h"
 // ============================================================================
 #define PARSERS_DEF_FOR_SINGLE(Type)                                  \
diff --git a/DDCore/src/parsers/UsedParser.h b/DDCore/src/parsers/UsedParser.h
new file mode 100644
index 0000000000000000000000000000000000000000..96c417a3b7a1a8e21a78290808cce7c6f0054270
--- /dev/null
+++ b/DDCore/src/parsers/UsedParser.h
@@ -0,0 +1,27 @@
+// $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.
+//
+//==========================================================================
+#ifndef DD4HEP_DDCORE_PARSERS_USEDPARSERS_H
+#define DD4HEP_DDCORE_PARSERS_USEDPARSERS_H
+
+
+#if defined(DD4hep)
+
+#include "Parsers/UsedParser.h"
+
+#else
+
+#include "DD4hep/Parsers.h"
+#include "DD4hep/ToStream.h"
+
+#endif
+
+#endif //  DD4HEP_DDCORE_PARSERS_USEDPARSERS_H
diff --git a/DDG4/include/DDG4/Geant4ActionPhase.h b/DDG4/include/DDG4/Geant4ActionPhase.h
index fe03723e2da4c4896ab0577bcc467753a6b81651..86f64da6fe99eeb6a0300acdf39fd34a49c2538c 100644
--- a/DDG4/include/DDG4/Geant4ActionPhase.h
+++ b/DDG4/include/DDG4/Geant4ActionPhase.h
@@ -15,6 +15,7 @@
 #define DD4HEP_DDG4_GEANT4ACTIONPHASE_H
 
 // Framework include files
+#include "DD4hep/Exceptions.h"
 #include "DDG4/Geant4Action.h"
 
 // C/C++ include files