diff --git a/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp b/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp
index 2fe2312e8901d2564e9f1cc10911dff926fb4a60..0eb974ad81ac88d96cd1717553f24d9168aa546f 100644
--- a/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp
+++ b/DDG4/plugins/Geant4DetectorGeometryConstruction.cpp
@@ -13,7 +13,7 @@
 //==========================================================================
 
 // Framework include files
-#include "DDG4/Geant4DetectorConstruction.h"
+#include <DDG4/Geant4DetectorConstruction.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
@@ -85,24 +85,25 @@ namespace dd4hep {
 // Framework include files
 #include <DD4hep/InstanceCount.h>
 #include <DD4hep/DetectorTools.h>
-#include "DD4hep/DD4hepUnits.h"
+#include <DD4hep/DD4hepUnits.h>
 #include <DD4hep/Printout.h>
 #include <DD4hep/Detector.h>
 
-#include "DDG4/Geant4HierarchyDump.h"
-#include "DDG4/Geant4UIMessenger.h"
-#include "DDG4/Geant4Converter.h"
-#include "DDG4/Geant4Kernel.h"
-#include "DDG4/Factories.h"
+#include <DDG4/Geant4HierarchyDump.h>
+#include <DDG4/Geant4UIMessenger.h>
+#include <DDG4/Geant4Converter.h>
+#include <DDG4/Geant4Kernel.h>
+#include <DDG4/Factories.h>
 
 // Geant4 include files
 #include <G4LogicalVolume.hh>
-#include "G4PVPlacement.hh"
+#include <G4PVPlacement.hh>
 #include <G4Material.hh>
+#include <G4Version.hh>
 #include <G4VSolid.hh>
 
 //#ifdef GEANT4_HAS_GDML
-#include "G4GDMLParser.hh"
+#include <G4GDMLParser.hh>
 //#endif
 
 using namespace std;
@@ -215,13 +216,15 @@ int Geant4DetectorGeometryConstruction::checkVolume()  {
         const G4LogicalVolume* vol = (*it).second;
         auto* g4_sol = vol->GetSolid();
         Box   rt_sol = pv.volume().solid();
+        printP2("Geant4 Shape: %s  cubic volume: %8.3g mm^3  area: %8.3g mm^2",
+                g4_sol->GetName().c_str(), g4_sol->GetCubicVolume(), g4_sol->GetSurfaceArea());
+#if G4VERSION_NUMBER>=1040
         G4ThreeVector pMin, pMax;
         double conv = (dd4hep::centimeter/CLHEP::centimeter)/2.0;
         g4_sol->BoundingLimits(pMin,pMax);
-        printP2("Geant4 Shape: %s  cubic volume: %8.3g mm^3  area: %8.3g mm^2",
-                g4_sol->GetName().c_str(), g4_sol->GetCubicVolume(), g4_sol->GetSurfaceArea());
         printP2("Geant4 Bounding box extends:    %8.3g  %8.3g %8.3g",
                 (pMax.x()-pMin.x())*conv, (pMax.y()-pMin.y())*conv, (pMax.z()-pMin.z())*conv);
+#endif
         printP2("ROOT   Bounding box dimensions: %8.3g  %8.3g %8.3g",
                 rt_sol->GetDX(), rt_sol->GetDY(), rt_sol->GetDZ());
         
diff --git a/DDG4/plugins/Geant4Processes.cpp b/DDG4/plugins/Geant4Processes.cpp
index 1a2791099d143328984545cedb279a5f7f00e92e..bc2503626339bcf80349e24882e91fe6c5baeb72 100644
--- a/DDG4/plugins/Geant4Processes.cpp
+++ b/DDG4/plugins/Geant4Processes.cpp
@@ -12,10 +12,10 @@
 //==========================================================================
 
 // Framework include files
-#include "DDG4/Factories.h"
+#include <DDG4/Factories.h>
 
 // Geant4 physics lists
-#include "G4Version.hh"
+#include <G4Version.hh>
 
 #if G4VERSION_NUMBER>=960
 #define GEANT4_9_6