From 306b24e8dbd111dbf1bf1f548097a4d6a7432423 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Wed, 22 May 2024 10:27:16 +0200
Subject: [PATCH] Code maintenance: change quoted include statements to angular
 brackets.

---
 DDG4/examples/TEve.C                          |  24 +-
 DDG4/g4gdmlDisplay.cpp                        |  28 +-
 DDG4/hepmc/HepMC3EventReader.cpp              |  10 +-
 DDG4/hepmc/HepMC3EventReader.h                |   2 +-
 DDG4/hepmc/HepMC3FileReader.cpp               |   8 +-
 DDG4/include/DDG4/ComponentUtils.h            |   4 +-
 DDG4/include/DDG4/DDG4Dict.h                  |   6 +-
 DDG4/include/DDG4/Defs.h                      |   2 +-
 DDG4/include/DDG4/Factories.h                 |  10 +-
 DDG4/include/DDG4/Geant4AssemblyVolume.h      |   4 +-
 DDG4/include/DDG4/Geant4Callback.h            |   2 +-
 DDG4/include/DDG4/Geant4Context.h             |   4 +-
 DDG4/include/DDG4/Geant4DataConversion.h      |   4 +-
 DDG4/include/DDG4/Geant4DataDump.h            |   6 +-
 .../DDG4/Geant4FastSimShowerModel.inl.h       |   4 +-
 DDG4/include/DDG4/Geant4GDMLDetector.h        |   2 +-
 DDG4/include/DDG4/Geant4HierarchyDump.h       |   2 +-
 DDG4/include/DDG4/Geant4HitCollection.h       |   8 +-
 DDG4/include/DDG4/Geant4HitHandler.h          |   6 +-
 DDG4/include/DDG4/Geant4InteractionMerger.h   |   2 +-
 .../DDG4/Geant4InteractionVertexBoost.h       |   4 +-
 .../DDG4/Geant4InteractionVertexSmear.h       |   4 +-
 DDG4/include/DDG4/Geant4IsotropeGenerator.h   |   2 +-
 DDG4/include/DDG4/Geant4Mapping.h             |  10 +-
 DDG4/include/DDG4/Geant4MonteCarloTruth.h     |   2 +-
 DDG4/include/DDG4/Geant4Output2ROOT.h         |   2 +-
 DDG4/include/DDG4/Geant4Particle.h            |   2 +-
 DDG4/include/DDG4/Geant4ParticleGenerator.h   |   4 +-
 DDG4/include/DDG4/Geant4ParticleGun.h         |   2 +-
 DDG4/include/DDG4/Geant4ParticleHandler.h     |   6 +-
 DDG4/include/DDG4/Geant4ParticlePrint.h       |   6 +-
 DDG4/include/DDG4/Geant4PhysicsConstructor.h  |   6 +-
 .../DDG4/Geant4PlacementParameterisation.h    |   1 +
 DDG4/include/DDG4/Geant4Primary.h             |   6 +-
 DDG4/include/DDG4/Geant4PrimaryHandler.h      |   3 +-
 DDG4/include/DDG4/Geant4Primitives.h          |   2 +-
 DDG4/include/DDG4/Geant4Random.h              |   2 +-
 DDG4/include/DDG4/Geant4ReadoutVolumeFilter.h |   6 +-
 DDG4/include/DDG4/Geant4RunAction.h           |   2 +-
 DDG4/include/DDG4/Geant4StepHandler.h         |  12 +-
 DDG4/include/DDG4/Geant4SteppingAction.h      |   2 +-
 DDG4/include/DDG4/Geant4TestActions.h         |  20 +-
 DDG4/include/DDG4/Geant4TrackHandler.h        |  17 +-
 DDG4/include/DDG4/Geant4TrackInformation.h    |   2 +-
 DDG4/include/DDG4/Geant4TrackingAction.h      |   4 +-
 DDG4/include/DDG4/Geant4TrackingPostAction.h  |   2 +-
 DDG4/include/DDG4/Geant4TrackingPreAction.h   |   2 +-
 DDG4/include/DDG4/Geant4UIManager.h           |   4 +-
 DDG4/include/DDG4/Geant4UIMessenger.h         |   8 +-
 DDG4/include/DDG4/Geant4UserInitialization.h  |   2 +-
 DDG4/include/DDG4/Geant4UserLimits.h          |   4 +-
 DDG4/include/DDG4/Geant4UserParticleHandler.h |   4 +-
 DDG4/include/DDG4/Python/DDPython.h           |   2 +-
 DDG4/include/DDG4/Python/Geant4PythonAction.h |   4 +-
 DDG4/include/DDG4/Python/Geant4PythonCall.h   |   2 +-
 .../Python/Geant4PythonDetectorConstruction.h |   4 +-
 .../DDG4/Python/Geant4PythonInitialization.h  |   4 +-
 DDG4/lcio/Geant4Output2LCIO.cpp               |  70 ++---
 DDG4/lcio/LCIOConversions.cpp                 |  36 +--
 DDG4/lcio/LCIOEventReader.cpp                 |  16 +-
 DDG4/lcio/LCIOEventReader.h                   |   2 +-
 DDG4/lcio/LCIOFileReader.cpp                  |  10 +-
 DDG4/lcio/LCIOSDTestActions.cpp               |  26 +-
 DDG4/lcio/LCIOStdHepReader.cpp                |   4 +-
 DDG4/plugins/Geant4.9.PhysicsConstructors.h   | 120 ++++----
 DDG4/plugins/Geant4CerenkovPhysics.cpp        |  20 +-
 DDG4/plugins/Geant4DefaultRangeCut.cpp        |   6 +-
 .../Geant4DetectorGeometryConstruction.cpp    |   2 +-
 DDG4/plugins/Geant4EventSeed.cpp              |  12 +-
 DDG4/plugins/Geant4EventSeed.h                |   2 +-
 DDG4/plugins/Geant4ExtraParticles.cpp         |  18 +-
 DDG4/plugins/Geant4ExtraParticles.h           |  12 +-
 DDG4/plugins/Geant4Factories.cpp              |  64 ++---
 DDG4/plugins/Geant4FastPhysics.cpp            |   2 +-
 DDG4/plugins/Geant4HitExtractor.cpp           |   4 +-
 DDG4/plugins/Geant4OpticalPhotonPhysics.cpp   |  24 +-
 DDG4/plugins/Geant4P1ShowerModel.cpp          |   4 +-
 DDG4/plugins/Geant4Particles.cpp              | 260 +++++++++---------
 DDG4/plugins/Geant4PhysicsConstructors.cpp    |   6 +-
 DDG4/plugins/Geant4PrimaryGenerators.cpp      |  10 +-
 DDG4/plugins/Geant4Processes.cpp              | 200 +++++++-------
 DDG4/plugins/Geant4SDActions.cpp              |  12 +-
 DDG4/plugins/Geant4ScintillationPhysics.cpp   |  28 +-
 DDG4/plugins/Geant4SensDet.cpp                |   2 +-
 DDG4/plugins/Geant4Steppers.cpp               |  66 ++---
 DDG4/plugins/Geant4TCUserParticleHandler.cpp  |  10 +-
 DDG4/scripts/dumpDDG4.C                       |  21 +-
 DDG4/src/EventParameters.cpp                  |   2 +-
 DDG4/src/Geant4EventAction.cpp                |   8 +-
 DDG4/src/Geant4Field.cpp                      |   6 +-
 DDG4/src/Geant4GDMLDetector.cpp               |   2 +-
 DDG4/src/Geant4InteractionMerger.cpp          |   8 +-
 DDG4/src/Geant4InteractionVertexBoost.cpp     |   8 +-
 DDG4/src/Geant4InteractionVertexSmear.cpp     |  12 +-
 DDG4/src/Geant4MonteCarloTruth.cpp            |   4 +-
 DDG4/src/Geant4Plugins.cpp                    |  30 +-
 DDG4/src/Geant4PrimaryHandler.cpp             |   8 +-
 DDG4/src/Geant4ReadoutVolumeFilter.cpp        |  16 +-
 DDG4/src/Geant4UserParticleHandler.cpp        |  10 +-
 DDG4/src/python/DDG4Python.C                  |  10 +-
 .../Geant4PythonDetectorConstructionLast.cpp  |   2 +-
 DDG4/src/python/PyDDG4.cpp                    |   8 +-
 DDG4/tpython/DDPython.cpp                     |   2 +-
 103 files changed, 760 insertions(+), 754 deletions(-)

diff --git a/DDG4/examples/TEve.C b/DDG4/examples/TEve.C
index fc7b505c6..19cc1bd90 100644
--- a/DDG4/examples/TEve.C
+++ b/DDG4/examples/TEve.C
@@ -8,22 +8,22 @@
 //  Author     : M.Frank
 //
 //====================================================================
-#include "DD4hep/Detector.h"
+#include <DD4hep/Detector.h>
 
 // ROOT include files
-#include "TGeoManager.h"
-#include "TEveGeoNode.h"
-#include "TGLViewer.h"
-#include "TGLUtil.h"
-#include "TGLClip.h"
-#include "TMap.h"
-#include "TEveElement.h"
-#include "TSysEvtHandler.h"
-#include "TTimer.h"
-#include "TVirtualPad.h"
+#include <TGeoManager.h>
+#include <TEveGeoNode.h>
+#include <TGLViewer.h>
+#include <TGLUtil.h>
+#include <TGLClip.h>
+#include <TMap.h>
+#include <TEveElement.h>
+#include <TSysEvtHandler.h>
+#include <TTimer.h>
+#include <TVirtualPad.h>
 
 #define private public
-#include "TEveManager.h"
+#include <TEveManager.h>
 
 using namespace dd4hep::detail;
 
diff --git a/DDG4/g4gdmlDisplay.cpp b/DDG4/g4gdmlDisplay.cpp
index 640ece170..2e11e2ddb 100644
--- a/DDG4/g4gdmlDisplay.cpp
+++ b/DDG4/g4gdmlDisplay.cpp
@@ -16,25 +16,25 @@
 //#define G4VIS_USE_OPENGL
 //#define G4UI_USE_TCSH
 
-#include "G4PVPlacement.hh"
-#include "G4RunManager.hh"
-#include "G4UImanager.hh"
-#include "G4UIsession.hh"
-#include "Randomize.hh"
+#include <G4PVPlacement.hh>
+#include <G4RunManager.hh>
+#include <G4UImanager.hh>
+#include <G4UIsession.hh>
+#include <Randomize.hh>
 
 #ifdef G4VIS_USE_OPENGLX
-#include "G4OpenGLImmediateX.hh"
-#include "G4OpenGLStoredX.hh"
+#include <G4OpenGLImmediateX.hh>
+#include <G4OpenGLStoredX.hh>
 #endif
 
-#include "G4VisManager.hh"
-#include "G4VisExecutive.hh"
-#include "G4UIExecutive.hh"
-#include "G4VUserPhysicsList.hh"
-#include "G4ParticleTypes.hh"
-#include "globals.hh"
+#include <G4VisManager.hh>
+#include <G4VisExecutive.hh>
+#include <G4UIExecutive.hh>
+#include <G4VUserPhysicsList.hh>
+#include <G4ParticleTypes.hh>
+#include <globals.hh>
 
-#include "DDG4/Geant4GDMLDetector.h"
+#include <DDG4/Geant4GDMLDetector.h>
 #include <cerrno>
 #include <stdexcept>
 
diff --git a/DDG4/hepmc/HepMC3EventReader.cpp b/DDG4/hepmc/HepMC3EventReader.cpp
index bf9f46094..38508786b 100644
--- a/DDG4/hepmc/HepMC3EventReader.cpp
+++ b/DDG4/hepmc/HepMC3EventReader.cpp
@@ -16,10 +16,10 @@
 
 // Framework include files
 #include "HepMC3EventReader.h"
-#include "DD4hep/Printout.h"
-#include "DDG4/Geant4Primary.h"
-#include "DDG4/Geant4Context.h"
-#include "DDG4/Factories.h"
+#include <DD4hep/Printout.h>
+#include <DDG4/Geant4Primary.h>
+#include <DDG4/Geant4Context.h>
+#include <DDG4/Factories.h>
 
 #include <G4ParticleTable.hh>
 
@@ -29,7 +29,7 @@
 #include <HepMC3/GenVertex.h>
 #include <HepMC3/Units.h>
 
-#include "G4Event.hh"
+#include <G4Event.hh>
 
 
 using dd4hep::sim::HEPMC3EventReader;
diff --git a/DDG4/hepmc/HepMC3EventReader.h b/DDG4/hepmc/HepMC3EventReader.h
index 8ec08f025..163aa1722 100644
--- a/DDG4/hepmc/HepMC3EventReader.h
+++ b/DDG4/hepmc/HepMC3EventReader.h
@@ -13,7 +13,7 @@
 #define DDG4_HEPMC_HEPMC3EVENTREADER_H
 
 // Framework include files
-#include "DDG4/Geant4InputAction.h"
+#include <DDG4/Geant4InputAction.h>
 
 namespace HepMC3{ class GenEvent; }
 
diff --git a/DDG4/hepmc/HepMC3FileReader.cpp b/DDG4/hepmc/HepMC3FileReader.cpp
index d2711c817..15c93cce2 100644
--- a/DDG4/hepmc/HepMC3FileReader.cpp
+++ b/DDG4/hepmc/HepMC3FileReader.cpp
@@ -26,8 +26,8 @@
 
 #include "HepMC3EventReader.h"
 
-#include "DDG4/EventParameters.h"
-#include "DDG4/RunParameters.h"
+#include <DDG4/EventParameters.h>
+#include <DDG4/RunParameters.h>
 
 #include <HepMC3/ReaderFactory.h>
 #include <HepMC3/Version.h>
@@ -113,8 +113,8 @@ namespace dd4hep  {
   }
 }
 
-#include "DD4hep/Printout.h"
-#include "DDG4/Factories.h"
+#include <DD4hep/Printout.h>
+#include <DDG4/Factories.h>
 
 using dd4hep::sim::HEPMC3FileReader;
 using dd4hep::sim::Geant4EventReader;
diff --git a/DDG4/include/DDG4/ComponentUtils.h b/DDG4/include/DDG4/ComponentUtils.h
index 643d0cd06..b7c039165 100644
--- a/DDG4/include/DDG4/ComponentUtils.h
+++ b/DDG4/include/DDG4/ComponentUtils.h
@@ -15,8 +15,8 @@
 #define DDG4_COMPONENTUTILS_H
 
 // Framework include files
-#include "DD4hep/Primitives.h"
-#include "DD4hep/Exceptions.h"
+#include <DD4hep/Primitives.h>
+#include <DD4hep/Exceptions.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/DDG4Dict.h b/DDG4/include/DDG4/DDG4Dict.h
index 5bfb3ddfb..57ddaa3b2 100644
--- a/DDG4/include/DDG4/DDG4Dict.h
+++ b/DDG4/include/DDG4/DDG4Dict.h
@@ -34,9 +34,9 @@
 #endif
 
 // FRamework include files
-#include "DD4hep/Memory.h"
-#include "DDG4/Geant4Data.h"
-#include "DDG4/Geant4Particle.h"
+#include <DD4hep/Memory.h>
+#include <DDG4/Geant4Data.h>
+#include <DDG4/Geant4Particle.h>
 
 namespace dd4hep {
   namespace DDSegmentation { }
diff --git a/DDG4/include/DDG4/Defs.h b/DDG4/include/DDG4/Defs.h
index 430ca6c13..b65cf93b7 100644
--- a/DDG4/include/DDG4/Defs.h
+++ b/DDG4/include/DDG4/Defs.h
@@ -15,7 +15,7 @@
 #define DDG4_DEFS_H
 
 // Framework include files
-#include "DD4hep/Detector.h"
+#include <DD4hep/Detector.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Factories.h b/DDG4/include/DDG4/Factories.h
index e5094c385..125e65e91 100644
--- a/DDG4/include/DDG4/Factories.h
+++ b/DDG4/include/DDG4/Factories.h
@@ -14,11 +14,11 @@
 #define DDG4_FACTORIES_H
 
 // Framework include files
-#include "DDG4/Defs.h"
-#include "DD4hep/Plugins.h"
-#include "DD4hep/Printout.h"
-#include "DD4hep/Factories.h"
-#include "DD4hep/Primitives.h"
+#include <DDG4/Defs.h>
+#include <DD4hep/Plugins.h>
+#include <DD4hep/Printout.h>
+#include <DD4hep/Factories.h>
+#include <DD4hep/Primitives.h>
 
 // C/C++ include files
 #include <string>
diff --git a/DDG4/include/DDG4/Geant4AssemblyVolume.h b/DDG4/include/DDG4/Geant4AssemblyVolume.h
index 3865e8a96..da18d7f33 100644
--- a/DDG4/include/DDG4/Geant4AssemblyVolume.h
+++ b/DDG4/include/DDG4/Geant4AssemblyVolume.h
@@ -14,10 +14,10 @@
 #define DDG4_GEANT4ASSEMBLYVOLUME_H
 
 /// ROOT includes
-#include "TGeoNode.h"
+#include <TGeoNode.h>
 
 /// Geant4 include files
-#include "G4AssemblyVolume.hh"
+#include <G4AssemblyVolume.hh>
 
 /// C/C++ include files
 #include <vector>
diff --git a/DDG4/include/DDG4/Geant4Callback.h b/DDG4/include/DDG4/Geant4Callback.h
index bf0a337bd..3a8802bcd 100644
--- a/DDG4/include/DDG4/Geant4Callback.h
+++ b/DDG4/include/DDG4/Geant4Callback.h
@@ -15,6 +15,6 @@
 #define DDG4_GEANT4CALLBACK_H
 
 // Just forward header for dd4hep callbacks
-#include "DD4hep/Callback.h"
+#include <DD4hep/Callback.h>
 
 #endif // DDG4_GEANT4CALLBACK_H
diff --git a/DDG4/include/DDG4/Geant4Context.h b/DDG4/include/DDG4/Geant4Context.h
index b801641b0..0f0f42f20 100644
--- a/DDG4/include/DDG4/Geant4Context.h
+++ b/DDG4/include/DDG4/Geant4Context.h
@@ -15,8 +15,8 @@
 #define DDG4_GEANT4CONTEXT_H
 
 // Framework incloude files
-#include "DD4hep/Primitives.h"
-#include "DD4hep/ObjectExtensions.h"
+#include <DD4hep/Primitives.h>
+#include <DD4hep/ObjectExtensions.h>
 
 // Forward declarations
 class G4Run;
diff --git a/DDG4/include/DDG4/Geant4DataConversion.h b/DDG4/include/DDG4/Geant4DataConversion.h
index f5e369965..a90a2d459 100644
--- a/DDG4/include/DDG4/Geant4DataConversion.h
+++ b/DDG4/include/DDG4/Geant4DataConversion.h
@@ -15,8 +15,8 @@
 #define DDG4_GEANT4DATACONVERSION_H
 
 // Framework include files
-#include "DD4hep/VolumeManager.h"
-#include "DD4hep/DetElement.h"
+#include <DD4hep/VolumeManager.h>
+#include <DD4hep/DetElement.h>
 #include <typeinfo>
 
 /// Namespace for the AIDA detector description toolkit
diff --git a/DDG4/include/DDG4/Geant4DataDump.h b/DDG4/include/DDG4/Geant4DataDump.h
index 473d5eb93..702ce3eb3 100644
--- a/DDG4/include/DDG4/Geant4DataDump.h
+++ b/DDG4/include/DDG4/Geant4DataDump.h
@@ -15,9 +15,9 @@
 #define DDG4_GEANT4DATADUMP_H
 
 // Framework include files
-#include "DD4hep/Printout.h"
-#include "DDG4/Geant4Data.h"
-#include "DDG4/Geant4Particle.h"
+#include <DD4hep/Printout.h>
+#include <DDG4/Geant4Data.h>
+#include <DDG4/Geant4Particle.h>
 
 // C/C++ include files
 #include <vector>
diff --git a/DDG4/include/DDG4/Geant4FastSimShowerModel.inl.h b/DDG4/include/DDG4/Geant4FastSimShowerModel.inl.h
index 6da7cbb44..b5e9f7f93 100644
--- a/DDG4/include/DDG4/Geant4FastSimShowerModel.inl.h
+++ b/DDG4/include/DDG4/Geant4FastSimShowerModel.inl.h
@@ -86,9 +86,9 @@ namespace dd4hep  {
   }     /* End namespace sim   */
 }       /* End namespace dd4hep */
 
