From 2d6776d989a573211d7148a754b2fe9b5b4c0b8c Mon Sep 17 00:00:00 2001
From: Markus FRANK <Markus.Frank@cern.ch>
Date: Tue, 5 Jan 2021 11:18:50 +0100
Subject: [PATCH] Fix DDCore dictionaries to not include Plugins.h

---
 DDCore/include/DD4hep/DetFactoryHelper.h | 3 ++-
 DDCore/include/XML/Helper.h              | 1 -
 DDCore/src/plugins/Compact2Objects.cpp   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/DDCore/include/DD4hep/DetFactoryHelper.h b/DDCore/include/DD4hep/DetFactoryHelper.h
index 5a00102ab..66f8a3750 100644
--- a/DDCore/include/DD4hep/DetFactoryHelper.h
+++ b/DDCore/include/DD4hep/DetFactoryHelper.h
@@ -15,6 +15,7 @@
 
 /** Obsolete header. Better use XML/Helper.h instead !  */
 
-#include "XML/Helper.h"
+#include <XML/Helper.h>
+#include <DD4hep/Factories.h>
 
 #endif // DD4HEP_DETFACTORYHELPER_H
diff --git a/DDCore/include/XML/Helper.h b/DDCore/include/XML/Helper.h
index 813d785aa..9438557a8 100644
--- a/DDCore/include/XML/Helper.h
+++ b/DDCore/include/XML/Helper.h
@@ -16,7 +16,6 @@
 // Framework include files
 #include "XML/XML.h"
 #include "DD4hep/Detector.h"
-#include "DD4hep/Factories.h"
 #include "DD4hep/DD4hepUnits.h"
 
 /// Namespace for the AIDA detector description toolkit
diff --git a/DDCore/src/plugins/Compact2Objects.cpp b/DDCore/src/plugins/Compact2Objects.cpp
index 65102cba6..fab6267f8 100644
--- a/DDCore/src/plugins/Compact2Objects.cpp
+++ b/DDCore/src/plugins/Compact2Objects.cpp
@@ -28,6 +28,7 @@
 #include <DD4hep/DD4hepUnits.h>
 #include <DD4hep/FieldTypes.h>
 #include <DD4hep/Printout.h>
+#include <DD4hep/Factories.h>
 #include <DD4hep/Plugins.h>
 #include <DD4hep/detail/SegmentationsInterna.h>
 #include <DD4hep/detail/DetectorInterna.h>
-- 
GitLab