diff --git a/DDCore/include/DD4hep/GrammarParsed.h b/DDCore/include/DD4hep/GrammarParsed.h
index 83e1cc8dbf3a152e10742678938d5f9aa2183022..45509c693cbe2e061d6274d041101ea21a7701a0 100644
--- a/DDCore/include/DD4hep/GrammarParsed.h
+++ b/DDCore/include/DD4hep/GrammarParsed.h
@@ -26,10 +26,10 @@
 #endif
 
 /// Framework include files
-#include "DD4hep/Grammar.h"
-#include "DD4hep/Printout.h"
-#include "Parsers/Parsers.h"
-#include "Evaluator/Evaluator.h"
+#include <DD4hep/Grammar.h>
+#include <DD4hep/Printout.h>
+#include <Parsers/Parsers.h>
+#include <Evaluator/Evaluator.h>
 
 /// C/C++ include files
 #include <string>
diff --git a/DDCore/src/GrammarTypes.cpp b/DDCore/src/GrammarTypes.cpp
index 33ebbbc775f7d9137c5e632f2a03a51cc17a31ff..eee5971c8ed90a7f87fc8b971b41ca769aa590bf 100644
--- a/DDCore/src/GrammarTypes.cpp
+++ b/DDCore/src/GrammarTypes.cpp
@@ -18,6 +18,13 @@
 #include "Math/Vector4D.h"
 #include "Math/Vector3D.h"
 
+#ifndef DD4HEP_PARSERS_NO_ROOT
+
+/// ROOT include files
+#include <Math/Point3D.h>
+#include <Math/Vector4D.h>
+#include <Math/Vector3D.h>
+
 namespace ROOT {
   namespace Math {
     /// Allow point insertion of a point in maps
diff --git a/examples/DDG4/scripts/TestProperties.py b/examples/DDG4/scripts/TestProperties.py
index 4e690bad24a557d12a057beb77175701415fd5ac..aaf8abff3f09c06b9a51d59e7c2bbc43074098c1 100644
--- a/examples/DDG4/scripts/TestProperties.py
+++ b/examples/DDG4/scripts/TestProperties.py
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # ==========================================================================
 #  AIDA Detector description implementation
 # --------------------------------------------------------------------------