-#include "G4Version.hh"
+#include <G4Version.hh>
 #if G4VERSION_NUMBER > 1070
-#include "G4FastSimHitMaker.hh"
+#include <G4FastSimHitMaker.hh>
 #else
 class G4FastHit;
 class G4FastSimHitMaker  {  public:  void make(const G4FastHit&, const G4FastTrack&)  { } };
diff --git a/DDG4/include/DDG4/Geant4GDMLDetector.h b/DDG4/include/DDG4/Geant4GDMLDetector.h
index b7bb5405d..d18259e72 100644
--- a/DDG4/include/DDG4/Geant4GDMLDetector.h
+++ b/DDG4/include/DDG4/Geant4GDMLDetector.h
@@ -14,7 +14,7 @@
 #ifndef DDG4_GEANT4GDMLDETECTOR_H
 #define DDG4_GEANT4GDMLDETECTOR_H
 
-#include "G4VUserDetectorConstruction.hh"
+#include <G4VUserDetectorConstruction.hh>
 #include <string>
 
 /// Namespace for the AIDA detector description toolkit
diff --git a/DDG4/include/DDG4/Geant4HierarchyDump.h b/DDG4/include/DDG4/Geant4HierarchyDump.h
index e28ee2400..943e8d61c 100644
--- a/DDG4/include/DDG4/Geant4HierarchyDump.h
+++ b/DDG4/include/DDG4/Geant4HierarchyDump.h
@@ -14,7 +14,7 @@
 #define DDG4_GEANT4HIERARCHYDUMP_H
 
 // Geant 4 include files
-#include "G4VPhysicalVolume.hh"
+#include <G4VPhysicalVolume.hh>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4HitCollection.h b/DDG4/include/DDG4/Geant4HitCollection.h
index 6021c831d..065fc0ef6 100644
--- a/DDG4/include/DDG4/Geant4HitCollection.h
+++ b/DDG4/include/DDG4/Geant4HitCollection.h
@@ -14,10 +14,10 @@
 #define DDG4_GEANT4HITCOLLECTION_H
 
 // Framework include files
-#include "DD4hep/Handle.h"
-#include "DDG4/ComponentUtils.h"
-#include "G4VHitsCollection.hh"
-#include "G4VHit.hh"
+#include <DD4hep/Handle.h>
+#include <DDG4/ComponentUtils.h>
+#include <G4VHitsCollection.hh>
+#include <G4VHit.hh>
 
 // C/C++ include files
 #include <vector>
diff --git a/DDG4/include/DDG4/Geant4HitHandler.h b/DDG4/include/DDG4/Geant4HitHandler.h
index 0f2770aae..b34fbef80 100644
--- a/DDG4/include/DDG4/Geant4HitHandler.h
+++ b/DDG4/include/DDG4/Geant4HitHandler.h
@@ -14,11 +14,11 @@
 #define DDG4_GEANT4HITHANDLER_H
 
 // Framework include files
-#include "DDG4/Defs.h"
+#include <DDG4/Defs.h>
 
 // Geant4 include files
-#include "G4EmSaturation.hh"
-#include "G4Version.hh"
+#include <G4EmSaturation.hh>
+#include <G4Version.hh>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4InteractionMerger.h b/DDG4/include/DDG4/Geant4InteractionMerger.h
index cc8b453e6..15fe97b1e 100644
--- a/DDG4/include/DDG4/Geant4InteractionMerger.h
+++ b/DDG4/include/DDG4/Geant4InteractionMerger.h
@@ -23,7 +23,7 @@
 #define DDG4_GEANT4INTERACTIONMERGER_H
 
 // Framework include files
-#include "DDG4/Geant4GeneratorAction.h"
+#include <DDG4/Geant4GeneratorAction.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4InteractionVertexBoost.h b/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
index 50641befe..91cb0ed7e 100644
--- a/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
+++ b/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
@@ -24,8 +24,8 @@
 #define DDG4_GEANT4INTERACTIONVERTEXBOOST_H
 
 // Framework include files
-#include "DDG4/Geant4GeneratorAction.h"
-#include "DDG4/Geant4Primary.h"
+#include <DDG4/Geant4GeneratorAction.h>
+#include <DDG4/Geant4Primary.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4InteractionVertexSmear.h b/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
index b28c14660..c5af7c70b 100644
--- a/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
+++ b/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
@@ -25,10 +25,10 @@
 #define DDG4_GEANT4INTERACTIONVERTEXSMEAR_H
 
 // Framework include files
-#include "DDG4/Geant4GeneratorAction.h"
+#include <DDG4/Geant4GeneratorAction.h>
 
 // ROOT include files
-#include "Math/Vector4D.h"
+#include <Math/Vector4D.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4IsotropeGenerator.h b/DDG4/include/DDG4/Geant4IsotropeGenerator.h
index a16388de7..4b3857557 100644
--- a/DDG4/include/DDG4/Geant4IsotropeGenerator.h
+++ b/DDG4/include/DDG4/Geant4IsotropeGenerator.h
@@ -15,7 +15,7 @@
 #define DDG4_GEANT4ISOTROPEGENERATOR_H
 
 // Framework include files
-#include "DDG4/Geant4ParticleGenerator.h"
+#include <DDG4/Geant4ParticleGenerator.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4Mapping.h b/DDG4/include/DDG4/Geant4Mapping.h
index 45282b2a7..9004f7b86 100644
--- a/DDG4/include/DDG4/Geant4Mapping.h
+++ b/DDG4/include/DDG4/Geant4Mapping.h
@@ -14,11 +14,11 @@
 #define DDG4_GEANT4MAPPING_H
 
 // Framework include files
-#include "DD4hep/Detector.h"
-#include "DD4hep/Volumes.h"
-#include "DD4hep/GeoHandler.h"
-#include "DDG4/Geant4GeometryInfo.h"
-#include "DDG4/Geant4VolumeManager.h"
+#include <DD4hep/Detector.h>
+#include <DD4hep/Volumes.h>
+#include <DD4hep/GeoHandler.h>
+#include <DDG4/Geant4GeometryInfo.h>
+#include <DDG4/Geant4VolumeManager.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4MonteCarloTruth.h b/DDG4/include/DDG4/Geant4MonteCarloTruth.h
index 4693b6c71..737b20977 100644
--- a/DDG4/include/DDG4/Geant4MonteCarloTruth.h
+++ b/DDG4/include/DDG4/Geant4MonteCarloTruth.h
@@ -15,7 +15,7 @@
 #define DDG4_GEANT4MONTECARLOTRUTH_H
 
 // Framework include files
-#include "DDG4/Geant4Action.h"
+#include <DDG4/Geant4Action.h>
 
 // C/C++ include files
 #include <map>
diff --git a/DDG4/include/DDG4/Geant4Output2ROOT.h b/DDG4/include/DDG4/Geant4Output2ROOT.h
index 7cacc9cf5..9d937ec65 100644
--- a/DDG4/include/DDG4/Geant4Output2ROOT.h
+++ b/DDG4/include/DDG4/Geant4Output2ROOT.h
@@ -14,7 +14,7 @@
 #define DDG4_GEANT4OUTPUT2ROOT_H
 
 // Framework include files
-#include "DDG4/Geant4OutputAction.h"
+#include <DDG4/Geant4OutputAction.h>
 
 class TFile;
 class TTree;
diff --git a/DDG4/include/DDG4/Geant4Particle.h b/DDG4/include/DDG4/Geant4Particle.h
index bb4e2b12d..abc1be83b 100644
--- a/DDG4/include/DDG4/Geant4Particle.h
+++ b/DDG4/include/DDG4/Geant4Particle.h
@@ -17,7 +17,7 @@
 // Framework include files
 
 // ROOT includes
-#include "Math/Vector4D.h"
+#include <Math/Vector4D.h>
 
 // Geant4 forward declarations
 class G4ParticleDefinition;
diff --git a/DDG4/include/DDG4/Geant4ParticleGenerator.h b/DDG4/include/DDG4/Geant4ParticleGenerator.h
index 7810f8d2b..cdf65e62c 100644
--- a/DDG4/include/DDG4/Geant4ParticleGenerator.h
+++ b/DDG4/include/DDG4/Geant4ParticleGenerator.h
@@ -14,8 +14,8 @@
 #define DDG4_GEANT4PARTICLEGENERATOR_H
 
 // Framework include files
-#include "DDG4/Geant4GeneratorAction.h"
-#include "Math/Vector3D.h"
+#include <DDG4/Geant4GeneratorAction.h>
+#include <Math/Vector3D.h>
 
 // Forward declarations
 class G4ParticleDefinition;
diff --git a/DDG4/include/DDG4/Geant4ParticleGun.h b/DDG4/include/DDG4/Geant4ParticleGun.h
index db33baf63..d5b6f714a 100644
--- a/DDG4/include/DDG4/Geant4ParticleGun.h
+++ b/DDG4/include/DDG4/Geant4ParticleGun.h
@@ -24,7 +24,7 @@
 #define DDG4_GEANT4PARTICLEGUN_H
 
 // Framework include files
-#include "DDG4/Geant4IsotropeGenerator.h"
+#include <DDG4/Geant4IsotropeGenerator.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4ParticleHandler.h b/DDG4/include/DDG4/Geant4ParticleHandler.h
index 5b5fcd78d..11b5fbb12 100644
--- a/DDG4/include/DDG4/Geant4ParticleHandler.h
+++ b/DDG4/include/DDG4/Geant4ParticleHandler.h
@@ -25,9 +25,9 @@
 #define DDG4_GEANT4PARTICLEHANDLER_H
 
 // Framework include files
-#include "DDG4/Geant4Primary.h"
-#include "DDG4/Geant4GeneratorAction.h"
-#include "DDG4/Geant4MonteCarloTruth.h"
+#include <DDG4/Geant4Primary.h>
+#include <DDG4/Geant4GeneratorAction.h>
+#include <DDG4/Geant4MonteCarloTruth.h>
 
 // Forward declarations
 class G4Step;
diff --git a/DDG4/include/DDG4/Geant4ParticlePrint.h b/DDG4/include/DDG4/Geant4ParticlePrint.h
index 896409304..d23e16d52 100644
--- a/DDG4/include/DDG4/Geant4ParticlePrint.h
+++ b/DDG4/include/DDG4/Geant4ParticlePrint.h
@@ -15,9 +15,9 @@
 #define DDG4_GEANT4PARTICLEPRINT_H
 
 // Framework include files
-#include "DDG4/Geant4EventAction.h"
-#include "DDG4/Geant4GeneratorAction.h"
-#include "DDG4/Geant4Particle.h"
+#include <DDG4/Geant4EventAction.h>
+#include <DDG4/Geant4GeneratorAction.h>
+#include <DDG4/Geant4Particle.h>
 
 // Forward declarations
 class G4Event;
diff --git a/DDG4/include/DDG4/Geant4PhysicsConstructor.h b/DDG4/include/DDG4/Geant4PhysicsConstructor.h
index b3a045d8e..052fa9e86 100644
--- a/DDG4/include/DDG4/Geant4PhysicsConstructor.h
+++ b/DDG4/include/DDG4/Geant4PhysicsConstructor.h
@@ -17,11 +17,11 @@
 
 
 // Framework include files
-#include "DDG4/Geant4PhysicsList.h"
+#include <DDG4/Geant4PhysicsList.h>
 
 // Geant4 include files
-#include "G4ParticleTable.hh"
-#include "G4VPhysicsConstructor.hh"
+#include <G4ParticleTable.hh>
+#include <G4VPhysicsConstructor.hh>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4PlacementParameterisation.h b/DDG4/include/DDG4/Geant4PlacementParameterisation.h
index a4a1ed1d7..2788136d2 100644
--- a/DDG4/include/DDG4/Geant4PlacementParameterisation.h
+++ b/DDG4/include/DDG4/Geant4PlacementParameterisation.h
@@ -13,6 +13,7 @@
 #ifndef DDG4_GEANT4PLACEMENTPARAMETERISATION_H
 #define DDG4_GEANT4PLACEMENTPARAMETERISATION_H
 
+/// Framework include files
 #include <DD4hep/Volumes.h>
 
 /// Geant4 include files
diff --git a/DDG4/include/DDG4/Geant4Primary.h b/DDG4/include/DDG4/Geant4Primary.h
index cd80e972a..bc129d36a 100644
--- a/DDG4/include/DDG4/Geant4Primary.h
+++ b/DDG4/include/DDG4/Geant4Primary.h
@@ -15,9 +15,9 @@
 #define DDG4_GEANT4PRIMARY_H
 
 // Framework include files
-#include "DD4hep/Memory.h"
-#include "DDG4/Geant4Vertex.h"
-#include "DDG4/Geant4Particle.h"
+#include <DD4hep/Memory.h>
+#include <DDG4/Geant4Vertex.h>
+#include <DDG4/Geant4Particle.h>
 
 // C/C++ include files
 #include <set>
diff --git a/DDG4/include/DDG4/Geant4PrimaryHandler.h b/DDG4/include/DDG4/Geant4PrimaryHandler.h
index 73ae6a23d..d89c24197 100644
--- a/DDG4/include/DDG4/Geant4PrimaryHandler.h
+++ b/DDG4/include/DDG4/Geant4PrimaryHandler.h
@@ -25,8 +25,9 @@
 #define DDG4_GEANT4PRIMARYHANDLER_H
 
 // Framework include files
-#include "DDG4/Geant4GeneratorAction.h"
+#include <DDG4/Geant4GeneratorAction.h>
 
+// C/C++ include files
 #include <set>
 
 /// Namespace for the AIDA detector description toolkit
diff --git a/DDG4/include/DDG4/Geant4Primitives.h b/DDG4/include/DDG4/Geant4Primitives.h
index da6f1a252..2d684cb87 100644
--- a/DDG4/include/DDG4/Geant4Primitives.h
+++ b/DDG4/include/DDG4/Geant4Primitives.h
@@ -14,7 +14,7 @@
 #define DDG4_GEANT4PRIMITIVES_H
 
 // Framework include files
-#include "DD4hep/Primitives.h"
+#include <DD4hep/Primitives.h>
 
 /// Geant 4 forward declarations
 
diff --git a/DDG4/include/DDG4/Geant4Random.h b/DDG4/include/DDG4/Geant4Random.h
index 5c60d31a1..c04c5eb01 100644
--- a/DDG4/include/DDG4/Geant4Random.h
+++ b/DDG4/include/DDG4/Geant4Random.h
@@ -14,7 +14,7 @@
 #define DDG4_GEANT4RANDOM_H
 
 // Framework include files
-#include "DDG4/Geant4Action.h"
+#include <DDG4/Geant4Action.h>
 
 // C/C++ include files
 #include <string>
diff --git a/DDG4/include/DDG4/Geant4ReadoutVolumeFilter.h b/DDG4/include/DDG4/Geant4ReadoutVolumeFilter.h
index 5e5477819..39acfc9be 100644
--- a/DDG4/include/DDG4/Geant4ReadoutVolumeFilter.h
+++ b/DDG4/include/DDG4/Geant4ReadoutVolumeFilter.h
@@ -14,9 +14,9 @@
 #define DDG4_GEANT4READOUTVOLUMEFILTER_H
 
 // Framework include files
-#include "DD4hep/Readout.h"
-#include "DD4hep/IDDescriptor.h"
-#include "DDG4/Geant4SensDetAction.h"
+#include <DD4hep/Readout.h>
+#include <DD4hep/IDDescriptor.h>
+#include <DDG4/Geant4SensDetAction.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4RunAction.h b/DDG4/include/DDG4/Geant4RunAction.h
index 41d66e4de..8eb904d91 100644
--- a/DDG4/include/DDG4/Geant4RunAction.h
+++ b/DDG4/include/DDG4/Geant4RunAction.h
@@ -15,7 +15,7 @@
 #define DDG4_GEANT4RUNACTION_H
 
 // Framework include files
-#include "DDG4/Geant4Action.h"
+#include <DDG4/Geant4Action.h>
 
 // Forward declaration
 class G4Run;
diff --git a/DDG4/include/DDG4/Geant4StepHandler.h b/DDG4/include/DDG4/Geant4StepHandler.h
index 962fe750a..850d89cf2 100644
--- a/DDG4/include/DDG4/Geant4StepHandler.h
+++ b/DDG4/include/DDG4/Geant4StepHandler.h
@@ -17,12 +17,12 @@
 #include <DDG4/Geant4HitHandler.h>
 
 // Geant4 include files
-#include "G4Step.hh"
-#include "G4StepPoint.hh"
-#include "G4VTouchable.hh"
-#include "G4VSensitiveDetector.hh"
-#include "G4EmSaturation.hh"
-#include "G4Version.hh"
+#include <G4Step.hh>
+#include <G4StepPoint.hh>
+#include <G4VTouchable.hh>
+#include <G4VSensitiveDetector.hh>
+#include <G4EmSaturation.hh>
+#include <G4Version.hh>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4SteppingAction.h b/DDG4/include/DDG4/Geant4SteppingAction.h
index 199c85eff..2ba78d44f 100644
--- a/DDG4/include/DDG4/Geant4SteppingAction.h
+++ b/DDG4/include/DDG4/Geant4SteppingAction.h
@@ -14,7 +14,7 @@
 #define DDG4_GEANT4STEPPINGACTION_H
 
 // Framework include files
-#include "DDG4/Geant4Action.h"
+#include <DDG4/Geant4Action.h>
 
 // Forward declarations
 class G4SteppingManager;
