diff --git a/DDCore/include/DD4hep/GrammarParsed.h b/DDCore/include/DD4hep/GrammarParsed.h
index 45509c693cbe2e061d6274d041101ea21a7701a0..83e1cc8dbf3a152e10742678938d5f9aa2183022 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 53d59c17644cf220962ffe3a4fc99f7174dec70f..33ebbbc775f7d9137c5e632f2a03a51cc17a31ff 100644
--- a/DDCore/src/GrammarTypes.cpp
+++ b/DDCore/src/GrammarTypes.cpp
@@ -14,12 +14,9 @@
 // Framework include files
 #include <DD4hep/GrammarParsed.h>
 
-#ifndef DD4HEP_PARSERS_NO_ROOT
-
-/// ROOT include files
-#include <Math/Point3D.h>
-#include <Math/Vector4D.h>
-#include <Math/Vector3D.h>
+#include "Math/Point3D.h"
+#include "Math/Vector4D.h"
+#include "Math/Vector3D.h"
 
 namespace ROOT {
   namespace Math {
diff --git a/examples/ClientTests/src/Property_test.cpp b/examples/ClientTests/src/Property_test.cpp
index 46dc6e9e95f32cbd96adfd8029faf170d22e94cd..3203f6c8b4e1e2b1760200c71bc961ac5d38193f 100644
--- a/examples/ClientTests/src/Property_test.cpp
+++ b/examples/ClientTests/src/Property_test.cpp
@@ -219,6 +219,7 @@ static int property_test(Detector& /* description */, int /* argc */, char** /*
     cout << endl << "Test PASSED" << endl << endl;
   else
     cout << endl << "Test FAILED" << endl << "===> " << result << " Subtests FAILED" << endl;
+
   // All done.
   return 1;
 }