diff --git a/DDG4/include/DDG4/Geant4UIMessenger.h b/DDG4/include/DDG4/Geant4UIMessenger.h
index 229e92109645207322c7d9ece27abb7b51073b8f..e58b636562f89e031f097fa4215ebc67a1c95d79 100644
--- a/DDG4/include/DDG4/Geant4UIMessenger.h
+++ b/DDG4/include/DDG4/Geant4UIMessenger.h
@@ -13,6 +13,7 @@
 #include "DDG4/ComponentProperties.h"
 #include "DDG4/Geant4Callback.h"
 #include "G4UImessenger.hh"
+#include "G4UIdirectory.hh"
 
 /*
  *   DD4hep namespace declaration
diff --git a/DDG4/plugins/Geant4Processes.cpp b/DDG4/plugins/Geant4Processes.cpp
index ff7b06e92b751bd25b596164a6fd57959cd4c8eb..3f9f1991b95138e6ee5fe663ee71a78085089fe8 100644
--- a/DDG4/plugins/Geant4Processes.cpp
+++ b/DDG4/plugins/Geant4Processes.cpp
@@ -13,6 +13,12 @@
 // Geant4 physics lists
 #include "G4DecayPhysics.hh"
 
+//fg: uncomment to build for geant4 9.6
+//    -> should be handled in cmake files...
+//#define GEANT4_9_6
+
+
+
 // ======================================================================
 // Predefined physics constructors
 //
@@ -44,10 +50,14 @@ DECLARE_GEANT4_PHYSICS(G4EmLivermorePhysics)
 // Ion and hadrons
 #include "G4IonBinaryCascadePhysics.hh"
 DECLARE_GEANT4_PHYSICS(G4IonBinaryCascadePhysics)
-#include "G4IonINCLXXPhysics.hh"
-DECLARE_GEANT4_PHYSICS(G4IonINCLXXPhysics)
-#include "G4IonLHEPPhysics.hh"
-DECLARE_GEANT4_PHYSICS(G4IonLHEPPhysics)
+
+#ifdef GEANT4_9_6
+ #include "G4IonINCLXXPhysics.hh"
+ DECLARE_GEANT4_PHYSICS(G4IonINCLXXPhysics)
+ #include "G4IonLHEPPhysics.hh"
+ DECLARE_GEANT4_PHYSICS(G4IonLHEPPhysics)
+#endif
+
 #include "G4IonPhysics.hh"
 DECLARE_GEANT4_PHYSICS(G4IonPhysics)
 #include "G4IonQMDPhysics.hh"
@@ -260,8 +270,33 @@ DECLARE_GEANT4_PHYSICS_LIST(EmptyPhysics)
 // Physics constructors from source/physics_lists
 #include "CHIPS.hh"
 DECLARE_GEANT4_PHYSICS_LIST(CHIPS)
-#include "CHIPS_HP.hh"
-DECLARE_GEANT4_PHYSICS_LIST(CHIPS_HP)
+#ifdef GEANT4_9_6
+
+ #include "CHIPS_HP.hh"
+ DECLARE_GEANT4_PHYSICS_LIST(CHIPS_HP)
+ #include "FTFP_BERT.hh"
+ DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT)
+ #include "FTFP_BERT_HP.hh"
+ DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_HP)
+ #include "QGSP_BERT_95.hh"
+ DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_95)
+ #include "QGSP_BERT_95XS.hh"
+ DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_95XS)
+ #include "QGSP_INCLXX.hh"
+ DECLARE_GEANT4_PHYSICS_LIST(QGSP_INCLXX)
+ #include "HadronPhysicsQGSP_INCLXX.hh"
+ DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_INCLXX)
+ #include "HadronPhysicsFTFP_BERT.hh"
+ DECLARE_GEANT4_PHYSICS(HadronPhysicsFTFP_BERT)
+ #include "HadronPhysicsFTFP_BERT_HP.hh"
+ DECLARE_GEANT4_PHYSICS(HadronPhysicsFTFP_BERT_HP)
+#include "HadronPhysicsQGSP_BERT_95.hh"
+DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT_95)
+#include "HadronPhysicsQGSP_FTFP_BERT_95.hh"
+DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_FTFP_BERT_95)
+
+#endif
+
 #include "FTF_BIC.hh"
 DECLARE_GEANT4_PHYSICS_LIST(FTF_BIC)
 #include "FTFP_BERT_EMV.hh"
@@ -270,10 +305,6 @@ DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_EMV)
 DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_EMX)
 #include "FTFP_BERT.hh"
 DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT)
-#include "FTFP_BERT_HP.hh"
-DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_HP)
-#include "FTFP_BERT.hh"
-DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT)
 #include "FTFP_BERT_TRV.hh"
 DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_TRV)
 #include "LBE.hh"
@@ -282,20 +313,14 @@ DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_TRV)
 DECLARE_GEANT4_PHYSICS_LIST(LHEP_EMV)
 #include "LHEP.hh"
 DECLARE_GEANT4_PHYSICS_LIST(LHEP)
-
 #include "QBBC.hh"
 DECLARE_GEANT4_PHYSICS_LIST(QBBC)
 #include "QGS_BIC.hh"
 DECLARE_GEANT4_PHYSICS_LIST(QGS_BIC)
-
 #include "QGSC_BERT.hh"
 DECLARE_GEANT4_PHYSICS_LIST(QGSC_BERT)
 #include "QGSC_CHIPS.hh"
 DECLARE_GEANT4_PHYSICS_LIST(QGSC_CHIPS)
-#include "QGSP_BERT_95.hh"
-DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_95)
-#include "QGSP_BERT_95XS.hh"
-DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_95XS)
 #include "QGSP_BERT_CHIPS.hh"
 DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_CHIPS)
 #include "QGSP_BERT_EMV.hh"
@@ -314,27 +339,16 @@ DECLARE_GEANT4_PHYSICS_LIST(QGSP_BIC_EMY)
 DECLARE_GEANT4_PHYSICS_LIST(QGSP_BIC_HP)
 #include "QGSP_BIC.hh"
 DECLARE_GEANT4_PHYSICS_LIST(QGSP_BIC)
-#include "QGSP_FTFP_BERT_95.hh"
-DECLARE_GEANT4_PHYSICS_LIST(QGSP_FTFP_BERT_95)
-#include "QGSP_FTFP_BERT_95XS.hh"
-DECLARE_GEANT4_PHYSICS_LIST(QGSP_FTFP_BERT_95XS)
 #include "QGSP_FTFP_BERT.hh"
 DECLARE_GEANT4_PHYSICS_LIST(QGSP_FTFP_BERT)
 #include "QGSP.hh"
 DECLARE_GEANT4_PHYSICS_LIST(QGSP)
-#include "QGSP_INCLXX.hh"
-DECLARE_GEANT4_PHYSICS_LIST(QGSP_INCLXX)
 #include "QGSP_QEL.hh"
 DECLARE_GEANT4_PHYSICS_LIST(QGSP_QEL)
-
 #include "HadronPhysicsCHIPS.hh"
 DECLARE_GEANT4_PHYSICS(HadronPhysicsCHIPS)
 #include "HadronPhysicsFTF_BIC.hh"
 DECLARE_GEANT4_PHYSICS(HadronPhysicsFTF_BIC)
-#include "HadronPhysicsFTFP_BERT.hh"
-DECLARE_GEANT4_PHYSICS(HadronPhysicsFTFP_BERT)
-#include "HadronPhysicsFTFP_BERT_HP.hh"
-DECLARE_GEANT4_PHYSICS(HadronPhysicsFTFP_BERT_HP)
 #include "HadronPhysicsFTFP_BERT_TRV.hh"
 DECLARE_GEANT4_PHYSICS(HadronPhysicsFTFP_BERT_TRV)
 #include "HadronPhysicsLHEP_EMV.hh"
@@ -347,8 +361,6 @@ DECLARE_GEANT4_PHYSICS(HadronPhysicsQGS_BIC)
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSC_BERT)
 #include "HadronPhysicsQGSC_CHIPS.hh"
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSC_CHIPS)
-#include "HadronPhysicsQGSP_BERT_95.hh"
-DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT_95)
 #include "HadronPhysicsQGSP_BERT_CHIPS.hh"
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT_CHIPS)
 #include "HadronPhysicsQGSP_BERT.hh"
@@ -363,14 +375,10 @@ DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BERT_TRV)
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BIC)
 #include "HadronPhysicsQGSP_BIC_HP.hh"
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_BIC_HP)
-#include "HadronPhysicsQGSP_FTFP_BERT_95.hh"
-DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_FTFP_BERT_95)
 #include "HadronPhysicsQGSP_FTFP_BERT.hh"
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_FTFP_BERT)
 #include "HadronPhysicsQGSP.hh"
 DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP)
-#include "HadronPhysicsQGSP_INCLXX.hh"
-DECLARE_GEANT4_PHYSICS(HadronPhysicsQGSP_INCLXX)
 
 #if 0