diff --git a/DDG4/include/DDG4/Geant4TestActions.h b/DDG4/include/DDG4/Geant4TestActions.h
index 06b3e67fe..f20adeada 100644
--- a/DDG4/include/DDG4/Geant4TestActions.h
+++ b/DDG4/include/DDG4/Geant4TestActions.h
@@ -14,16 +14,16 @@
 #define DDG4_GEANT4TESTACTIONS_H
 
 // Framework include files
-#include "DDG4/Geant4Handle.h"
-#include "DDG4/Geant4Kernel.h"
-#include "DDG4/Geant4GeneratorAction.h"
-#include "DDG4/Geant4RunAction.h"
-#include "DDG4/Geant4EventAction.h"
-#include "DDG4/Geant4TrackingAction.h"
-#include "DDG4/Geant4SteppingAction.h"
-#include "DDG4/Geant4StackingAction.h"
-#include "DDG4/Geant4ActionPhase.h"
-#include "DDG4/Geant4SensDetAction.h"
+#include <DDG4/Geant4Handle.h>
+#include <DDG4/Geant4Kernel.h>
+#include <DDG4/Geant4GeneratorAction.h>
+#include <DDG4/Geant4RunAction.h>
+#include <DDG4/Geant4EventAction.h>
+#include <DDG4/Geant4TrackingAction.h>
+#include <DDG4/Geant4SteppingAction.h>
+#include <DDG4/Geant4StackingAction.h>
+#include <DDG4/Geant4ActionPhase.h>
+#include <DDG4/Geant4SensDetAction.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4TrackHandler.h b/DDG4/include/DDG4/Geant4TrackHandler.h
index 658be560c..94d619b36 100644
--- a/DDG4/include/DDG4/Geant4TrackHandler.h
+++ b/DDG4/include/DDG4/Geant4TrackHandler.h
@@ -14,17 +14,18 @@
 #define DDG4_GEANT4TRACKHANDLER_H
 
 // Framework include files
-#include "DDG4/Defs.h"
+#include <DDG4/Defs.h>
 
 // Geant4 include files
-#include "G4Track.hh"
-#include "G4TrajectoryPoint.hh"
-#include "G4VTouchable.hh"
-#include "G4VSensitiveDetector.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4DynamicParticle.hh"
-#include "G4VProcess.hh"
+#include <G4Track.hh>
+#include <G4TrajectoryPoint.hh>
+#include <G4VTouchable.hh>
+#include <G4VSensitiveDetector.hh>
+#include <G4ParticleDefinition.hh>
+#include <G4DynamicParticle.hh>
+#include <G4VProcess.hh>
 
+// C/C++ include files
 #include <stdexcept>
 
 // Forward declarations
diff --git a/DDG4/include/DDG4/Geant4TrackInformation.h b/DDG4/include/DDG4/Geant4TrackInformation.h
index 0479617d8..6f801f0b9 100644
--- a/DDG4/include/DDG4/Geant4TrackInformation.h
+++ b/DDG4/include/DDG4/Geant4TrackInformation.h
@@ -15,7 +15,7 @@
 #define DDG4_GEANT4TRACKINFORMATION_H
 
 // Framework include files
-#include "G4VUserTrackInformation.hh"
+#include <G4VUserTrackInformation.hh>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4TrackingAction.h b/DDG4/include/DDG4/Geant4TrackingAction.h
index 34637d384..68f84e677 100644
--- a/DDG4/include/DDG4/Geant4TrackingAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingAction.h
@@ -14,8 +14,8 @@
 #define DDG4_GEANT4TRACKINGACTION_H
 
 // Framework include files
-#include "DDG4/Geant4Action.h"
-#include "G4VUserTrackInformation.hh"
+#include <DDG4/Geant4Action.h>
+#include <G4VUserTrackInformation.hh>
 
 class G4TrackingManager;
 class G4Track;
diff --git a/DDG4/include/DDG4/Geant4TrackingPostAction.h b/DDG4/include/DDG4/Geant4TrackingPostAction.h
index e9ccac73b..b4c81d1ff 100644
--- a/DDG4/include/DDG4/Geant4TrackingPostAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingPostAction.h
@@ -14,7 +14,7 @@
 #define DDG4_GEANT4TRACKINGPOSTACTION_H
 
 // Framework include files
-#include "DDG4/Geant4TrackingAction.h"
+#include <DDG4/Geant4TrackingAction.h>
 #include <vector>
 
 /// Namespace for the AIDA detector description toolkit
diff --git a/DDG4/include/DDG4/Geant4TrackingPreAction.h b/DDG4/include/DDG4/Geant4TrackingPreAction.h
index ea2971013..9a6f026b7 100644
--- a/DDG4/include/DDG4/Geant4TrackingPreAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingPreAction.h
@@ -14,7 +14,7 @@
 #define DDG4_GEANT4TRACKINGPREACTION_H
 
 // Framework include files
-#include "DDG4/Geant4TrackingAction.h"
+#include <DDG4/Geant4TrackingAction.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4UIManager.h b/DDG4/include/DDG4/Geant4UIManager.h
index 2bcfa4e2f..035b7669f 100644
--- a/DDG4/include/DDG4/Geant4UIManager.h
+++ b/DDG4/include/DDG4/Geant4UIManager.h
@@ -14,8 +14,8 @@
 #define DDG4_GEANT4UIMANAGER_H
 
 // Framework include files
-#include "DDG4/Geant4Call.h"
-#include "DDG4/Geant4Action.h"
+#include <DDG4/Geant4Call.h>
+#include <DDG4/Geant4Action.h>
 
 /// Forward declarations
 class G4VisManager;
diff --git a/DDG4/include/DDG4/Geant4UIMessenger.h b/DDG4/include/DDG4/Geant4UIMessenger.h
index f7238b08f..4295328a4 100644
--- a/DDG4/include/DDG4/Geant4UIMessenger.h
+++ b/DDG4/include/DDG4/Geant4UIMessenger.h
@@ -15,10 +15,10 @@
 #define DDG4_GEANT4UIMESSENGER_H
 
 // Framework include files
-#include "DD4hep/ComponentProperties.h"
-#include "DD4hep/Callback.h"
-#include "G4UImessenger.hh"
-#include "G4UIdirectory.hh"
+#include <DD4hep/ComponentProperties.h>
+#include <DD4hep/Callback.h>
+#include <G4UImessenger.hh>
+#include <G4UIdirectory.hh>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4UserInitialization.h b/DDG4/include/DDG4/Geant4UserInitialization.h
index f7f843117..d62c088a2 100644
--- a/DDG4/include/DDG4/Geant4UserInitialization.h
+++ b/DDG4/include/DDG4/Geant4UserInitialization.h
@@ -14,7 +14,7 @@
 #define DDG4_GEANT4USERINITIALIZATION_H
 
 // Framework include files
-#include "DDG4/Geant4Action.h"
+#include <DDG4/Geant4Action.h>
 
 // Forward declarations
 
diff --git a/DDG4/include/DDG4/Geant4UserLimits.h b/DDG4/include/DDG4/Geant4UserLimits.h
index 80286fca2..a47ce543d 100644
--- a/DDG4/include/DDG4/Geant4UserLimits.h
+++ b/DDG4/include/DDG4/Geant4UserLimits.h
@@ -14,10 +14,10 @@
 #define DDG4_GEANT4USERLIMITS_H
 
 // Framework include files
-#include "DD4hep/Objects.h"
+#include <DD4hep/Objects.h>
 
 // Geant 4 include files
-#include "G4UserLimits.hh"
+#include <G4UserLimits.hh>
 
 // Forward declarations
 class G4ParticleDefinition;
diff --git a/DDG4/include/DDG4/Geant4UserParticleHandler.h b/DDG4/include/DDG4/Geant4UserParticleHandler.h
index 78ec381e5..225968b4b 100644
--- a/DDG4/include/DDG4/Geant4UserParticleHandler.h
+++ b/DDG4/include/DDG4/Geant4UserParticleHandler.h
@@ -26,8 +26,8 @@
 #define DDG4_GEANT4USERPARTICLEHANDLER_H
 
 // Framework include files
-#include "DDG4/Geant4Data.h"
-#include "DDG4/Geant4Action.h"
+#include <DDG4/Geant4Data.h>
+#include <DDG4/Geant4Action.h>
 
 // Forward declarations
 class G4Step;
diff --git a/DDG4/include/DDG4/Python/DDPython.h b/DDG4/include/DDG4/Python/DDPython.h
index fdd182ca2..0697ba820 100644
--- a/DDG4/include/DDG4/Python/DDPython.h
+++ b/DDG4/include/DDG4/Python/DDPython.h
@@ -18,7 +18,7 @@
 #include <string>
 
 // ROOT include file(s)
-#include "TPyReturn.h"
+#include <TPyReturn.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep  {
diff --git a/DDG4/include/DDG4/Python/Geant4PythonAction.h b/DDG4/include/DDG4/Python/Geant4PythonAction.h
index 2e2927ec6..841be557b 100644
--- a/DDG4/include/DDG4/Python/Geant4PythonAction.h
+++ b/DDG4/include/DDG4/Python/Geant4PythonAction.h
@@ -15,8 +15,8 @@
 #define DDG4_PYTHON_GEANT4PYTHONACTION_H
 
 // Framework include files
-#include "DDG4/Geant4Action.h"
-#include "TPyReturn.h"
+#include <DDG4/Geant4Action.h>
+#include <TPyReturn.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Python/Geant4PythonCall.h b/DDG4/include/DDG4/Python/Geant4PythonCall.h
index 3bb3da60b..290c16833 100644
--- a/DDG4/include/DDG4/Python/Geant4PythonCall.h
+++ b/DDG4/include/DDG4/Python/Geant4PythonCall.h
@@ -15,7 +15,7 @@
 #define DDG4_PYTHON_GEANT4PYTHONCALL_H
 
 // ROOT include files
-#include "TPyReturn.h"
+#include <TPyReturn.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Python/Geant4PythonDetectorConstruction.h b/DDG4/include/DDG4/Python/Geant4PythonDetectorConstruction.h
index d9eeb088f..e87d5941c 100644
--- a/DDG4/include/DDG4/Python/Geant4PythonDetectorConstruction.h
+++ b/DDG4/include/DDG4/Python/Geant4PythonDetectorConstruction.h
@@ -15,8 +15,8 @@
 #define DDG4_PYTHON_GEANT4PYTHONDETECTORCONSTRUCTION_H
 
 // Framework include files
-#include "DDG4/Geant4DetectorConstruction.h"
-#include "DDG4/Python/Geant4PythonCall.h"
+#include <DDG4/Geant4DetectorConstruction.h>
+#include <DDG4/Python/Geant4PythonCall.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Python/Geant4PythonInitialization.h b/DDG4/include/DDG4/Python/Geant4PythonInitialization.h
index 741b7e30f..09ff5f527 100644
--- a/DDG4/include/DDG4/Python/Geant4PythonInitialization.h
+++ b/DDG4/include/DDG4/Python/Geant4PythonInitialization.h
@@ -15,8 +15,8 @@
 #define DDG4_PYTHON_GEANT4PYTHONINITIALIZATION_H
 
 // Framework include files
-#include "DDG4/Geant4UserInitialization.h"
-#include "DDG4/Python/Geant4PythonCall.h"
+#include <DDG4/Geant4UserInitialization.h>
+#include <DDG4/Python/Geant4PythonCall.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/lcio/Geant4Output2LCIO.cpp b/DDG4/lcio/Geant4Output2LCIO.cpp
index 069b86600..d2bdc78de 100644
--- a/DDG4/lcio/Geant4Output2LCIO.cpp
+++ b/DDG4/lcio/Geant4Output2LCIO.cpp
@@ -15,24 +15,24 @@
 #define DD4HEP_DDG4_GEANT4OUTPUT2LCIO_H
 
 // Framework include files
-#include "DD4hep/VolumeManager.h"
-#include "DDG4/Geant4OutputAction.h"
+#include <DD4hep/VolumeManager.h>
+#include <DDG4/Geant4OutputAction.h>
 
-#include "DDG4/EventParameters.h"
-#include "DDG4/RunParameters.h"
+#include <DDG4/EventParameters.h>
+#include <DDG4/RunParameters.h>
 // Geant4 headers
-#include "G4Threading.hh"
-#include "G4AutoLock.hh"
+#include <G4Threading.hh>
+#include <G4AutoLock.hh>
 
-#include "DD4hep/Detector.h"
+#include <DD4hep/Detector.h>
 #include <G4Version.hh>
 
 // lcio include files
-#include "lcio.h"
-#include "IO/LCWriter.h"
-#include "IMPL/LCEventImpl.h"
-#include "IMPL/LCCollectionVec.h"
-#include "EVENT/LCParameters.h"
+#include <lcio.h>
+#include <IO/LCWriter.h>
+#include <IMPL/LCEventImpl.h>
+#include <IMPL/LCCollectionVec.h>
+#include <EVENT/LCParameters.h>
 
 using namespace lcio ;
 
