diff --git a/DDG4/plugins/Geant4ScintillationPhysics.cpp b/DDG4/plugins/Geant4ScintillationPhysics.cpp
index be4db4122795da9f23add4aebd6307073231974c..bf37bc0a305a0d4554047e358777eba8ec5cfc2d 100644
--- a/DDG4/plugins/Geant4ScintillationPhysics.cpp
+++ b/DDG4/plugins/Geant4ScintillationPhysics.cpp
@@ -28,6 +28,7 @@
 #include "DDG4/Geant4PhysicsList.h"
 
 /// Geant4 include files
+#include "G4Version.hh"
 #include "G4ParticleTableIterator.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4LossTableManager.hh"
diff --git a/DDG4/src/Geant4Converter.cpp b/DDG4/src/Geant4Converter.cpp
index d48e1bbda77cea1ab6eae3e811472216c17cb054..47536eea677d85485de40f712689b00653906b86 100644
--- a/DDG4/src/Geant4Converter.cpp
+++ b/DDG4/src/Geant4Converter.cpp
@@ -36,6 +36,7 @@
 #include "TGeoBoolNode.h"
 
 // Geant4 include files
+#include "G4Version.hh"
 #include "G4VisAttributes.hh"
 #include "G4ProductionCuts.hh"
 #include "G4VUserRegionInformation.hh"
@@ -49,7 +50,6 @@
 #include "G4IntersectionSolid.hh"
 #include "G4VSensitiveDetector.hh"
 
-#include "G4Version.hh"
 #include "G4Region.hh"
 #include "G4Element.hh"
 #include "G4Element.hh"
diff --git a/DDG4/src/Geant4PhysicsConstructor.cpp b/DDG4/src/Geant4PhysicsConstructor.cpp
index b5ae6ca7e198023997e148d359481f7e70eae775..bd49673366346328f47a2bd558159f2108b52dce 100644
--- a/DDG4/src/Geant4PhysicsConstructor.cpp
+++ b/DDG4/src/Geant4PhysicsConstructor.cpp
@@ -15,6 +15,8 @@
 #include "DD4hep/InstanceCount.h"
 #include "DDG4/Geant4PhysicsConstructor.h"
 #include "G4VModularPhysicsList.hh"
+
+// Geant4 include files
 #include "G4Version.hh"
 
 using namespace dd4hep::sim;
diff --git a/DDG4/src/Geant4StepHandler.cpp b/DDG4/src/Geant4StepHandler.cpp
index 58aaad378a6e09bb1daa9e6ba2e9712695c82199..35c6ceae30dfa9b475ebf097fb948105793831a6 100644
--- a/DDG4/src/Geant4StepHandler.cpp
+++ b/DDG4/src/Geant4StepHandler.cpp
@@ -17,6 +17,9 @@
 #include "DD4hep/DD4hepUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 
+// Geant4 include files
+#include "G4Version.hh"
+
 namespace units = dd4hep;
 using namespace dd4hep;
 using namespace dd4hep::sim;
diff --git a/DDG4/src/Geant4UIManager.cpp b/DDG4/src/Geant4UIManager.cpp
index 9f6098d5d4580db279a8f6fd979b3ef4a0ad9e71..07ccc9af38ffb4ce0347f926540f878ec756dbb0 100644
--- a/DDG4/src/Geant4UIManager.cpp
+++ b/DDG4/src/Geant4UIManager.cpp
@@ -19,6 +19,7 @@
 #include "DD4hep/Printout.h"
 
 // Geant4 include files
+#include "G4Version.hh"
 #include "G4VisExecutive.hh"
 #include "G4UImanager.hh"
 #include "G4UIsession.hh"