diff --git a/DDCore/include/DD4hep/GeoHandler.h b/DDCore/include/DD4hep/GeoHandler.h
index 466b27bf0c6c6988b4d1367581a4f53fb583dc9e..ed8de7473bd0c43308c913b7f5f8c1e33512f002 100644
--- a/DDCore/include/DD4hep/GeoHandler.h
+++ b/DDCore/include/DD4hep/GeoHandler.h
@@ -31,6 +31,12 @@ namespace DD4hep {
    */
   namespace Geometry {
 
+    struct LCDD;
+    struct Volume;
+    struct PlacedVolume;
+    struct DetElement;
+    struct SensitiveDetector;
+
     /** @class GeoHandler  GeoHandler.h
      *
      * @author  M.Frank
@@ -38,6 +44,7 @@ namespace DD4hep {
      */
     class GeoHandler {
     public:
+
       typedef std::set<TGeoVolume*>                              VolumeSet;
       typedef std::set<const TGeoVolume*>                        ConstVolumeSet;
       typedef std::vector<std::pair<std::string, TGeoMatrix*> >  TransformSet;
@@ -52,12 +59,6 @@ namespace DD4hep {
       typedef std::set<TNamed*>                                  ObjectSet;
       typedef LCDD::HandleMap                                    DefinitionSet;
 
-      typedef Geometry::LCDD              LCDD;
-      typedef Geometry::Volume            Volume;
-      typedef Geometry::PlacedVolume      PlacedVolume;
-      typedef Geometry::DetElement        DetElement;
-      typedef Geometry::SensitiveDetector SensitiveDetector;
-
       struct GeometryInfo   {
 	SolidSet           solids;
 	VolumeSet          volumes;
diff --git a/DDCore/include/XML/LCDDConverter.h b/DDCore/include/XML/LCDDConverter.h
index 91ec11fa8726a3a56b6e74b7633df54072d5da60..29796227d30a450259435eb80b70ab386c34e891 100644
--- a/DDCore/include/XML/LCDDConverter.h
+++ b/DDCore/include/XML/LCDDConverter.h
@@ -45,6 +45,8 @@ namespace DD4hep {
      * @version 1.0
      */
     struct LCDDConverter : public Geometry::GeoHandler  {
+      typedef Geometry::LCDD       LCDD;
+      typedef Geometry::DetElement DetElement;
       typedef std::map<const TGeoElement*,XmlElement*> ElementMap;
       typedef std::map<const TGeoMedium*, XmlElement*> MaterialMap;
       typedef std::map<const TNamed*,     XmlElement*> LimitMap;
diff --git a/DDCore/src/XML/LCDDConverter.cpp b/DDCore/src/XML/LCDDConverter.cpp
index d258e1eeda466b1f0473c83cadfe980824373dc2..8f97817a8d2f958a03c5e3ec29158a823566f417 100644
--- a/DDCore/src/XML/LCDDConverter.cpp
+++ b/DDCore/src/XML/LCDDConverter.cpp
@@ -55,6 +55,7 @@ typedef Geometry::Readout      Readout;
 typedef Geometry::LimitSet     LimitSet;
 typedef Geometry::IDDescriptor IDDescriptor;
 typedef Geometry::PlacedVolume PlacedVolume;
+typedef Geometry::SensitiveDetector SensitiveDetector;
 
 #define TAG(x)  extern const Tag_t Tag_##x  (#x)
 #define ATTR(x) extern const Tag_t Attr_##x (#x)
diff --git a/DDG4/include/DDG4/Geant4Converter.h b/DDG4/include/DDG4/Geant4Converter.h
index 0ccc723c30ba752d6e7c2ba4bc75085963ec5554..09ae9760e51f08fc66e47ff5e960d5c6e4d883af 100644
--- a/DDG4/include/DDG4/Geant4Converter.h
+++ b/DDG4/include/DDG4/Geant4Converter.h
@@ -57,6 +57,8 @@ namespace DD4hep {
      * @version 1.0
      */
     struct Geant4Converter : public Geometry::GeoHandler  {
+      typedef Geometry::LCDD       LCDD;
+      typedef Geometry::DetElement DetElement;
       typedef std::map<const TGeoElement*,G4Element*>               ElementMap;
       typedef std::map<const TGeoMedium*, G4Material*>              MaterialMap;
       typedef std::map<const TNamed*,     G4UserLimits*>            LimitMap;