@@ -170,30 +170,30 @@ namespace dd4hep {
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/InstanceCount.h"
-#include "DD4hep/Detector.h"
-#include "DDG4/Geant4HitCollection.h"
-#include "DDG4/Geant4DataConversion.h"
-#include "DDG4/Geant4Context.h"
-#include "DDG4/Geant4Particle.h"
-#include "DDG4/Geant4Data.h"
-#include "DDG4/Geant4Action.h"
-
-//#include "DDG4/Geant4Output2LCIO.h"
-#include "G4ParticleDefinition.hh"
-#include "G4VProcess.hh"
-#include "G4Event.hh"
-#include "G4Run.hh"
+#include <DD4hep/InstanceCount.h>
+#include <DD4hep/Detector.h>
+#include <DDG4/Geant4HitCollection.h>
+#include <DDG4/Geant4DataConversion.h>
+#include <DDG4/Geant4Context.h>
+#include <DDG4/Geant4Particle.h>
+#include <DDG4/Geant4Data.h>
+#include <DDG4/Geant4Action.h>
+
+//#include <DDG4/Geant4Output2LCIO.h>
+#include <G4ParticleDefinition.hh>
+#include <G4VProcess.hh>
+#include <G4Event.hh>
+#include <G4Run.hh>
 
 // LCIO include files
-#include "IMPL/LCEventImpl.h"
-#include "IMPL/LCRunHeaderImpl.h"
-#include "IMPL/LCCollectionVec.h"
-#include "IMPL/ClusterImpl.h"
-#include "IMPL/SimTrackerHitImpl.h"
-#include "IMPL/SimCalorimeterHitImpl.h"
-#include "IMPL/MCParticleImpl.h"
-#include "UTIL/ILDConf.h"
+#include <IMPL/LCEventImpl.h>
+#include <IMPL/LCRunHeaderImpl.h>
+#include <IMPL/LCCollectionVec.h>
+#include <IMPL/ClusterImpl.h>
+#include <IMPL/SimTrackerHitImpl.h>
+#include <IMPL/SimCalorimeterHitImpl.h>
+#include <IMPL/MCParticleImpl.h>
+#include <UTIL/ILDConf.h>
 
 using namespace dd4hep::sim;
 using namespace dd4hep;
@@ -202,7 +202,7 @@ namespace {
   G4Mutex action_mutex=G4MUTEX_INITIALIZER;
 }
 
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 DECLARE_GEANT4ACTION(Geant4Output2LCIO)
 
 /// Standard constructor
diff --git a/DDG4/lcio/LCIOConversions.cpp b/DDG4/lcio/LCIOConversions.cpp
index 5bbbd7acc..a697882ec 100644
--- a/DDG4/lcio/LCIOConversions.cpp
+++ b/DDG4/lcio/LCIOConversions.cpp
@@ -13,29 +13,29 @@
 
 // Framework include files
 #define DDG4_MAKE_INSTANTIATIONS
-#include "DD4hep/Detector.h"
-#include "DD4hep/Printout.h"
-#include "DDG4/Geant4HitCollection.h"
-#include "DDG4/Geant4DataConversion.h"
-#include "DDG4/Geant4SensDetAction.h"
-#include "DDG4/Geant4Context.h"
-#include "DDG4/Geant4Primary.h"
-#include "DDG4/Geant4Data.h"
+#include <DD4hep/Detector.h>
+#include <DD4hep/Printout.h>
+#include <DDG4/Geant4HitCollection.h>
+#include <DDG4/Geant4DataConversion.h>
+#include <DDG4/Geant4SensDetAction.h>
+#include <DDG4/Geant4Context.h>
+#include <DDG4/Geant4Primary.h>
+#include <DDG4/Geant4Data.h>
 
 // LCIO includes
-#include "lcio.h"
-#include "IMPL/LCCollectionVec.h"
+#include <lcio.h>
+#include <IMPL/LCCollectionVec.h>
 //
-#include "IMPL/LCEventImpl.h"
-#include "IMPL/ClusterImpl.h"
-#include "IMPL/SimTrackerHitImpl.h"
-#include "IMPL/SimCalorimeterHitImpl.h"
-#include "IMPL/MCParticleImpl.h"
+#include <IMPL/LCEventImpl.h>
+#include <IMPL/ClusterImpl.h>
+#include <IMPL/SimTrackerHitImpl.h>
+#include <IMPL/SimCalorimeterHitImpl.h>
+#include <IMPL/MCParticleImpl.h>
 //
-#include "UTIL/Operators.h"
-#include "UTIL/ILDConf.h"
+#include <UTIL/Operators.h>
+#include <UTIL/ILDConf.h>
 
-#include "CLHEP/Units/SystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 
 using namespace std;
 using namespace lcio ;
diff --git a/DDG4/lcio/LCIOEventReader.cpp b/DDG4/lcio/LCIOEventReader.cpp
index 4903cd263..e919ab9d1 100644
--- a/DDG4/lcio/LCIOEventReader.cpp
+++ b/DDG4/lcio/LCIOEventReader.cpp
@@ -14,16 +14,16 @@
 
 // Framework include files
 #include "LCIOEventReader.h"
-#include "DD4hep/Printout.h"
-#include "DDG4/Geant4Primary.h"
-#include "DDG4/Geant4Context.h"
-#include "DDG4/Factories.h"
+#include <DD4hep/Printout.h>
+#include <DDG4/Geant4Primary.h>
+#include <DDG4/Geant4Context.h>
+#include <DDG4/Factories.h>
 
-#include "G4ParticleTable.hh"
-#include "EVENT/MCParticle.h"
-#include "EVENT/LCCollection.h"
+#include <G4ParticleTable.hh>
+#include <EVENT/MCParticle.h>
+#include <EVENT/LCCollection.h>
 
-#include "G4Event.hh"
+#include <G4Event.hh>
 
 using namespace std;
 using namespace dd4hep;
diff --git a/DDG4/lcio/LCIOEventReader.h b/DDG4/lcio/LCIOEventReader.h
index 290d09839..7d15e17fe 100644
--- a/DDG4/lcio/LCIOEventReader.h
+++ b/DDG4/lcio/LCIOEventReader.h
@@ -14,7 +14,7 @@
 #define DDG4_LCIO_LCIOEVENTREADER_H
 
 // Framework include files
-#include "DDG4/Geant4InputAction.h"
+#include <DDG4/Geant4InputAction.h>
 
 // Forward declarations
 namespace EVENT { class LCCollection;    }
diff --git a/DDG4/lcio/LCIOFileReader.cpp b/DDG4/lcio/LCIOFileReader.cpp
index 93b55a547..311395063 100644
--- a/DDG4/lcio/LCIOFileReader.cpp
+++ b/DDG4/lcio/LCIOFileReader.cpp
@@ -27,9 +27,9 @@
 // Framework include files
 #include "LCIOEventReader.h"
 
-#include "DDG4/EventParameters.h"
+#include <DDG4/EventParameters.h>
 
-#include "lcio.h"
+#include <lcio.h>
 
 using namespace lcio ;
 
@@ -93,9 +93,9 @@ namespace dd4hep  {
 }
 #endif // DD4HEP_DDG4_LCIOFILEREADER_H
 
-#include "DD4hep/Printout.h"
-#include "DDG4/Factories.h"
-#include "UTIL/ILDConf.h"
+#include <DD4hep/Printout.h>
+#include <DDG4/Factories.h>
+#include <UTIL/ILDConf.h>
 
 using namespace dd4hep::sim;
 
diff --git a/DDG4/lcio/LCIOSDTestActions.cpp b/DDG4/lcio/LCIOSDTestActions.cpp
index b47e48ceb..1102a6759 100644
--- a/DDG4/lcio/LCIOSDTestActions.cpp
+++ b/DDG4/lcio/LCIOSDTestActions.cpp
@@ -12,20 +12,20 @@
 //==========================================================================
 
 // Framework include files
-#include "Exceptions.h"
-#include "IMPL/LCCollectionVec.h"
-#include "IMPL/SimTrackerHitImpl.h"
-#include "IMPL/SimCalorimeterHitImpl.h"
-#include "IMPL/MCParticleImpl.h"
-#include "UTIL/Operators.h"
-#include "UTIL/ILDConf.h"
+#include <Exceptions.h>
+#include <IMPL/LCCollectionVec.h>
+#include <IMPL/SimTrackerHitImpl.h>
+#include <IMPL/SimCalorimeterHitImpl.h>
+#include <IMPL/MCParticleImpl.h>
+#include <UTIL/Operators.h>
+#include <UTIL/ILDConf.h>
 
-#include "DDG4/Geant4SensDetAction.h"
-#include "DDG4/Geant4Data.h"
-#include "DDG4/Geant4StepHandler.h"
+#include <DDG4/Geant4SensDetAction.h>
+#include <DDG4/Geant4Data.h>
+#include <DDG4/Geant4StepHandler.h>
 
-#include "DD4hep/Printout.h"
-#include "DD4hep/InstanceCount.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/InstanceCount.h>
 
 using namespace dd4hep::sim;
 using namespace dd4hep;
@@ -159,5 +159,5 @@ namespace  Tests {
   typedef Geant4SensitiveAction<LcioTestTracker> LcioTestTrackerAction;
 } // namespace
 
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 DECLARE_GEANT4SENSITIVE_NS(Tests,LcioTestTrackerAction)
diff --git a/DDG4/lcio/LCIOStdHepReader.cpp b/DDG4/lcio/LCIOStdHepReader.cpp
index 167a24519..1351a92da 100644
--- a/DDG4/lcio/LCIOStdHepReader.cpp
+++ b/DDG4/lcio/LCIOStdHepReader.cpp
@@ -25,7 +25,7 @@
 #define DD4HEP_DDG4_LCIOSTDHEPREADER_H
 
 // LCIO include files
-#include "UTIL/LCStdHepRdr.h"
+#include <UTIL/LCStdHepRdr.h>
 
 // Framework include files
 #include "LCIOEventReader.h"
@@ -76,7 +76,7 @@ namespace dd4hep  {
 //==========================================================================
 
 // Framework include files
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 
 // Factory entry
 DECLARE_GEANT4_EVENT_READER_NS(dd4hep::sim,LCIOStdHepReader)
diff --git a/DDG4/plugins/Geant4.9.PhysicsConstructors.h b/DDG4/plugins/Geant4.9.PhysicsConstructors.h
index 9a596ba62..601a4ff4a 100644
--- a/DDG4/plugins/Geant4.9.PhysicsConstructors.h
+++ b/DDG4/plugins/Geant4.9.PhysicsConstructors.h
@@ -15,144 +15,144 @@
 //==========================================================================
 
 // EM physics
-#include "G4EmStandardPhysics_option1.hh"
+#include <G4EmStandardPhysics_option1.hh>
 DECLARE_GEANT4_PHYSICS(G4EmStandardPhysics_option1)
-#include "G4EmStandardPhysics_option2.hh"
+#include <G4EmStandardPhysics_option2.hh>
 DECLARE_GEANT4_PHYSICS(G4EmStandardPhysics_option2)
-#include "G4EmStandardPhysics_option3.hh"
+#include <G4EmStandardPhysics_option3.hh>
 DECLARE_GEANT4_PHYSICS(G4EmStandardPhysics_option3)
-#include "G4EmStandardPhysics.hh"
+#include <G4EmStandardPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4EmStandardPhysics)
-#include "G4EmExtraPhysics.hh"
+#include <G4EmExtraPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4EmExtraPhysics)
-#include "G4EmLivermorePhysics.hh"
+#include <G4EmLivermorePhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4EmLivermorePhysics)
 
 // Ion and hadrons
-#include "G4IonBinaryCascadePhysics.hh"
+#include <G4IonBinaryCascadePhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4IonBinaryCascadePhysics)
 
 #if G4VERSION_NUMBER<=960
-#include "G4IonINCLXXPhysics.hh"
+#include <G4IonINCLXXPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4IonINCLXXPhysics)
-#include "G4IonLHEPPhysics.hh"
+#include <G4IonLHEPPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4IonLHEPPhysics)
 #endif
 
-#include "G4IonPhysics.hh"
+#include <G4IonPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4IonPhysics)
-#include "G4IonQMDPhysics.hh"
+#include <G4IonQMDPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4IonQMDPhysics)
-#include "G4LHEPStoppingPhysics.hh"
+#include <G4LHEPStoppingPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4LHEPStoppingPhysics)
-#include "G4QStoppingPhysics.hh"
+#include <G4QStoppingPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4QStoppingPhysics)
-#include "G4HadronElasticPhysics.hh"
+#include <G4HadronElasticPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4HadronElasticPhysics)
-#include "G4HadronDElasticPhysics.hh"
+#include <G4HadronDElasticPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4HadronDElasticPhysics)
-#include "G4HadronElasticPhysicsHP.hh"
+#include <G4HadronElasticPhysicsHP.hh>
 DECLARE_GEANT4_PHYSICS(G4HadronElasticPhysicsHP)
-#include "G4HadronElasticPhysicsLEND.hh"
+#include <G4HadronElasticPhysicsLEND.hh>
 DECLARE_GEANT4_PHYSICS(G4HadronElasticPhysicsLEND)
-#include "G4HadronElasticPhysicsLHEP.hh"
+#include <G4HadronElasticPhysicsLHEP.hh>
 DECLARE_GEANT4_PHYSICS(G4HadronElasticPhysicsLHEP)
-#include "G4HadronElasticPhysicsXS.hh"
+#include <G4HadronElasticPhysicsXS.hh>
 DECLARE_GEANT4_PHYSICS(G4HadronElasticPhysicsXS)
-#include "G4HadronHElasticPhysics.hh"
+#include <G4HadronHElasticPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4HadronHElasticPhysics)
-#include "G4HadronQElasticPhysics.hh"
+#include <G4HadronQElasticPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4HadronQElasticPhysics)
-#include "G4NeutronTrackingCut.hh"
+#include <G4NeutronTrackingCut.hh>
 DECLARE_GEANT4_PHYSICS(G4NeutronTrackingCut)
 
 // Optical physics
-#include "G4OpticalPhysics.hh"
+#include <G4OpticalPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4OpticalPhysics)
 
-#include "G4QAtomicPhysics.hh"
+#include <G4QAtomicPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4QAtomicPhysics)
-#include "G4QCaptureAtRestPhysics.hh"
+#include <G4QCaptureAtRestPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4QCaptureAtRestPhysics)
-#include "G4QElasticPhysics.hh"
+#include <G4QElasticPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4QElasticPhysics)
-#include "G4QEmExtraPhysics.hh"
+#include <G4QEmExtraPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4QEmExtraPhysics)
-#include "G4QNeutrinoPhysics.hh"
+#include <G4QNeutrinoPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4QNeutrinoPhysics)
-#include "G4QStoppingPhysics.hh"
+#include <G4QStoppingPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4QStoppingPhysics)
-#include "G4QIonPhysics.hh"
+#include <G4QIonPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4QIonPhysics)
-#include "G4RadioactiveDecayPhysics.hh"
+#include <G4RadioactiveDecayPhysics.hh>
 DECLARE_GEANT4_PHYSICS(G4RadioactiveDecayPhysics)
 
 // LHEP hadrons
-#include "HadronPhysicsLHEP.hh"
+#include <HadronPhysicsLHEP.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsLHEP)
 
 // QGSP hadrons
-#include "HadronPhysicsQGSP.hh"
+#include <HadronPhysicsQGSP.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP)
-#include "HadronPhysicsQGSP_BERT.hh"
+#include <HadronPhysicsQGSP_BERT.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT)
-#include "HadronPhysicsQGSP_BERT_HP.hh"
+#include <HadronPhysicsQGSP_BERT_HP.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT_HP)
-#include "HadronPhysicsQGSP_BERT_CHIPS.hh"
+#include <HadronPhysicsQGSP_BERT_CHIPS.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT_CHIPS)
-#include "HadronPhysicsQGSP_FTFP_BERT.hh"
+#include <HadronPhysicsQGSP_FTFP_BERT.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_FTFP_BERT)
 
 // FTFP hadrons
-#include "HadronPhysicsFTFP_BERT.hh"
+#include <HadronPhysicsFTFP_BERT.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsFTFP_BERT)
 
 #if G4VERSION_NUMBER<=960
-#include "HadronPhysicsQGSP_INCLXX.hh"
+#include <HadronPhysicsQGSP_INCLXX.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_INCLXX)
-#include "HadronPhysicsFTFP_BERT.hh"
+#include <HadronPhysicsFTFP_BERT.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsFTFP_BERT)
-#include "HadronPhysicsFTFP_BERT_HP.hh"
+#include <HadronPhysicsFTFP_BERT_HP.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsFTFP_BERT_HP)
-#include "HadronPhysicsQGSP_BERT_95.hh"
+#include <HadronPhysicsQGSP_BERT_95.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT_95)
-#include "HadronPhysicsQGSP_FTFP_BERT_95.hh"
+#include <HadronPhysicsQGSP_FTFP_BERT_95.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_FTFP_BERT_95)
 #endif
 
-#include "HadronPhysicsCHIPS.hh"
+#include <HadronPhysicsCHIPS.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsCHIPS)
-#include "HadronPhysicsFTF_BIC.hh"
+#include <HadronPhysicsFTF_BIC.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsFTF_BIC)
-#include "HadronPhysicsFTFP_BERT_TRV.hh"
+#include <HadronPhysicsFTFP_BERT_TRV.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsFTFP_BERT_TRV)
-#include "HadronPhysicsLHEP_EMV.hh"
+#include <HadronPhysicsLHEP_EMV.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsLHEP_EMV)
-#include "HadronPhysicsLHEP.hh"
+#include <HadronPhysicsLHEP.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsLHEP)
-#include "HadronPhysicsQGS_BIC.hh"
+#include <HadronPhysicsQGS_BIC.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGS_BIC)
-#include "HadronPhysicsQGSC_BERT.hh"
+#include <HadronPhysicsQGSC_BERT.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSC_BERT)
-#include "HadronPhysicsQGSC_CHIPS.hh"
+#include <HadronPhysicsQGSC_CHIPS.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSC_CHIPS)
-#include "HadronPhysicsQGSP_BERT_CHIPS.hh"
+#include <HadronPhysicsQGSP_BERT_CHIPS.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT_CHIPS)
-#include "HadronPhysicsQGSP_BERT.hh"
+#include <HadronPhysicsQGSP_BERT.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT)
-#include "HadronPhysicsQGSP_BERT_HP.hh"
+#include <HadronPhysicsQGSP_BERT_HP.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT_HP)
-#include "HadronPhysicsQGSP_BERT_NOLEP.hh"
+#include <HadronPhysicsQGSP_BERT_NOLEP.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT_NOLEP)
-#include "HadronPhysicsQGSP_BERT_TRV.hh"
+#include <HadronPhysicsQGSP_BERT_TRV.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT_TRV)
-#include "HadronPhysicsQGSP_BIC.hh"
+#include <HadronPhysicsQGSP_BIC.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BIC)
-#include "HadronPhysicsQGSP_BIC_HP.hh"
+#include <HadronPhysicsQGSP_BIC_HP.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BIC_HP)
-#include "HadronPhysicsQGSP_FTFP_BERT.hh"
+#include <HadronPhysicsQGSP_FTFP_BERT.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_FTFP_BERT)
-#include "HadronPhysicsQGSP.hh"
+#include <HadronPhysicsQGSP.hh>
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP)
 
 #endif
diff --git a/DDG4/plugins/Geant4CerenkovPhysics.cpp b/DDG4/plugins/Geant4CerenkovPhysics.cpp
index 0399dbf3e..eb7b9efbb 100644
--- a/DDG4/plugins/Geant4CerenkovPhysics.cpp
+++ b/DDG4/plugins/Geant4CerenkovPhysics.cpp
@@ -25,21 +25,21 @@
 #define DDG4_GEANT4CERENKOVPHYSICS_H 1
 
 /// Framework include files
-#include "DDG4/Geant4PhysicsList.h"
+#include <DDG4/Geant4PhysicsList.h>
 
 /// Geant4 include files
-#include "G4ParticleTableIterator.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleTypes.hh"
-#include "G4ParticleTable.hh"
-#include "G4ProcessManager.hh"
-#include "G4Version.hh"
+#include <G4ParticleTableIterator.hh>
+#include <G4ParticleDefinition.hh>
+#include <G4ParticleTypes.hh>
+#include <G4ParticleTable.hh>
+#include <G4ProcessManager.hh>
+#include <G4Version.hh>
 
 #if G4VERSION_NUMBER >= 1070
-#include "G4OpticalParameters.hh"
+#include <G4OpticalParameters.hh>
 #endif
 
-#include "G4Cerenkov.hh"
+#include <G4Cerenkov.hh>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
@@ -119,6 +119,6 @@ namespace dd4hep {
 }
 #endif   // DDG4_GEANT4CERENKOVPHYSICS_H
 
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 using namespace dd4hep::sim;
 DECLARE_GEANT4ACTION(Geant4CerenkovPhysics)
diff --git a/DDG4/plugins/Geant4DefaultRangeCut.cpp b/DDG4/plugins/Geant4DefaultRangeCut.cpp
index 47de5a7b1..798e99bd7 100644
--- a/DDG4/plugins/Geant4DefaultRangeCut.cpp
+++ b/DDG4/plugins/Geant4DefaultRangeCut.cpp
@@ -28,10 +28,10 @@
 #define DDG4_Geant4DefaultRangeCut_h 1
 
 // Framework include files
-#include "DDG4/Geant4PhysicsList.h"
+#include <DDG4/Geant4PhysicsList.h>
 
 // geant4
-#include "G4VUserPhysicsList.hh"
+#include <G4VUserPhysicsList.hh>
 
 
 /// Namespace for the AIDA detector description toolkit
@@ -75,6 +75,6 @@ namespace dd4hep {
 }
 #endif   // DDG4_Geant4DefaultRangeCut_h
 
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 using namespace dd4hep::sim;
 DECLARE_GEANT4ACTION(Geant4DefaultRangeCut)
diff --git a/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp b/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp
index b81de1075..8d79de9e5 100644
--- a/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp
+++ b/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp
@@ -118,7 +118,7 @@ namespace dd4hep {
 #include <G4Material.hh>
 #include <G4Version.hh>
 #include <G4VSolid.hh>
-#include "CLHEP/Units/SystemOfUnits.h"
+#include <CLHEP/Units/SystemOfUnits.h>
 
 #ifndef GEANT4_NO_GDML
 #include <G4GDMLParser.hh>
diff --git a/DDG4/plugins/Geant4EventSeed.cpp b/DDG4/plugins/Geant4EventSeed.cpp
index 3e253136d..1fdcead55 100644
--- a/DDG4/plugins/Geant4EventSeed.cpp
+++ b/DDG4/plugins/Geant4EventSeed.cpp
@@ -15,14 +15,14 @@
 #include "Geant4EventSeed.h"
 
 // Framework include files
-#include "DD4hep/InstanceCount.h"
-#include "DD4hep/Printout.h"
+#include <DD4hep/InstanceCount.h>
+#include <DD4hep/Printout.h>
 
-#include "DDG4/Geant4EventAction.h"
-#include "DDG4/Geant4Random.h"
-#include "DDG4/Factories.h"
+#include <DDG4/Geant4EventAction.h>
+#include <DDG4/Geant4Random.h>
+#include <DDG4/Factories.h>
 
-#include "CLHEP/Random/EngineFactory.h"
+#include <CLHEP/Random/EngineFactory.h>
 
 //Geant includes
 #include <G4Run.hh>
diff --git a/DDG4/plugins/Geant4EventSeed.h b/DDG4/plugins/Geant4EventSeed.h
index 4d0b7d170..85947f6bd 100644
--- a/DDG4/plugins/Geant4EventSeed.h
+++ b/DDG4/plugins/Geant4EventSeed.h
@@ -14,7 +14,7 @@
 #define DDG4_PLUGINS_GEANT4EVENTSEED_H
 
 // Framework include files
-#include "DDG4/Geant4RunAction.h"
+#include <DDG4/Geant4RunAction.h>
 
 // fallthrough only exists from c++17
 #if defined __has_cpp_attribute
diff --git a/DDG4/plugins/Geant4ExtraParticles.cpp b/DDG4/plugins/Geant4ExtraParticles.cpp
index c3533c71e..a686f5232 100644
--- a/DDG4/plugins/Geant4ExtraParticles.cpp
+++ b/DDG4/plugins/Geant4ExtraParticles.cpp
@@ -18,17 +18,17 @@
  */
 
 #include "Geant4ExtraParticles.h"
-#include "DDG4/Geant4PhysicsConstructor.h"
-#include "DDG4/Geant4Kernel.h"
-#include "DDG4/Factories.h"
+#include <DDG4/Geant4PhysicsConstructor.h>
+#include <DDG4/Geant4Kernel.h>
+#include <DDG4/Factories.h>
 
-#include "G4ParticleTable.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4PhysicalConstants.hh"
-#include "G4Version.hh"
+#include <G4ParticleTable.hh>
+#include <G4ParticleDefinition.hh>
+#include <G4PhysicalConstants.hh>
+#include <G4Version.hh>
 
-#include "CLHEP/Units/SystemOfUnits.h"
-#include "CLHEP/Units/PhysicalConstants.h"
+#include <CLHEP/Units/SystemOfUnits.h>
+#include <CLHEP/Units/PhysicalConstants.h>
 
 #include <fstream>
 #include <sstream>
diff --git a/DDG4/plugins/Geant4ExtraParticles.h b/DDG4/plugins/Geant4ExtraParticles.h
index 025319a52..c61400a1a 100644
--- a/DDG4/plugins/Geant4ExtraParticles.h
+++ b/DDG4/plugins/Geant4ExtraParticles.h
@@ -6,14 +6,14 @@
 #ifndef DDG4_PLUGINS_GEANT4EXTRAPARTICLES_H
 #define DDG4_PLUGINS_GEANT4EXTRAPARTICLES_H 1
 
-#include "DDG4/Geant4PhysicsConstructor.h"
+#include <DDG4/Geant4PhysicsConstructor.h>
 
 // geant4
-#include "G4ProcessManager.hh"
-#include "G4Decay.hh"
-#include "G4hIonisation.hh"
-#include "G4hMultipleScattering.hh"
-#include "G4ParticleTable.hh"
+#include <G4ProcessManager.hh>
+#include <G4Decay.hh>
+#include <G4hIonisation.hh>
+#include <G4hMultipleScattering.hh>
+#include <G4ParticleTable.hh>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/plugins/Geant4Factories.cpp b/DDG4/plugins/Geant4Factories.cpp
index 19aec6761..79a7e3dd7 100644
--- a/DDG4/plugins/Geant4Factories.cpp
+++ b/DDG4/plugins/Geant4Factories.cpp
@@ -12,121 +12,121 @@
 //==========================================================================
 
 // Framework include files
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 using namespace dd4hep::sim;
 
-#include "DDG4/Geant4Random.h"
+#include <DDG4/Geant4Random.h>
 DECLARE_GEANT4ACTION(Geant4Random)
 
-#include "DDG4/Geant4ActionPhase.h"
+#include <DDG4/Geant4ActionPhase.h>
 DECLARE_GEANT4ACTION(Geant4PhaseAction)
 
-#include "DDG4/Geant4RunAction.h"
+#include <DDG4/Geant4RunAction.h>
 DECLARE_GEANT4ACTION(Geant4SharedRunAction)
 DECLARE_GEANT4ACTION(Geant4RunActionSequence)
 
-#include "DDG4/Geant4EventAction.h"
+#include <DDG4/Geant4EventAction.h>
 DECLARE_GEANT4ACTION(Geant4SharedEventAction)
 DECLARE_GEANT4ACTION(Geant4EventActionSequence)
 
-#include "DDG4/Geant4SteppingAction.h"
+#include <DDG4/Geant4SteppingAction.h>
 DECLARE_GEANT4ACTION(Geant4SharedSteppingAction)
 DECLARE_GEANT4ACTION(Geant4SteppingActionSequence)
 
-#include "DDG4/Geant4TrackingAction.h"
+#include <DDG4/Geant4TrackingAction.h>
 DECLARE_GEANT4ACTION(Geant4SharedTrackingAction)
 DECLARE_GEANT4ACTION(Geant4TrackingActionSequence)
 
-#include "DDG4/Geant4StackingAction.h"
+#include <DDG4/Geant4StackingAction.h>
 DECLARE_GEANT4ACTION(Geant4SharedStackingAction)
 DECLARE_GEANT4ACTION(Geant4StackingActionSequence)
 
-#include "DDG4/Geant4GeneratorAction.h"
+#include <DDG4/Geant4GeneratorAction.h>
 DECLARE_GEANT4ACTION(Geant4SharedGeneratorAction)
 DECLARE_GEANT4ACTION(Geant4GeneratorActionSequence)
 
-#include "DDG4/Geant4PhysicsList.h"
+#include <DDG4/Geant4PhysicsList.h>
 DECLARE_GEANT4ACTION(Geant4PhysicsList)
 DECLARE_GEANT4ACTION(Geant4PhysicsListActionSequence)
 
-#include "DDG4/Geant4DetectorConstruction.h"
+#include <DDG4/Geant4DetectorConstruction.h>
 DECLARE_GEANT4ACTION(Geant4DetectorConstruction)
 DECLARE_GEANT4ACTION(Geant4DetectorConstructionSequence)
 
-#include "DDG4/Geant4SensDetAction.h"
+#include <DDG4/Geant4SensDetAction.h>
 DECLARE_GEANT4ACTION(Geant4SensDetActionSequence)
 
-#include "DDG4/Geant4UIManager.h"
+#include <DDG4/Geant4UIManager.h>
 DECLARE_GEANT4ACTION(Geant4UIManager)
 
-#include "DDG4/Geant4UserInitialization.h"
+#include <DDG4/Geant4UserInitialization.h>
 DECLARE_GEANT4ACTION(Geant4UserInitializationSequence)
 
-#include "DDG4/Geant4MonteCarloTruth.h"
+#include <DDG4/Geant4MonteCarloTruth.h>
 DECLARE_GEANT4ACTION(Geant4DummyTruthHandler)
 
-#include "DDG4/Geant4ParticleHandler.h"
+#include <DDG4/Geant4ParticleHandler.h>
 DECLARE_GEANT4ACTION(Geant4ParticleHandler)
 
-#include "DDG4/Geant4UserParticleHandler.h"
+#include <DDG4/Geant4UserParticleHandler.h>
 DECLARE_GEANT4ACTION(Geant4UserParticleHandler)
 
-#include "DDG4/Geant4ParticlePrint.h"
+#include <DDG4/Geant4ParticlePrint.h>
 DECLARE_GEANT4ACTION(Geant4ParticlePrint)
 
 //=============================
-#include "DDG4/Geant4TrackingPreAction.h"
+#include <DDG4/Geant4TrackingPreAction.h>
 DECLARE_GEANT4ACTION(Geant4TrackingPreAction)
 
-#include "DDG4/Geant4TrackingPostAction.h"
+#include <DDG4/Geant4TrackingPostAction.h>
 DECLARE_GEANT4ACTION(Geant4TrackingPostAction)
 
 //=============================
-#include "DDG4/Geant4OutputAction.h"
+#include <DDG4/Geant4OutputAction.h>
 DECLARE_GEANT4ACTION(Geant4OutputAction)
 
-#include "DDG4/Geant4Output2ROOT.h"
+#include <DDG4/Geant4Output2ROOT.h>
 DECLARE_GEANT4ACTION(Geant4Output2ROOT)
 
 //=============================
-#include "DDG4/Geant4ParticleGun.h"
+#include <DDG4/Geant4ParticleGun.h>
 DECLARE_GEANT4ACTION(Geant4ParticleGun)
 
 //=============================
-#include "DDG4/Geant4GeneratorActionInit.h"
+#include <DDG4/Geant4GeneratorActionInit.h>
 DECLARE_GEANT4ACTION(Geant4GeneratorActionInit)
 
 //=============================
-#include "DDG4/Geant4IsotropeGenerator.h"
+#include <DDG4/Geant4IsotropeGenerator.h>
 DECLARE_GEANT4ACTION(Geant4ParticleGenerator)
 DECLARE_GEANT4ACTION(Geant4IsotropeGenerator)
 
 //=============================
-#include "DDG4/Geant4InteractionVertexSmear.h"
+#include <DDG4/Geant4InteractionVertexSmear.h>
 DECLARE_GEANT4ACTION(Geant4InteractionVertexSmear)
 
 //=============================
-#include "DDG4/Geant4InteractionVertexBoost.h"
+#include <DDG4/Geant4InteractionVertexBoost.h>
 DECLARE_GEANT4ACTION(Geant4InteractionVertexBoost)
 
 //=============================
-#include "DDG4/Geant4InteractionMerger.h"
+#include <DDG4/Geant4InteractionMerger.h>
 DECLARE_GEANT4ACTION(Geant4InteractionMerger)
 
 //=============================
-#include "DDG4/Geant4PrimaryHandler.h"
+#include <DDG4/Geant4PrimaryHandler.h>
 DECLARE_GEANT4ACTION(Geant4PrimaryHandler)
 
 //=============================
-#include "DDG4/Geant4InputAction.h"
+#include <DDG4/Geant4InputAction.h>
 DECLARE_GEANT4ACTION(Geant4InputAction)
 
 //=============================
-#include "DDG4/Geant4GeneratorWrapper.h"
+#include <DDG4/Geant4GeneratorWrapper.h>
 DECLARE_GEANT4ACTION(Geant4GeneratorWrapper)
 
 //=============================
-#include "DDG4/Geant4TestActions.h"
+#include <DDG4/Geant4TestActions.h>
 namespace dd4hep {  namespace sim   {
     namespace Test {}
     //using namespace Test;
diff --git a/DDG4/plugins/Geant4FastPhysics.cpp b/DDG4/plugins/Geant4FastPhysics.cpp
index e083c5390..d75920375 100644
--- a/DDG4/plugins/Geant4FastPhysics.cpp
+++ b/DDG4/plugins/Geant4FastPhysics.cpp
@@ -117,5 +117,5 @@ void Geant4FastPhysics::constructPhysics(G4VModularPhysicsList* physics)    {
   this->info("Constructed and initialized Geant4 Fast Physics [G4FastSimulationPhysics].");
 }
 
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 DECLARE_GEANT4ACTION(Geant4FastPhysics)
diff --git a/DDG4/plugins/Geant4HitExtractor.cpp b/DDG4/plugins/Geant4HitExtractor.cpp
index 2aa069f3b..b1e8ab833 100644
--- a/DDG4/plugins/Geant4HitExtractor.cpp
+++ b/DDG4/plugins/Geant4HitExtractor.cpp
@@ -12,7 +12,7 @@
 //==========================================================================
 
 // Framework include files
-#include "DDG4/Geant4Data.h"
+#include <DDG4/Geant4Data.h>
 
 using namespace dd4hep::sim;
 
@@ -75,6 +75,6 @@ static void* _convertHitCollection(const char* source)  {
   return pv;
 }
 
-#include "DD4hep/Factories.h"
+#include <DD4hep/Factories.h>
 using namespace dd4hep::detail;
 DECLARE_CONSTRUCTOR(DDEve_DDG4CollectionAccess,_convertHitCollection)
diff --git a/DDG4/plugins/Geant4OpticalPhotonPhysics.cpp b/DDG4/plugins/Geant4OpticalPhotonPhysics.cpp
index 0964dca43..26a8d7e09 100644
--- a/DDG4/plugins/Geant4OpticalPhotonPhysics.cpp
+++ b/DDG4/plugins/Geant4OpticalPhotonPhysics.cpp
@@ -27,21 +27,21 @@
 #define DDG4_GEANT4OPTICALPHOTONPHYSICS_H 1
 
 // Framework include files
-#include "DDG4/Geant4PhysicsList.h"
+#include <DDG4/Geant4PhysicsList.h>
 
 /// Geant4 include files
-#include "G4OpAbsorption.hh"
-#include "G4OpRayleigh.hh"
-#include "G4OpMieHG.hh"
-#include "G4OpBoundaryProcess.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4ParticleTypes.hh"
-#include "G4ParticleTable.hh"
-#include "G4ProcessManager.hh"
-#include "G4Version.hh"
+#include <G4OpAbsorption.hh>
+#include <G4OpRayleigh.hh>
+#include <G4OpMieHG.hh>
+#include <G4OpBoundaryProcess.hh>
+#include <G4ParticleDefinition.hh>
+#include <G4ParticleTypes.hh>
+#include <G4ParticleTable.hh>
+#include <G4ProcessManager.hh>
+#include <G4Version.hh>
 
 #if G4VERSION_NUMBER >= 1070
-#include "G4OpticalParameters.hh"
+#include <G4OpticalParameters.hh>
 #endif
 
 /// Namespace for the AIDA detector description toolkit
@@ -117,6 +117,6 @@ namespace dd4hep {
 }
 #endif   // DDG4_GEANT4OPTICALPHOTONPHYSICS_H
 
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 using namespace dd4hep::sim;
 DECLARE_GEANT4ACTION(Geant4OpticalPhotonPhysics)
diff --git a/DDG4/plugins/Geant4P1ShowerModel.cpp b/DDG4/plugins/Geant4P1ShowerModel.cpp
index 03328b467..7db0f26fa 100644
--- a/DDG4/plugins/Geant4P1ShowerModel.cpp
+++ b/DDG4/plugins/Geant4P1ShowerModel.cpp
@@ -33,8 +33,8 @@
 #include <DDG4/Geant4Random.h>
 
 // Geant4 include files
-#include "G4Gamma.hh"
-#include "G4SystemOfUnits.hh"
+#include <G4Gamma.hh>
+#include <G4SystemOfUnits.hh>
 
 // C/C++ include files
 
diff --git a/DDG4/plugins/Geant4Particles.cpp b/DDG4/plugins/Geant4Particles.cpp
index 9e7712d77..943c2dc20 100644
--- a/DDG4/plugins/Geant4Particles.cpp
+++ b/DDG4/plugins/Geant4Particles.cpp
@@ -12,283 +12,283 @@
 //==========================================================================
 
 // Framework include files
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 
 // Geant4 include files
-#include "G4Version.hh"
+#include <G4Version.hh>
 
 // ---- Adjoint particles
-#include "G4AdjointAlpha.hh"
+#include <G4AdjointAlpha.hh>
 DECLARE_GEANT4_PARTICLE(G4AdjointAlpha)
-#include "G4AdjointDeuteron.hh"
+#include <G4AdjointDeuteron.hh>
 DECLARE_GEANT4_PARTICLE(G4AdjointDeuteron)
-#include "G4AdjointElectron.hh"
+#include <G4AdjointElectron.hh>
 DECLARE_GEANT4_PARTICLE(G4AdjointElectron)
-#include "G4AdjointGamma.hh"
+#include <G4AdjointGamma.hh>
 DECLARE_GEANT4_PARTICLE(G4AdjointGamma)
-#include "G4AdjointHe3.hh"
+#include <G4AdjointHe3.hh>
 DECLARE_GEANT4_PARTICLE(G4AdjointHe3)
-#include "G4AdjointPositron.hh"
+#include <G4AdjointPositron.hh>
 DECLARE_GEANT4_PARTICLE(G4AdjointPositron)
-#include "G4AdjointProton.hh"
+#include <G4AdjointProton.hh>
 DECLARE_GEANT4_PARTICLE(G4AdjointProton)
-#include "G4AdjointTriton.hh"
+#include <G4AdjointTriton.hh>
 DECLARE_GEANT4_PARTICLE(G4AdjointTriton)
 
 // ---- bosons
-#include "G4Geantino.hh"
+#include <G4Geantino.hh>
 DECLARE_GEANT4_PARTICLE(G4Geantino)
-#include "G4ChargedGeantino.hh"
+#include <G4ChargedGeantino.hh>
 DECLARE_GEANT4_PARTICLE(G4ChargedGeantino)
-#include "G4Gamma.hh"
+#include <G4Gamma.hh>
 DECLARE_GEANT4_PARTICLE(G4Gamma)
-#include "G4OpticalPhoton.hh"
+#include <G4OpticalPhoton.hh>
 DECLARE_GEANT4_PARTICLE(G4OpticalPhoton)
-#include "G4BosonConstructor.hh"
+#include <G4BosonConstructor.hh>
 DECLARE_GEANT4_PARTICLEGROUP(G4BosonConstructor)
 
 // ---- barions
-#include "G4XibZero.hh"
+#include <G4XibZero.hh>
 DECLARE_GEANT4_PARTICLE(G4XibZero)
-#include "G4SigmabPlus.hh"
+#include <G4SigmabPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4SigmabPlus)
-#include "G4Lambda.hh"
+#include <G4Lambda.hh>
 DECLARE_GEANT4_PARTICLE(G4Lambda)
-#include "G4Proton.hh"
+#include <G4Proton.hh>
 DECLARE_GEANT4_PARTICLE(G4Proton)
-#include "G4SigmabMinus.hh"
+#include <G4SigmabMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4SigmabMinus)
-#include "G4AntiXiMinus.hh"
+#include <G4AntiXiMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiXiMinus)
-#include "G4AntiSigmabMinus.hh"
+#include <G4AntiSigmabMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiSigmabMinus)
-#include "G4XiMinus.hh"
+#include <G4XiMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4XiMinus)
-#include "G4LambdacPlus.hh"
+#include <G4LambdacPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4LambdacPlus)
-#include "G4AntiOmegabMinus.hh"
+#include <G4AntiOmegabMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiOmegabMinus)
-#include "G4Neutron.hh"
+#include <G4Neutron.hh>
 DECLARE_GEANT4_PARTICLE(G4Neutron)
-#include "G4AntiXibZero.hh"
+#include <G4AntiXibZero.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiXibZero)
-#include "G4OmegacZero.hh"
+#include <G4OmegacZero.hh>
 DECLARE_GEANT4_PARTICLE(G4OmegacZero)
-#include "G4SigmacPlus.hh"
+#include <G4SigmacPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4SigmacPlus)
-#include "G4AntiXibMinus.hh"
+#include <G4AntiXibMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiXibMinus)
-#include "G4Lambdab.hh"
+#include <G4Lambdab.hh>
 DECLARE_GEANT4_PARTICLE(G4Lambdab)
-#include "G4AntiXicZero.hh"
+#include <G4AntiXicZero.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiXicZero)
-#include "G4AntiOmegacZero.hh"
+#include <G4AntiOmegacZero.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiOmegacZero)
-#include "G4AntiLambdacPlus.hh"
+#include <G4AntiLambdacPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiLambdacPlus)
-#include "G4AntiSigmaZero.hh"
+#include <G4AntiSigmaZero.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiSigmaZero)
-#include "G4AntiSigmaPlus.hh"
+#include <G4AntiSigmaPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiSigmaPlus)
-#include "G4SigmaZero.hh"
+#include <G4SigmaZero.hh>
 DECLARE_GEANT4_PARTICLE(G4SigmaZero)
-#include "G4AntiLambda.hh"
+#include <G4AntiLambda.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiLambda)
-#include "G4XiZero.hh"
+#include <G4XiZero.hh>
 DECLARE_GEANT4_PARTICLE(G4XiZero)
-#include "G4AntiSigmabZero.hh"
+#include <G4AntiSigmabZero.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiSigmabZero)
-#include "G4AntiSigmaMinus.hh"
+#include <G4AntiSigmaMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiSigmaMinus)
-#include "G4AntiProton.hh"
+#include <G4AntiProton.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiProton)
-#include "G4XicPlus.hh"
+#include <G4XicPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4XicPlus)
-#include "G4BaryonConstructor.hh"
+#include <G4BaryonConstructor.hh>
 DECLARE_GEANT4_PARTICLEGROUP(G4BaryonConstructor)
-#include "G4AntiSigmacPlusPlus.hh"
+#include <G4AntiSigmacPlusPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiSigmacPlusPlus)
-#include "G4XibMinus.hh"
+#include <G4XibMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4XibMinus)
-#include "G4AntiSigmabPlus.hh"
+#include <G4AntiSigmabPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiSigmabPlus)
-#include "G4AntiSigmacPlus.hh"
+#include <G4AntiSigmacPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiSigmacPlus)
-#include "G4SigmaMinus.hh"
+#include <G4SigmaMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4SigmaMinus)
-#include "G4SigmacPlusPlus.hh"
+#include <G4SigmacPlusPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4SigmacPlusPlus)
-#include "G4AntiXicPlus.hh"
+#include <G4AntiXicPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiXicPlus)
-#include "G4SigmabZero.hh"
+#include <G4SigmabZero.hh>
 DECLARE_GEANT4_PARTICLE(G4SigmabZero)
-#include "G4AntiXiZero.hh"
+#include <G4AntiXiZero.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiXiZero)
-#include "G4AntiOmegaMinus.hh"
+#include <G4AntiOmegaMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiOmegaMinus)
-#include "G4OmegabMinus.hh"
+#include <G4OmegabMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4OmegabMinus)
-#include "G4OmegaMinus.hh"
+#include <G4OmegaMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4OmegaMinus)
-#include "G4AntiSigmacZero.hh"
+#include <G4AntiSigmacZero.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiSigmacZero)
-#include "G4AntiNeutron.hh"
+#include <G4AntiNeutron.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiNeutron)
-#include "G4SigmaPlus.hh"
+#include <G4SigmaPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4SigmaPlus)
-#include "G4AntiLambdab.hh"
+#include <G4AntiLambdab.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiLambdab)
-#include "G4XicZero.hh"
+#include <G4XicZero.hh>
 DECLARE_GEANT4_PARTICLE(G4XicZero)
-#include "G4SigmacZero.hh"
+#include <G4SigmacZero.hh>
 DECLARE_GEANT4_PARTICLE(G4SigmacZero)
-#include "G4BaryonConstructor.hh"
+#include <G4BaryonConstructor.hh>
 DECLARE_GEANT4_PARTICLEGROUP(G4BaryonConstructor)
 
 // ---- ions
-#include "G4AntiHe3.hh"
+#include <G4AntiHe3.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiHe3)
-#include "G4Deuteron.hh"
+#include <G4Deuteron.hh>
 DECLARE_GEANT4_PARTICLE(G4Deuteron)
-#include "G4He3.hh"
+#include <G4He3.hh>
 DECLARE_GEANT4_PARTICLE(G4He3)
-#include "G4IonConstructor.hh"
+#include <G4IonConstructor.hh>
 DECLARE_GEANT4_PARTICLEGROUP(G4IonConstructor)
-#include "G4Alpha.hh"
+#include <G4Alpha.hh>
 DECLARE_GEANT4_PARTICLE(G4Alpha)
-#include "G4AntiAlpha.hh"
+#include <G4AntiAlpha.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiAlpha)
-#include "G4AntiTriton.hh"
+#include <G4AntiTriton.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiTriton)
-#include "G4GenericIon.hh"
+#include <G4GenericIon.hh>
 DECLARE_GEANT4_PARTICLE(G4GenericIon)
-#include "G4AntiDeuteron.hh"
+#include <G4AntiDeuteron.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiDeuteron)
-#include "G4Triton.hh"
+#include <G4Triton.hh>
 DECLARE_GEANT4_PARTICLE(G4Triton)
 
 // ---- mesons
-#include "G4Eta.hh"
+#include <G4Eta.hh>
 DECLARE_GEANT4_PARTICLE(G4Eta)
-#include "G4KaonMinus.hh"
+#include <G4KaonMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4KaonMinus)
-#include "G4KaonZeroLong.hh"
+#include <G4KaonZeroLong.hh>
 DECLARE_GEANT4_PARTICLE(G4KaonZeroLong)
-#include "G4DsMesonPlus.hh"
+#include <G4DsMesonPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4DsMesonPlus)
-#include "G4BMesonPlus.hh"
+#include <G4BMesonPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4BMesonPlus)
-#include "G4PionPlus.hh"
+#include <G4PionPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4PionPlus)
-#include "G4KaonZeroShort.hh"
+#include <G4KaonZeroShort.hh>
 DECLARE_GEANT4_PARTICLE(G4KaonZeroShort)
-#include "G4MesonConstructor.hh"
+#include <G4MesonConstructor.hh>
 DECLARE_GEANT4_PARTICLEGROUP(G4MesonConstructor)
-#include "G4DsMesonMinus.hh"
+#include <G4DsMesonMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4DsMesonMinus)
-#include "G4AntiBsMesonZero.hh"
+#include <G4AntiBsMesonZero.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiBsMesonZero)
-#include "G4DMesonZero.hh"
+#include <G4DMesonZero.hh>
 DECLARE_GEANT4_PARTICLE(G4DMesonZero)
-#include "G4AntiDMesonZero.hh"
+#include <G4AntiDMesonZero.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiDMesonZero)
-#include "G4BsMesonZero.hh"
+#include <G4BsMesonZero.hh>
 DECLARE_GEANT4_PARTICLE(G4BsMesonZero)
-#include "G4BMesonMinus.hh"
+#include <G4BMesonMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4BMesonMinus)
-#include "G4PionZero.hh"
+#include <G4PionZero.hh>
 DECLARE_GEANT4_PARTICLE(G4PionZero)
-#include "G4KaonPlus.hh"
+#include <G4KaonPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4KaonPlus)
-#include "G4DMesonMinus.hh"
+#include <G4DMesonMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4DMesonMinus)
-#include "G4BcMesonMinus.hh"
+#include <G4BcMesonMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4BcMesonMinus)
-#include "G4BMesonZero.hh"
+#include <G4BMesonZero.hh>
 DECLARE_GEANT4_PARTICLE(G4BMesonZero)
-#include "G4AntiKaonZero.hh"
+#include <G4AntiKaonZero.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiKaonZero)
-#include "G4EtaPrime.hh"
+#include <G4EtaPrime.hh>
 DECLARE_GEANT4_PARTICLE(G4EtaPrime)
 
 #if G4VERSION_NUMBER >= 1000
-#include "G4Upsilon.hh"
+#include <G4Upsilon.hh>
 DECLARE_GEANT4_PARTICLE(G4Upsilon)
 #else
-#include "G4Upsiron.hh"
+#include <G4Upsiron.hh>
 DECLARE_GEANT4_PARTICLE(G4Upsiron)
 #endif
 
-#include "G4AntiBMesonZero.hh"
+#include <G4AntiBMesonZero.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiBMesonZero)
-#include "G4JPsi.hh"
+#include <G4JPsi.hh>
 DECLARE_GEANT4_PARTICLE(G4JPsi)
-#include "G4KaonZero.hh"
+#include <G4KaonZero.hh>
 DECLARE_GEANT4_PARTICLE(G4KaonZero)
-#include "G4DMesonPlus.hh"
+#include <G4DMesonPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4DMesonPlus)
-#include "G4PionMinus.hh"
+#include <G4PionMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4PionMinus)
-#include "G4Etac.hh"
+#include <G4Etac.hh>
 DECLARE_GEANT4_PARTICLE(G4Etac)
-#include "G4BcMesonPlus.hh"
+#include <G4BcMesonPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4BcMesonPlus)
-#include "G4MesonConstructor.hh"
+#include <G4MesonConstructor.hh>
 DECLARE_GEANT4_PARTICLEGROUP(G4MesonConstructor)
 
 // ---- leptons
-#include "G4MuonPlus.hh"
+#include <G4MuonPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4MuonPlus)
-#include "G4TauPlus.hh"
+#include <G4TauPlus.hh>
 DECLARE_GEANT4_PARTICLE(G4TauPlus)
-#include "G4AntiNeutrinoTau.hh"
+#include <G4AntiNeutrinoTau.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiNeutrinoTau)
-#include "G4MuonMinus.hh"
+#include <G4MuonMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4MuonMinus)
-#include "G4NeutrinoE.hh"
+#include <G4NeutrinoE.hh>
 DECLARE_GEANT4_PARTICLE(G4NeutrinoE)
-#include "G4TauMinus.hh"
+#include <G4TauMinus.hh>
 DECLARE_GEANT4_PARTICLE(G4TauMinus)
-#include "G4Positron.hh"
+#include <G4Positron.hh>
 DECLARE_GEANT4_PARTICLE(G4Positron)
-#include "G4AntiNeutrinoMu.hh"
+#include <G4AntiNeutrinoMu.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiNeutrinoMu)
-#include "G4NeutrinoMu.hh"
+#include <G4NeutrinoMu.hh>
 DECLARE_GEANT4_PARTICLE(G4NeutrinoMu)
-#include "G4AntiNeutrinoE.hh"
+#include <G4AntiNeutrinoE.hh>
 DECLARE_GEANT4_PARTICLE(G4AntiNeutrinoE)
-#include "G4Electron.hh"
+#include <G4Electron.hh>
 DECLARE_GEANT4_PARTICLE(G4Electron)
-#include "G4NeutrinoTau.hh"
+#include <G4NeutrinoTau.hh>
 DECLARE_GEANT4_PARTICLE(G4NeutrinoTau)
-#include "G4LeptonConstructor.hh"
+#include <G4LeptonConstructor.hh>
 DECLARE_GEANT4_PARTICLEGROUP(G4LeptonConstructor)
 
 // ---- shortlived
-#include "G4ExcitedXiConstructor.hh"
+#include <G4ExcitedXiConstructor.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4ExcitedXiConstructor)
-#include "G4ExcitedLambdaConstructor.hh"
+#include <G4ExcitedLambdaConstructor.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4ExcitedLambdaConstructor)
-#include "G4ShortLivedConstructor.hh"
+#include <G4ShortLivedConstructor.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4ShortLivedConstructor)
-#include "G4ExcitedSigmaConstructor.hh"
+#include <G4ExcitedSigmaConstructor.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4ExcitedSigmaConstructor)
-#include "G4ExcitedBaryons.hh"
+#include <G4ExcitedBaryons.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4ExcitedBaryons)
-#include "G4DiQuarks.hh"
+#include <G4DiQuarks.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4DiQuarks)
-#include "G4VShortLivedParticle.hh"
+#include <G4VShortLivedParticle.hh>
 //DECLARE_GEANT4_PARTICLE(G4VShortLivedParticle)
-#include "G4Quarks.hh"
+#include <G4Quarks.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4Quarks)
-#include "G4ExcitedDeltaConstructor.hh"
+#include <G4ExcitedDeltaConstructor.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4ExcitedDeltaConstructor)
-#include "G4ExcitedBaryonConstructor.hh"
+#include <G4ExcitedBaryonConstructor.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4ExcitedBaryonConstructor)
-#include "G4ExcitedNucleonConstructor.hh"
+#include <G4ExcitedNucleonConstructor.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4ExcitedNucleonConstructor)
-#include "G4ExcitedMesonConstructor.hh"
+#include <G4ExcitedMesonConstructor.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4ExcitedMesonConstructor)
-#include "G4ExcitedMesons.hh"
+#include <G4ExcitedMesons.hh>
 //DECLARE_GEANT4_PARTICLEGROUP(G4ExcitedMesons)
 
diff --git a/DDG4/plugins/Geant4PhysicsConstructors.cpp b/DDG4/plugins/Geant4PhysicsConstructors.cpp
index 4182f73d7..10b0031eb 100644
--- a/DDG4/plugins/Geant4PhysicsConstructors.cpp
+++ b/DDG4/plugins/Geant4PhysicsConstructors.cpp
@@ -12,7 +12,7 @@
 //==========================================================================
 
 // Framework include files
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 
 // ==================================================================================
 // Predefined physics constructors
@@ -29,8 +29,8 @@
 // ==================================================================================
 
 // Geant4 physics lists
-#include "G4Version.hh"
-#include "G4DecayPhysics.hh"
+#include <G4Version.hh>
+#include <G4DecayPhysics.hh>
 
 // ==================================================================================
 #if G4VERSION_NUMBER>=960 and G4VERSION_NUMBER<1000
diff --git a/DDG4/plugins/Geant4PrimaryGenerators.cpp b/DDG4/plugins/Geant4PrimaryGenerators.cpp
index 3b003a9c0..0ac42abd5 100644
--- a/DDG4/plugins/Geant4PrimaryGenerators.cpp
+++ b/DDG4/plugins/Geant4PrimaryGenerators.cpp
@@ -12,13 +12,13 @@
 //==========================================================================
 
 // Framework include files
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 
 // Geant 4 include files
-#include "G4ParticleGun.hh"
-#include "G4SingleParticleSource.hh"
-#include "G4GeneralParticleSource.hh"
-#include "G4AdjointPrimaryGenerator.hh"
+#include <G4ParticleGun.hh>
+#include <G4SingleParticleSource.hh>
+#include <G4GeneralParticleSource.hh>
+#include <G4AdjointPrimaryGenerator.hh>
 
 DECLARE_GEANT4_GENERATOR(G4ParticleGun)
 DECLARE_GEANT4_GENERATOR(G4SingleParticleSource)
diff --git a/DDG4/plugins/Geant4Processes.cpp b/DDG4/plugins/Geant4Processes.cpp
index 74882258f..74476b211 100644
--- a/DDG4/plugins/Geant4Processes.cpp
+++ b/DDG4/plugins/Geant4Processes.cpp
@@ -39,249 +39,249 @@
 // ======================================================================
 
 // Fast simulation
-#include "G4FastSimulationManagerProcess.hh"
+#include <G4FastSimulationManagerProcess.hh>
 DECLARE_GEANT4_PROCESS(G4FastSimulationManagerProcess)
 
 // Photon Processes:
-#include "G4GammaConversion.hh"
+#include <G4GammaConversion.hh>
 DECLARE_GEANT4_PROCESS(G4GammaConversion)
-#include "G4PhotoElectricEffect.hh"
+#include <G4PhotoElectricEffect.hh>
 DECLARE_GEANT4_PROCESS(G4PhotoElectricEffect)
-#include "G4ComptonScattering.hh"
+#include <G4ComptonScattering.hh>
 DECLARE_GEANT4_PROCESS(G4ComptonScattering)
-#include "G4RayleighScattering.hh"
+#include <G4RayleighScattering.hh>
 DECLARE_GEANT4_PROCESS(G4RayleighScattering)
-#include "G4GammaConversionToMuons.hh"
+#include <G4GammaConversionToMuons.hh>
 DECLARE_GEANT4_PROCESS(G4GammaConversionToMuons)
 
 // Electron/positron processes
-#include "G4eIonisation.hh"
+#include <G4eIonisation.hh>
 DECLARE_GEANT4_PROCESS(G4eIonisation)
-#include "G4eBremsstrahlung.hh"
+#include <G4eBremsstrahlung.hh>
 DECLARE_GEANT4_PROCESS(G4eBremsstrahlung)
-#include "G4eMultipleScattering.hh"
+#include <G4eMultipleScattering.hh>
 DECLARE_GEANT4_PROCESS(G4eMultipleScattering)
-#include "G4eplusAnnihilation.hh"
+#include <G4eplusAnnihilation.hh>
 DECLARE_GEANT4_PROCESS(G4eplusAnnihilation)
-#include "G4AnnihiToMuPair.hh"
+#include <G4AnnihiToMuPair.hh>
 DECLARE_GEANT4_PROCESS(G4AnnihiToMuPair)
-#include "G4eeToHadrons.hh"
+#include <G4eeToHadrons.hh>
 DECLARE_GEANT4_PROCESS(G4eeToHadrons)
 
 // Muon processes
-#include "G4MuIonisation.hh"
+#include <G4MuIonisation.hh>
 DECLARE_GEANT4_PROCESS(G4MuIonisation)
-#include "G4MuBremsstrahlung.hh"
+#include <G4MuBremsstrahlung.hh>
 DECLARE_GEANT4_PROCESS(G4MuBremsstrahlung)
-#include "G4MuPairProduction.hh"
+#include <G4MuPairProduction.hh>
 DECLARE_GEANT4_PROCESS(G4MuPairProduction)
-#include "G4MuMultipleScattering.hh"
+#include <G4MuMultipleScattering.hh>
 DECLARE_GEANT4_PROCESS(G4MuMultipleScattering)
 
 // Hadron/ion processes
-#include "G4hIonisation.hh"
+#include <G4hIonisation.hh>
 DECLARE_GEANT4_PROCESS(G4hIonisation)
-#include "G4ionIonisation.hh"
+#include <G4ionIonisation.hh>
 DECLARE_GEANT4_PROCESS(G4ionIonisation)
-#include "G4hhIonisation.hh"
+#include <G4hhIonisation.hh>
 DECLARE_GEANT4_PROCESS(G4hhIonisation)
-#include "G4mplIonisation.hh"
+#include <G4mplIonisation.hh>
 DECLARE_GEANT4_PROCESS(G4mplIonisation)
-#include "G4hMultipleScattering.hh"
+#include <G4hMultipleScattering.hh>
 DECLARE_GEANT4_PROCESS(G4hMultipleScattering)
-#include "G4hBremsstrahlung.hh"
+#include <G4hBremsstrahlung.hh>
 DECLARE_GEANT4_PROCESS(G4hBremsstrahlung)
-#include "G4hPairProduction.hh"
+#include <G4hPairProduction.hh>
 DECLARE_GEANT4_PROCESS(G4hPairProduction)
 
 // Coulomb scattering
-#include "G4CoulombScattering.hh"
+#include <G4CoulombScattering.hh>
 DECLARE_GEANT4_PROCESS(G4CoulombScattering)
 
 // Processes for simulation of polarized electron and gamma beams
-#include "G4PolarizedCompton.hh"
+#include <G4PolarizedCompton.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedCompton)
-#include "G4PolarizedGammaConversion.hh"
+#include <G4PolarizedGammaConversion.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedGammaConversion)
-#include "G4ePairProduction.hh"
+#include <G4ePairProduction.hh>
 DECLARE_GEANT4_PROCESS(G4ePairProduction)
 
 #if G4VERSION_NUMBER < 1100
-#include "G4PolarizedPhotoElectricEffect.hh"
+#include <G4PolarizedPhotoElectricEffect.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedPhotoElectricEffect)
-#include "G4ePolarizedBremsstrahlung.hh"
+#include <G4ePolarizedBremsstrahlung.hh>
 DECLARE_GEANT4_PROCESS(G4ePolarizedBremsstrahlung)
-#include "G4ePolarizedIonisation.hh"
+#include <G4ePolarizedIonisation.hh>
 DECLARE_GEANT4_PROCESS(G4ePolarizedIonisation)
-#include "G4eplusPolarizedAnnihilation.hh"
+#include <G4eplusPolarizedAnnihilation.hh>
 DECLARE_GEANT4_PROCESS(G4eplusPolarizedAnnihilation)
 
 #else
-#include "G4PolarizedAnnihilation.hh"
+#include <G4PolarizedAnnihilation.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedAnnihilation)
-#include "G4PolarizedAnnihilationXS.hh"
+#include <G4PolarizedAnnihilationXS.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedAnnihilationXS)
-#include "G4PolarizedBremsstrahlung.hh"
+#include <G4PolarizedBremsstrahlung.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedBremsstrahlung)
-#include "G4PolarizedCompton.hh"
+#include <G4PolarizedCompton.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedCompton)
-#include "G4PolarizedComptonXS.hh"
+#include <G4PolarizedComptonXS.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedComptonXS)
-#include "G4PolarizedGammaConversion.hh"
+#include <G4PolarizedGammaConversion.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedGammaConversion)
-#include "G4PolarizedGammaConversionXS.hh"
+#include <G4PolarizedGammaConversionXS.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedGammaConversionXS)
-#include "G4PolarizedIonisation.hh"
+#include <G4PolarizedIonisation.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedIonisation)
-#include "G4PolarizedIonisationBhabhaXS.hh"
+#include <G4PolarizedIonisationBhabhaXS.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedIonisationBhabhaXS)
-#include "G4PolarizedIonisationMollerXS.hh"
+#include <G4PolarizedIonisationMollerXS.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedIonisationMollerXS)
-#include "G4PolarizedPhotoElectric.hh"
+#include <G4PolarizedPhotoElectric.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedPhotoElectric)
-#include "G4PolarizedPhotoElectricXS.hh"
+#include <G4PolarizedPhotoElectricXS.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedPhotoElectricXS)
 #endif
 
 // Processes for simulation of X-rays and optical protons production by charged particles
-#include "G4SynchrotronRadiation.hh"
+#include <G4SynchrotronRadiation.hh>
 DECLARE_GEANT4_PROCESS(G4SynchrotronRadiation)
-#include "G4TransitionRadiation.hh"
+#include <G4TransitionRadiation.hh>
 //DECLARE_GEANT4_PROCESS(G4TransitionRadiation) !!virtual abstract!!
-#include "G4Cerenkov.hh"
+#include <G4Cerenkov.hh>
 DECLARE_GEANT4_PROCESS(G4Cerenkov)
-#include "G4Scintillation.hh"
+#include <G4Scintillation.hh>
 DECLARE_GEANT4_PROCESS(G4Scintillation)
 
 // Others
-#include "G4PAIModel.hh"
+#include <G4PAIModel.hh>
 DECLARE_GEANT4_PROCESS(G4PAIModel)
-#include "G4BraggIonGasModel.hh"
+#include <G4BraggIonGasModel.hh>
 DECLARE_GEANT4_PROCESS(G4BraggIonGasModel)
-#include "G4BetheBlochIonGasModel.hh"
+#include <G4BetheBlochIonGasModel.hh>
 DECLARE_GEANT4_PROCESS(G4BetheBlochIonGasModel)
-#include "G4WentzelVIModel.hh"
+#include <G4WentzelVIModel.hh>
 DECLARE_GEANT4_PROCESS(G4WentzelVIModel)
 
 #if G4VERSION_NUMBER < 1000
-#include "G4UrbanMscModel93.hh"
+#include <G4UrbanMscModel93.hh>
 DECLARE_GEANT4_PROCESS(G4UrbanMscModel93)
 #endif
 
-#include "G4hImpactIonisation.hh"
+#include <G4hImpactIonisation.hh>
 DECLARE_GEANT4_PROCESS(G4hImpactIonisation)
 
-//#include "G4InversePEEffect.hh"
+//#include <G4InversePEEffect.hh>
 //DECLARE_GEANT4_PROCESS(G4InversePEEffect)
-//#include "G4hInverseIonisation.hh"
+//#include <G4hInverseIonisation.hh>
 //DECLARE_GEANT4_PROCESS(G4hInverseIonisation)
-//#include "G4IonInverseIonisation.hh"
+//#include <G4IonInverseIonisation.hh>
 //DECLARE_GEANT4_PROCESS(G4IonInverseIonisation)
 
 // ==================================================================================
 #if G4VERSION_NUMBER>=960 and G4VERSION_NUMBER<1000
-#include "G4UrbanMscModel93.hh"
+#include <G4UrbanMscModel93.hh>
 DECLARE_GEANT4_PROCESS(G4UrbanMscModel93)
 // ==================================================================================
 #elif G4VERSION_NUMBER>=1000
 
 // Stuff commented cannot be instantiated!!
 
-#include "G4AdjointBremsstrahlungModel.hh"
+#include <G4AdjointBremsstrahlungModel.hh>
 DECLARE_GEANT4_PROCESS(G4AdjointBremsstrahlungModel)
-#include "G4AdjointComptonModel.hh"
+#include <G4AdjointComptonModel.hh>
 DECLARE_GEANT4_PROCESS(G4AdjointComptonModel)
-#include "G4AdjointeIonisationModel.hh"
+#include <G4AdjointeIonisationModel.hh>
 DECLARE_GEANT4_PROCESS(G4AdjointeIonisationModel)
-#include "G4AdjointIonIonisationModel.hh"
+#include <G4AdjointIonIonisationModel.hh>
 DECLARE_GEANT4_PROCESS(G4AdjointIonIonisationModel)
-#include "G4AdjointPhotoElectricModel.hh"
+#include <G4AdjointPhotoElectricModel.hh>
 DECLARE_GEANT4_PROCESS(G4AdjointPhotoElectricModel)
-#include "G4BetheBlochModel.hh"
+#include <G4BetheBlochModel.hh>
 DECLARE_GEANT4_PROCESS(G4BetheBlochModel)
-#include "G4BetheBlochNoDeltaModel.hh"
+#include <G4BetheBlochNoDeltaModel.hh>
 DECLARE_GEANT4_PROCESS(G4BetheBlochNoDeltaModel)
-#include "G4BetheHeitlerModel.hh"
+#include <G4BetheHeitlerModel.hh>
 DECLARE_GEANT4_PROCESS(G4BetheHeitlerModel)
-#include "G4BoldyshevTripletModel.hh"
+#include <G4BoldyshevTripletModel.hh>
 DECLARE_GEANT4_PROCESS(G4BoldyshevTripletModel)
-#include "G4BraggIonModel.hh"
+#include <G4BraggIonModel.hh>
 DECLARE_GEANT4_PROCESS(G4BraggIonModel)
-#include "G4BraggModel.hh"
+#include <G4BraggModel.hh>
 DECLARE_GEANT4_PROCESS(G4BraggModel)
-#include "G4BraggNoDeltaModel.hh"
+#include <G4BraggNoDeltaModel.hh>
 DECLARE_GEANT4_PROCESS(G4BraggNoDeltaModel)
-#include "G4ChipsElasticModel.hh"
+#include <G4ChipsElasticModel.hh>
 DECLARE_GEANT4_PROCESS(G4ChipsElasticModel)
-#include "G4DNABornExcitationModel.hh"
+#include <G4DNABornExcitationModel.hh>
 DECLARE_GEANT4_PROCESS(G4DNABornExcitationModel)
 
-#include "G4eBremParametrizedModel.hh"
+#include <G4eBremParametrizedModel.hh>
 DECLARE_GEANT4_PROCESS(G4eBremParametrizedModel)
-#include "G4eBremsstrahlungRelModel.hh"
+#include <G4eBremsstrahlungRelModel.hh>
 DECLARE_GEANT4_PROCESS(G4eBremsstrahlungRelModel)
-#include "G4ecpssrBaseKxsModel.hh"
+#include <G4ecpssrBaseKxsModel.hh>
 DECLARE_GEANT4_PROCESS(G4ecpssrBaseKxsModel)
-#include "G4ecpssrBaseLixsModel.hh"
+#include <G4ecpssrBaseLixsModel.hh>
 DECLARE_GEANT4_PROCESS(G4ecpssrBaseLixsModel)
-#include "G4ecpssrFormFactorKxsModel.hh"
+#include <G4ecpssrFormFactorKxsModel.hh>
 DECLARE_GEANT4_PROCESS(G4ecpssrFormFactorKxsModel)
-//#include "G4ee2KChargedModel.hh"
+//#include <G4ee2KChargedModel.hh>
 //DECLARE_GEANT4_PROCESS(G4ee2KChargedModel)
-//#include "G4ee2KNeutralModel.hh"
+//#include <G4ee2KNeutralModel.hh>
 //DECLARE_GEANT4_PROCESS(G4ee2KNeutralModel)
-//#include "G4eeTo3PiModel.hh"
+//#include <G4eeTo3PiModel.hh>
 //DECLARE_GEANT4_PROCESS(G4eeTo3PiModel)
-//#include "G4eeToHadronsModel.hh"
+//#include <G4eeToHadronsModel.hh>
 //DECLARE_GEANT4_PROCESS(G4eeToHadronsModel)
-#include "G4ecpssrFormFactorLixsModel.hh"
+#include <G4ecpssrFormFactorLixsModel.hh>
 DECLARE_GEANT4_PROCESS(G4ecpssrFormFactorLixsModel)
-#include "G4ecpssrFormFactorMixsModel.hh"
+#include <G4ecpssrFormFactorMixsModel.hh>
 DECLARE_GEANT4_PROCESS(G4ecpssrFormFactorMixsModel)
-#include "G4EmMultiModel.hh"
+#include <G4EmMultiModel.hh>
 DECLARE_GEANT4_PROCESS(G4EmMultiModel)
 
 #if G4VERSION_NUMBER < 1100
-#include "G4ePolarizedBremsstrahlungModel.hh"
+#include <G4ePolarizedBremsstrahlungModel.hh>
 DECLARE_GEANT4_PROCESS(G4ePolarizedBremsstrahlungModel)
 #else
-#include "G4PolarizedBremsstrahlungModel.hh"
+#include <G4PolarizedBremsstrahlungModel.hh>
 DECLARE_GEANT4_PROCESS(G4PolarizedBremsstrahlungModel)
 #endif
 
-#include "G4FTFModel.hh"
+#include <G4FTFModel.hh>
 DECLARE_GEANT4_PROCESS(G4FTFModel)
-#include "G4GoudsmitSaundersonMscModel.hh"
+#include <G4GoudsmitSaundersonMscModel.hh>
 DECLARE_GEANT4_PROCESS(G4GoudsmitSaundersonMscModel)
-#include "G4hBremsstrahlungModel.hh"
+#include <G4hBremsstrahlungModel.hh>
 DECLARE_GEANT4_PROCESS(G4hBremsstrahlungModel)
-#include "G4hCoulombScatteringModel.hh"
+#include <G4hCoulombScatteringModel.hh>
 DECLARE_GEANT4_PROCESS(G4hCoulombScatteringModel)
-//#include "G4hNuclearStoppingModel.hh"
+//#include <G4hNuclearStoppingModel.hh>
 //DECLARE_GEANT4_PROCESS(G4hNuclearStoppingModel)
-#include "G4hPairProductionModel.hh"
+#include <G4hPairProductionModel.hh>
 DECLARE_GEANT4_PROCESS(G4hPairProductionModel)
-//#include "G4hParametrisedLossModel.hh"
+//#include <G4hParametrisedLossModel.hh>
 //DECLARE_GEANT4_PROCESS(G4hParametrisedLossModel)
-#include "G4ICRU49NuclearStoppingModel.hh"
+#include <G4ICRU49NuclearStoppingModel.hh>
 DECLARE_GEANT4_PROCESS(G4ICRU49NuclearStoppingModel)
-#include "G4ICRU73NoDeltaModel.hh"
+#include <G4ICRU73NoDeltaModel.hh>
 DECLARE_GEANT4_PROCESS(G4ICRU73NoDeltaModel)
-#include "G4ICRU73QOModel.hh"
+#include <G4ICRU73QOModel.hh>
 DECLARE_GEANT4_PROCESS(G4ICRU73QOModel)
-//#include "G4INCLIClusteringModel.hh"
+//#include <G4INCLIClusteringModel.hh>
 //DECLARE_GEANT4_PROCESS(G4INCLIClusteringModel)
-//#include "G4INCLIPropagationModel.hh"
+//#include <G4INCLIPropagationModel.hh>
 //DECLARE_GEANT4_PROCESS(G4INCLIPropagationModel)
-//#include "G4INCLStandardPropagationModel.hh"
+//#include <G4INCLStandardPropagationModel.hh>
 //DECLARE_GEANT4_PROCESS(G4INCLStandardPropagationModel)
-//#include "G4IonChuFluctuationModel.hh"
+//#include <G4IonChuFluctuationModel.hh>
 //DECLARE_GEANT4_PROCESS(G4IonChuFluctuationModel)
 
 #endif
 
 #if 0
-#include ".hh"
+#include <.hh>
 DECLARE_GEANT4_PROCESS()
 #endif
 
diff --git a/DDG4/plugins/Geant4SDActions.cpp b/DDG4/plugins/Geant4SDActions.cpp
index a16796513..de9aba8e5 100644
--- a/DDG4/plugins/Geant4SDActions.cpp
+++ b/DDG4/plugins/Geant4SDActions.cpp
@@ -12,11 +12,11 @@
 //==========================================================================
 
 // Framework include files
-#include "DDG4/Geant4SensDetAction.inl"
-#include "DDG4/Geant4FastSimHandler.h"
-#include "DDG4/Geant4EventAction.h"
-#include "G4OpticalPhoton.hh"
-#include "G4VProcess.hh"
+#include <DDG4/Geant4SensDetAction.inl>
+#include <DDG4/Geant4FastSimHandler.h>
+#include <DDG4/Geant4EventAction.h>
+#include <G4OpticalPhoton.hh>
+#include <G4VProcess.hh>
 
 
 /// Namespace for the AIDA detector description toolkit
@@ -773,7 +773,7 @@ namespace dd4hep {
 
 using namespace dd4hep::sim;
 
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 // Special void entry point
 DECLARE_GEANT4SENSITIVE(Geant4VoidSensitiveAction)
 // Standard factories used for simulation
diff --git a/DDG4/plugins/Geant4ScintillationPhysics.cpp b/DDG4/plugins/Geant4ScintillationPhysics.cpp
index 6f47be3ed..81e67cc67 100644
--- a/DDG4/plugins/Geant4ScintillationPhysics.cpp
+++ b/DDG4/plugins/Geant4ScintillationPhysics.cpp
@@ -25,25 +25,25 @@
 #define DDG4_GEANT4SCINTILLATIONPHYSICS_H 1
 
 /// Framework include files
-#include "DDG4/Geant4PhysicsList.h"
+#include <DDG4/Geant4PhysicsList.h>
 
 /// Geant4 include files
-#include "G4Version.hh"
-#include "G4ParticleTableIterator.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4LossTableManager.hh"
-#include "G4ProcessManager.hh"
-#include "G4ParticleTypes.hh"
-#include "G4ParticleTable.hh"
-#include "G4EmSaturation.hh"
-#include "G4Threading.hh"
+#include <G4Version.hh>
+#include <G4ParticleTableIterator.hh>
+#include <G4ParticleDefinition.hh>
+#include <G4LossTableManager.hh>
+#include <G4ProcessManager.hh>
+#include <G4ParticleTypes.hh>
+#include <G4ParticleTable.hh>
+#include <G4EmSaturation.hh>
+#include <G4Threading.hh>
 
 #if G4VERSION_NUMBER >= 1070
-#include "G4OpticalParameters.hh"
+#include <G4OpticalParameters.hh>
 
 /// This is a beta release problem:
 #if G4VERSION_NUMBER == 110000
-#include "G4OpticalParameters.hh"
+#include <G4OpticalParameters.hh>
 #pragma message("Geant4 version 11 beta: temporary fix to be removed!")
 void G4OpticalParameters::SetScintExcitationRatio(double) {}
 void G4OpticalParameters::SetScintYieldFactor(double) {}
@@ -51,7 +51,7 @@ void G4OpticalParameters::SetScintYieldFactor(double) {}
 
 #endif
 
-#include "G4Scintillation.hh"
+#include <G4Scintillation.hh>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
@@ -196,6 +196,6 @@ namespace dd4hep {
 }
 #endif   // DDG4_GEANT4SCINTILLATIONPHYSICS_H
 
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 using namespace dd4hep::sim;
 DECLARE_GEANT4ACTION(Geant4ScintillationPhysics)
diff --git a/DDG4/plugins/Geant4SensDet.cpp b/DDG4/plugins/Geant4SensDet.cpp
index 27bd691fc..7efb28a72 100644
--- a/DDG4/plugins/Geant4SensDet.cpp
+++ b/DDG4/plugins/Geant4SensDet.cpp
@@ -25,7 +25,7 @@
 // Geant4 include files
 #include <G4Run.hh>
 #include <G4Event.hh>
-#include "G4Version.hh"
+#include <G4Version.hh>
 #include <G4TouchableHistory.hh>
 #include <G4VSensitiveDetector.hh>
 #include <G4VGFlashSensitiveDetector.hh>
diff --git a/DDG4/plugins/Geant4Steppers.cpp b/DDG4/plugins/Geant4Steppers.cpp
index 4fa55d76c..b296abc38 100644
--- a/DDG4/plugins/Geant4Steppers.cpp
+++ b/DDG4/plugins/Geant4Steppers.cpp
@@ -12,17 +12,17 @@
 //==========================================================================
 
 // Framework include files
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 
 // Geant 4 include files
-#include "G4Version.hh"
-#include "G4ExplicitEuler.hh"
-#include "G4ImplicitEuler.hh"
-#include "G4SimpleRunge.hh"
-#include "G4SimpleHeum.hh"
-#include "G4ClassicalRK4.hh"
-#include "G4ConstRK4.hh"
-#include "G4CashKarpRKF45.hh"
+#include <G4Version.hh>
+#include <G4ExplicitEuler.hh>
+#include <G4ImplicitEuler.hh>
+#include <G4SimpleRunge.hh>
+#include <G4SimpleHeum.hh>
+#include <G4ClassicalRK4.hh>
+#include <G4ConstRK4.hh>
+#include <G4CashKarpRKF45.hh>
 
 DECLARE_GEANT4_STEPPER(ImplicitEuler)
 DECLARE_GEANT4_STEPPER(ExplicitEuler)
@@ -33,12 +33,12 @@ DECLARE_GEANT4_STEPPER(ClassicalRK4)
 DECLARE_GEANT4_STEPPER(CashKarpRKF45)
 
 #if G4VERSION_NUMBER >=1030
-#include "G4DoLoMcPriRK34.hh"
-#include "G4DormandPrince745.hh"
-#include "G4DormandPrinceRK56.hh"
-#include "G4DormandPrinceRK78.hh"
-#include "G4BogackiShampine23.hh"
-#include "G4BogackiShampine45.hh"
+#include <G4DoLoMcPriRK34.hh>
+#include <G4DormandPrince745.hh>
+#include <G4DormandPrinceRK56.hh>
+#include <G4DormandPrinceRK78.hh>
+#include <G4BogackiShampine23.hh>
+#include <G4BogackiShampine45.hh>
 DECLARE_GEANT4_STEPPER(DoLoMcPriRK34)
 DECLARE_GEANT4_STEPPER(DormandPrince745)
 DECLARE_GEANT4_STEPPER(DormandPrinceRK56)
@@ -48,12 +48,12 @@ DECLARE_GEANT4_STEPPER(BogackiShampine45)
 #endif
 
 // Geant 4 include files
-#include "G4MagHelicalStepper.hh"
-#include "G4HelixExplicitEuler.hh"
-#include "G4HelixImplicitEuler.hh"
-#include "G4HelixMixedStepper.hh"
-#include "G4HelixSimpleRunge.hh"
-#include "G4HelixHeum.hh"
+#include <G4MagHelicalStepper.hh>
+#include <G4HelixExplicitEuler.hh>
+#include <G4HelixImplicitEuler.hh>
+#include <G4HelixMixedStepper.hh>
+#include <G4HelixSimpleRunge.hh>
+#include <G4HelixHeum.hh>
 
 DECLARE_GEANT4_MAGSTEPPER(HelixImplicitEuler)
 DECLARE_GEANT4_MAGSTEPPER(HelixExplicitEuler)
@@ -62,18 +62,18 @@ DECLARE_GEANT4_MAGSTEPPER(HelixSimpleRunge)
 DECLARE_GEANT4_MAGSTEPPER(HelixHeum)
 
 #if G4VERSION_NUMBER>=1020
-#include "G4NystromRK4.hh"
-#include "G4RKG3_Stepper.hh"
+#include <G4NystromRK4.hh>
+#include <G4RKG3_Stepper.hh>
 DECLARE_GEANT4_MAGSTEPPER(RKG3_Stepper)
 DECLARE_GEANT4_MAGSTEPPER(NystromRK4)
 #endif
 
 // Geant 4 include files
-#include "G4Mag_EqRhs.hh"
-#include "G4Mag_SpinEqRhs.hh"
-#include "G4Mag_UsualEqRhs.hh"
-#include "G4KM_OpticalEqRhs.hh"
-#include "G4KM_NucleonEqRhs.hh"
+#include <G4Mag_EqRhs.hh>
+#include <G4Mag_SpinEqRhs.hh>
+#include <G4Mag_UsualEqRhs.hh>
+#include <G4KM_OpticalEqRhs.hh>
+#include <G4KM_NucleonEqRhs.hh>
 //Virtual: DECLARE_GEANT4_MAGMOTION(Mag_EqRhs);
 DECLARE_GEANT4_MAGMOTION(Mag_SpinEqRhs)
 DECLARE_GEANT4_MAGMOTION(Mag_UsualEqRhs)
@@ -82,11 +82,11 @@ DECLARE_GEANT4_MAGMOTION(Mag_UsualEqRhs)
 
 #if 0 // G4VERSION_NUMBER>=1002
 // Undefined factories !!!
-#include "G4MonopoleEq.hh"
-#include "G4EqEMFieldWithEDM.hh"
-#include "G4EqEMFieldWithSpin.hh"
-#include "G4EqGravityField.hh"
-#include "G4EqMagElectricField.hh"
+#include <G4MonopoleEq.hh>
+#include <G4EqEMFieldWithEDM.hh>
+#include <G4EqEMFieldWithSpin.hh>
+#include <G4EqGravityField.hh>
+#include <G4EqMagElectricField.hh>
 
 // G4EquationOfMotion*(G4UniformGravityField*)
 DECLARE_GEANT4_MAGMOTION(EqGravityField)
diff --git a/DDG4/plugins/Geant4TCUserParticleHandler.cpp b/DDG4/plugins/Geant4TCUserParticleHandler.cpp
index 637e06c8f..425ae2686 100644
--- a/DDG4/plugins/Geant4TCUserParticleHandler.cpp
+++ b/DDG4/plugins/Geant4TCUserParticleHandler.cpp
@@ -25,8 +25,8 @@
 #define DD4HEP_DDG4_GEANT4TCUSERPARTICLEHANDLER_H
 
 // Framework include files
-#include "DD4hep/Primitives.h"
-#include "DDG4/Geant4UserParticleHandler.h"
+#include <DD4hep/Primitives.h>
+#include <DDG4/Geant4UserParticleHandler.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
@@ -79,9 +79,9 @@ namespace dd4hep {
 //
 //====================================================================
 // Framework include files
-//#include "DDG4/Geant4TCUserParticleHandler.h"
-#include "DDG4/Geant4Particle.h"
-#include "DDG4/Factories.h"
+//#include <DDG4/Geant4TCUserParticleHandler.h>
+#include <DDG4/Geant4Particle.h>
+#include <DDG4/Factories.h>
 
 
 using namespace dd4hep::sim;
diff --git a/DDG4/scripts/dumpDDG4.C b/DDG4/scripts/dumpDDG4.C
index 030199a5c..b8ce12920 100644
--- a/DDG4/scripts/dumpDDG4.C
+++ b/DDG4/scripts/dumpDDG4.C
@@ -12,20 +12,23 @@
 //==========================================================================
 
 // Framework include files
-#include "CLHEP/Units/SystemOfUnits.h"
-#include "DD4hep/DD4hepUnits.h"
-#include "DD4hep/Printout.h"
-#include "DD4hep/Detector.h"
-#include "DDG4/Geant4Particle.h"
-#include "DDG4/Geant4Data.h"
+#include <CLHEP/Units/SystemOfUnits.h>
+#include <DD4hep/DD4hepUnits.h>
+#include <DD4hep/Printout.h>
+#include <DD4hep/Detector.h>
+#include <DDG4/Geant4Particle.h>
+#include <DDG4/Geant4Data.h>
+
+// C/C++ include files
 #include <vector>
 #include <cstdio>
 #include <memory>
 #include <cerrno>
 
-#include "TFile.h"
-#include "TTree.h"
-#include "TSystem.h"
+// ROOT include files
+#include <TFile.h>
+#include <TTree.h>
+#include <TSystem.h>
 
 using namespace std;
 using namespace dd4hep;
diff --git a/DDG4/src/EventParameters.cpp b/DDG4/src/EventParameters.cpp
index 5a52e0da2..803d91740 100644
--- a/DDG4/src/EventParameters.cpp
+++ b/DDG4/src/EventParameters.cpp
@@ -11,7 +11,7 @@
 //====================================================================
 
 /// Framework include files
-#include "DDG4/EventParameters.h"
+#include <DDG4/EventParameters.h>
 
 /// C/C++ include files
 #include <map>
diff --git a/DDG4/src/Geant4EventAction.cpp b/DDG4/src/Geant4EventAction.cpp
index 3974a839b..6407909ed 100644
--- a/DDG4/src/Geant4EventAction.cpp
+++ b/DDG4/src/Geant4EventAction.cpp
@@ -12,12 +12,12 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/InstanceCount.h"
-#include "DDG4/Geant4EventAction.h"
+#include <DD4hep/InstanceCount.h>
+#include <DDG4/Geant4EventAction.h>
 
 // Geant4 headers
-#include "G4Threading.hh"
-#include "G4AutoLock.hh"
+#include <G4Threading.hh>
+#include <G4AutoLock.hh>
 
 using namespace dd4hep::sim;
 
diff --git a/DDG4/src/Geant4Field.cpp b/DDG4/src/Geant4Field.cpp
index 811df35c4..646681c82 100644
--- a/DDG4/src/Geant4Field.cpp
+++ b/DDG4/src/Geant4Field.cpp
@@ -12,9 +12,9 @@
 //==========================================================================
 
 // Framework include files
-#include "DDG4/Geant4Field.h"
-#include "DD4hep/DD4hepUnits.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include <DDG4/Geant4Field.h>
+#include <DD4hep/DD4hepUnits.h>
+#include <CLHEP/Units/SystemOfUnits.h>
 namespace units = dd4hep;
 
 using namespace dd4hep::sim;
diff --git a/DDG4/src/Geant4GDMLDetector.cpp b/DDG4/src/Geant4GDMLDetector.cpp
index 3ac3ebbf3..c08ea6daa 100644
--- a/DDG4/src/Geant4GDMLDetector.cpp
+++ b/DDG4/src/Geant4GDMLDetector.cpp
@@ -20,7 +20,7 @@
 //#define GEANT4_HAS_GDML
 
 #ifdef GEANT4_HAS_GDML
-#include "G4GDMLParser.hh"
+#include <G4GDMLParser.hh>
 #endif
 
 dd4hep::sim::Geant4GDMLDetector::Geant4GDMLDetector(const std::string& gdmlFile)
diff --git a/DDG4/src/Geant4InteractionMerger.cpp b/DDG4/src/Geant4InteractionMerger.cpp
index 28b52b388..f849e0ec3 100644
--- a/DDG4/src/Geant4InteractionMerger.cpp
+++ b/DDG4/src/Geant4InteractionMerger.cpp
@@ -12,10 +12,10 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Printout.h"
-#include "DD4hep/InstanceCount.h"
-#include "DDG4/Geant4InputHandling.h"
-#include "DDG4/Geant4InteractionMerger.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/InstanceCount.h>
+#include <DDG4/Geant4InputHandling.h>
+#include <DDG4/Geant4InteractionMerger.h>
 
 using namespace dd4hep::sim;
 
diff --git a/DDG4/src/Geant4InteractionVertexBoost.cpp b/DDG4/src/Geant4InteractionVertexBoost.cpp
index c914bd217..7c2de5f13 100644
--- a/DDG4/src/Geant4InteractionVertexBoost.cpp
+++ b/DDG4/src/Geant4InteractionVertexBoost.cpp
@@ -12,10 +12,10 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Printout.h"
-#include "DD4hep/InstanceCount.h"
-#include "DDG4/Geant4InputHandling.h"
-#include "DDG4/Geant4InteractionVertexBoost.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/InstanceCount.h>
+#include <DDG4/Geant4InputHandling.h>
+#include <DDG4/Geant4InteractionVertexBoost.h>
 
 using namespace dd4hep::sim;
 
diff --git a/DDG4/src/Geant4InteractionVertexSmear.cpp b/DDG4/src/Geant4InteractionVertexSmear.cpp
index bf851056b..87b39ce89 100644
--- a/DDG4/src/Geant4InteractionVertexSmear.cpp
+++ b/DDG4/src/Geant4InteractionVertexSmear.cpp
@@ -12,12 +12,12 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Printout.h"
-#include "DD4hep/InstanceCount.h"
-#include "DDG4/Geant4Random.h"
-#include "DDG4/Geant4Context.h"
-#include "DDG4/Geant4InputHandling.h"
-#include "DDG4/Geant4InteractionVertexSmear.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/InstanceCount.h>
+#include <DDG4/Geant4Random.h>
+#include <DDG4/Geant4Context.h>
+#include <DDG4/Geant4InputHandling.h>
+#include <DDG4/Geant4InteractionVertexSmear.h>
 
 // C/C++ include files
 #include <cmath>
diff --git a/DDG4/src/Geant4MonteCarloTruth.cpp b/DDG4/src/Geant4MonteCarloTruth.cpp
index 3285cd01e..2e45730ee 100644
--- a/DDG4/src/Geant4MonteCarloTruth.cpp
+++ b/DDG4/src/Geant4MonteCarloTruth.cpp
@@ -12,8 +12,8 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/InstanceCount.h"
-#include "DDG4/Geant4MonteCarloTruth.h"
+#include <DD4hep/InstanceCount.h>
+#include <DDG4/Geant4MonteCarloTruth.h>
 
 using namespace dd4hep::sim;
 
diff --git a/DDG4/src/Geant4Plugins.cpp b/DDG4/src/Geant4Plugins.cpp
index dc7e399bf..c90ea224b 100644
--- a/DDG4/src/Geant4Plugins.cpp
+++ b/DDG4/src/Geant4Plugins.cpp
@@ -12,23 +12,23 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/detail/Plugins.inl"
-#include "DDG4/Factories.h"
-#include "DDG4/Geant4SensDetAction.h"
-#include "DDG4/Geant4PhysicsList.h"
-#include "DDG4/Geant4InputAction.h"
+#include <DD4hep/detail/Plugins.inl>
+#include <DDG4/Factories.h>
+#include <DDG4/Geant4SensDetAction.h>
+#include <DDG4/Geant4PhysicsList.h>
+#include <DDG4/Geant4InputAction.h>
 
 // Geant4 include files
-#include "G4VSensitiveDetector.hh"
-#include "G4MagIntegratorStepper.hh"
-#include "G4EquationOfMotion.hh"
-#include "G4Mag_EqRhs.hh"
-#include "G4MagneticField.hh"
-#include "G4VProcess.hh"
-#include "G4VPhysicsConstructor.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4VUserPhysicsList.hh"
-#include "G4VPrimaryGenerator.hh"
+#include <G4VSensitiveDetector.hh>
+#include <G4MagIntegratorStepper.hh>
+#include <G4EquationOfMotion.hh>
+#include <G4Mag_EqRhs.hh>
+#include <G4MagneticField.hh>
+#include <G4VProcess.hh>
+#include <G4VPhysicsConstructor.hh>
+#include <G4ParticleDefinition.hh>
+#include <G4VUserPhysicsList.hh>
+#include <G4VPrimaryGenerator.hh>
 
 DD4HEP_IMPLEMENT_PLUGIN_REGISTRY(G4VSensitiveDetector*, (std::string,dd4hep::Detector*))
 DD4HEP_IMPLEMENT_PLUGIN_REGISTRY(dd4hep::sim::Geant4Sensitive*, (dd4hep::sim::Geant4Context*,
diff --git a/DDG4/src/Geant4PrimaryHandler.cpp b/DDG4/src/Geant4PrimaryHandler.cpp
index 4bb741052..222c1ede4 100644
--- a/DDG4/src/Geant4PrimaryHandler.cpp
+++ b/DDG4/src/Geant4PrimaryHandler.cpp
@@ -12,10 +12,10 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Printout.h"
-#include "DD4hep/InstanceCount.h"
-#include "DDG4/Geant4InputHandling.h"
-#include "DDG4/Geant4PrimaryHandler.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/InstanceCount.h>
+#include <DDG4/Geant4InputHandling.h>
+#include <DDG4/Geant4PrimaryHandler.h>
 
 using namespace dd4hep::sim;
 
diff --git a/DDG4/src/Geant4ReadoutVolumeFilter.cpp b/DDG4/src/Geant4ReadoutVolumeFilter.cpp
index 8e36c7d72..da836489a 100644
--- a/DDG4/src/Geant4ReadoutVolumeFilter.cpp
+++ b/DDG4/src/Geant4ReadoutVolumeFilter.cpp
@@ -12,14 +12,14 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Readout.h"
-#include "DD4hep/InstanceCount.h"
-#include "DD4hep/detail/ObjectsInterna.h"
-#include "DDG4/Geant4Mapping.h"
-#include "DDG4/Geant4StepHandler.h"
-#include "DDG4/Geant4VolumeManager.h"
-#include "DDG4/Geant4FastSimHandler.h"
-#include "DDG4/Geant4ReadoutVolumeFilter.h"
+#include <DD4hep/Readout.h>
+#include <DD4hep/InstanceCount.h>
+#include <DD4hep/detail/ObjectsInterna.h>
+#include <DDG4/Geant4Mapping.h>
+#include <DDG4/Geant4StepHandler.h>
+#include <DDG4/Geant4VolumeManager.h>
+#include <DDG4/Geant4FastSimHandler.h>
+#include <DDG4/Geant4ReadoutVolumeFilter.h>
 
 using namespace dd4hep::sim;
 
diff --git a/DDG4/src/Geant4UserParticleHandler.cpp b/DDG4/src/Geant4UserParticleHandler.cpp
index 4e60d6e6c..042a5d655 100644
--- a/DDG4/src/Geant4UserParticleHandler.cpp
+++ b/DDG4/src/Geant4UserParticleHandler.cpp
@@ -12,11 +12,11 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Printout.h"
-#include "DD4hep/InstanceCount.h"
-#include "DDG4/Geant4ParticleHandler.h"
-#include "DDG4/Geant4UserParticleHandler.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/InstanceCount.h>
+#include <DDG4/Geant4ParticleHandler.h>
+#include <DDG4/Geant4UserParticleHandler.h>
+#include <CLHEP/Units/SystemOfUnits.h>
 
 using namespace dd4hep::sim;
 
diff --git a/DDG4/src/python/DDG4Python.C b/DDG4/src/python/DDG4Python.C
index ce79dfa5a..1ad94b6a2 100644
--- a/DDG4/src/python/DDG4Python.C
+++ b/DDG4/src/python/DDG4Python.C
@@ -16,11 +16,11 @@
 //
 //====================================================================
 // FRamework include files
-#include "DDG4/Python/Geant4PythonCall.h"
-#include "DDG4/Python/Geant4PythonAction.h"
-#include "DDG4/Python/Geant4PythonInitialization.h"
-#include "DDG4/Python/Geant4PythonDetectorConstruction.h"
-#include "DDG4/Python/PyDDG4.h"
+#include <DDG4/Python/Geant4PythonCall.h>
+#include <DDG4/Python/Geant4PythonAction.h>
+#include <DDG4/Python/Geant4PythonInitialization.h>
+#include <DDG4/Python/Geant4PythonDetectorConstruction.h>
+#include <DDG4/Python/PyDDG4.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace  {  class DDG4Python {};   }
diff --git a/DDG4/src/python/Geant4PythonDetectorConstructionLast.cpp b/DDG4/src/python/Geant4PythonDetectorConstructionLast.cpp
index 48eec5eb9..228dfc7ee 100644
--- a/DDG4/src/python/Geant4PythonDetectorConstructionLast.cpp
+++ b/DDG4/src/python/Geant4PythonDetectorConstructionLast.cpp
@@ -52,5 +52,5 @@ namespace dd4hep {
 
 using namespace dd4hep::sim;
 
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 DECLARE_GEANT4ACTION(Geant4PythonDetectorConstructionLast)
diff --git a/DDG4/src/python/PyDDG4.cpp b/DDG4/src/python/PyDDG4.cpp
index fca81b2e0..75bbd28b1 100644
--- a/DDG4/src/python/PyDDG4.cpp
+++ b/DDG4/src/python/PyDDG4.cpp
@@ -13,10 +13,10 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Detector.h"
-#include "DDG4/Python/PyDDG4.h"
-#include "DDG4/Python/DDPython.h"
-#include "DDG4/Geant4Kernel.h"
+#include <DD4hep/Detector.h>
+#include <DDG4/Python/PyDDG4.h>
+#include <DDG4/Python/DDPython.h>
+#include <DDG4/Geant4Kernel.h>
 
 int PyDDG4::run(Kernel& kernel)  {
   int ret;
diff --git a/DDG4/tpython/DDPython.cpp b/DDG4/tpython/DDPython.cpp
index 352ef97ad..1bcf77d58 100644
--- a/DDG4/tpython/DDPython.cpp
+++ b/DDG4/tpython/DDPython.cpp
@@ -35,7 +35,7 @@
 #ifdef _XOPEN_SOURCE
 #undef _XOPEN_SOURCE
 #endif /* _XOPEN_SOURCE */
-#include "Python.h"
+#include <Python.h>
 #endif
 
 namespace {
-- 
GitLab