diff --git a/DDCore/include/DDSegmentation/SegmentationUtil.h b/DDCore/include/DDSegmentation/SegmentationUtil.h
index 84a986802c085d2221dcad45973d1e12bd76863e..875fdfd861ffba84bb65ce4e815434a0d323d441 100644
--- a/DDCore/include/DDSegmentation/SegmentationUtil.h
+++ b/DDCore/include/DDSegmentation/SegmentationUtil.h
@@ -8,6 +8,8 @@
 #ifndef DDSEGMENTATION_SEGMENTATIONUTIL_H
 #define DDSEGMENTATION_SEGMENTATIONUTIL_H
 
+#include "DDSegmentation/Segmentation.h"
+
 #include <cmath>
 #include <vector>
 
diff --git a/DDCore/include/XML/UnicodeValues.h b/DDCore/include/XML/UnicodeValues.h
index 3a2cbdedf1340a13588a1f33688076c236a9238d..d0dddaaddd89cb484aac6083a6f5350ff2cc20ea 100644
--- a/DDCore/include/XML/UnicodeValues.h
+++ b/DDCore/include/XML/UnicodeValues.h
@@ -14,6 +14,8 @@
 //
 //==========================================================================
 
+#ifdef UNICODE
+
 extern const Tag_t Unicode_NULL;
 extern const Tag_t Unicode_empty;
 extern const Tag_t Unicode_star;
@@ -627,4 +629,6 @@ UNICODE (zmax);
 UNICODE (zplane);
 UNICODE (zstart);
 
+#endif // ifdef UNICODE
+
 #endif // XML_UNICODEVALUES_H
diff --git a/DDG4/include/DDG4/Geant4InteractionVertexBoost.h b/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
index 54d911e5489336385b8a9b75c288944cf3197fa0..50641befe94fe315f1d634160c65e76c384a57b7 100644
--- a/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
+++ b/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
@@ -25,6 +25,7 @@
 
 // Framework include files
 #include "DDG4/Geant4GeneratorAction.h"
+#include "DDG4/Geant4Primary.h"
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDG4/include/DDG4/Geant4PlacementParameterisation.h b/DDG4/include/DDG4/Geant4PlacementParameterisation.h
index 641e20e8eb3ca8257f5d18e42846517ecc23aa02..a4a1ed1d7aadee9bd645b583561a2bf32d47cf42 100644
--- a/DDG4/include/DDG4/Geant4PlacementParameterisation.h
+++ b/DDG4/include/DDG4/Geant4PlacementParameterisation.h
@@ -13,7 +13,10 @@
 #ifndef DDG4_GEANT4PLACEMENTPARAMETERISATION_H
 #define DDG4_GEANT4PLACEMENTPARAMETERISATION_H
 
+#include <DD4hep/Volumes.h>
+
 /// Geant4 include files
+#include <G4Transform3D.hh>
 #include <G4PVParameterised.hh>
 #include <G4VPVParameterisation.hh>
 
diff --git a/DDG4/include/DDG4/Geant4PrimaryHandler.h b/DDG4/include/DDG4/Geant4PrimaryHandler.h
index 754190b5a57df09b0720df4cd7aa4f9a8ad23e80..73ae6a23dc6700b56d323effa322b200b1c2f066 100644
--- a/DDG4/include/DDG4/Geant4PrimaryHandler.h
+++ b/DDG4/include/DDG4/Geant4PrimaryHandler.h
@@ -27,6 +27,8 @@
 // Framework include files
 #include "DDG4/Geant4GeneratorAction.h"
 
+#include <set>
+
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {