diff --git a/DDDigi/include/DDDigi/DigiPoissonNoise.h b/DDDigi/include/DDDigi/DigiPoissonNoise.h
index c09c501d8b250243cf69a4368fc0b93c6ca12a7b..bb7d848b910a5e7e3e023de2dc602c1278d3962f 100644
--- a/DDDigi/include/DDDigi/DigiPoissonNoise.h
+++ b/DDDigi/include/DDDigi/DigiPoissonNoise.h
@@ -14,7 +14,7 @@
 #define DDDIGI_DIGIPOISSONNOISE_H
 
 /// Framework include files
-#include "DDDigi/DigiSignalProcessor.h"
+#include <DDDigi/DigiSignalProcessor.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDDigi/include/DDDigi/DigiRandomNoise.h b/DDDigi/include/DDDigi/DigiRandomNoise.h
index f3f531ef78fa16cc77d537fd07720b47aecd10b5..75e637e024f74953c77ef84207a16b137b1413ef 100644
--- a/DDDigi/include/DDDigi/DigiRandomNoise.h
+++ b/DDDigi/include/DDDigi/DigiRandomNoise.h
@@ -14,8 +14,8 @@
 #define DDDIGI_DIGIRANDOMNOISE_H
 
 /// Framework include files
-#include "DDDigi/DigiSignalProcessor.h"
-#include "DDDigi/FalphaNoise.h"
+#include <DDDigi/DigiSignalProcessor.h>
+#include <DDDigi/FalphaNoise.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
diff --git a/DDDigi/plugins/Components.cpp b/DDDigi/plugins/Components.cpp
index b36856ca8ccbbcbeb9e908990657f1e03e3c6cb2..92d97d7a24541600dcf39f65466a57250f99e3d2 100644
--- a/DDDigi/plugins/Components.cpp
+++ b/DDDigi/plugins/Components.cpp
@@ -12,48 +12,48 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Printout.h"
-#include "DD4hep/Factories.h"
-#include "DDDigi/DigiFactories.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/Factories.h>
+#include <DDDigi/DigiFactories.h>
 
 // C/C++ include files
 #include <cerrno>
 #include <cstdlib>
 #include <sstream>
 
-#include "DDDigi/DigiInputAction.h"
+#include <DDDigi/DigiInputAction.h>
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiInputAction)
 
-#include "DDDigi/DigiROOTInput.h"
+#include <DDDigi/DigiROOTInput.h>
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiROOTInput)
 
-#include "DDDigi/DigiSynchronize.h"
+#include <DDDigi/DigiSynchronize.h>
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiSynchronize)
 
-#include "DDDigi/DigiActionSequence.h"
+#include <DDDigi/DigiActionSequence.h>
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiActionSequence)
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiParallelActionSequence)
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiSequentialActionSequence)
 
-#include "DDDigi/DigiSubdetectorSequence.h"
+#include <DDDigi/DigiSubdetectorSequence.h>
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiSubdetectorSequence)
 
-#include "DDDigi/DigiLockedAction.h"
+#include <DDDigi/DigiLockedAction.h>
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiLockedAction)
 
-#include "DDDigi/DigiSignalProcessorSequence.h"
+#include <DDDigi/DigiSignalProcessorSequence.h>
 DECLARE_DIGISIGNALPROCESSOR_NS(dd4hep::digi,DigiSignalProcessorSequence)
 
-#include "DDDigi/DigiStoreDump.h"
+#include <DDDigi/DigiStoreDump.h>
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiStoreDump)
 
-#include "DDDigi/DigiHitAttenuatorExp.h"
+#include <DDDigi/DigiHitAttenuatorExp.h>
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiHitAttenuatorExp)
 
-#include "DDDigi/DigiContainerCombine.h"
+#include <DDDigi/DigiContainerCombine.h>
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiContainerCombine)
 
-#include "DDDigi/DigiSegmentationSplitter.h"
+#include <DDDigi/DigiSegmentationSplitter.h>
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiSegmentationSplitter)
 
 
diff --git a/DDDigi/plugins/DigiHitHistoryDrop.cpp b/DDDigi/plugins/DigiHitHistoryDrop.cpp
index 04d1e694cdf6c76f915324ababf0649bdc7a3c7b..c3dd1b30675d99ccec490d465d0d847a032d5c1c 100644
--- a/DDDigi/plugins/DigiHitHistoryDrop.cpp
+++ b/DDDigi/plugins/DigiHitHistoryDrop.cpp
@@ -12,10 +12,10 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/InstanceCount.h"
-#include "DDDigi/DigiData.h"
-#include "DDDigi/DigiContext.h"
-#include "DDDigi/DigiEventAction.h"
+#include <DD4hep/InstanceCount.h>
+#include <DDDigi/DigiData.h>
+#include <DDDigi/DigiContext.h>
+#include <DDDigi/DigiEventAction.h>
 
 
 /// Namespace for the AIDA detector description toolkit
@@ -84,5 +84,5 @@ namespace dd4hep {
 }      // End namespace dd4hep
 
 
-#include "DDDigi/DigiFactories.h"
+#include <DDDigi/DigiFactories.h>
 DECLARE_DIGIEVENTACTION_NS(dd4hep::digi,DigiHitHistoryDrop)
diff --git a/DDDigi/plugins/DigiRandomNoise.cpp b/DDDigi/plugins/DigiRandomNoise.cpp
index a0b013a91ca0b87010793b1769404cea36047b36..7055249a9d57de28ecb8c3f1f4f2edc076e40747 100644
--- a/DDDigi/plugins/DigiRandomNoise.cpp
+++ b/DDDigi/plugins/DigiRandomNoise.cpp
@@ -75,10 +75,10 @@ namespace dd4hep {
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Printout.h"
-#include "DD4hep/InstanceCount.h"
-#include "DDDigi/DigiFactories.h"
-//#include "DDDigi/DigiRandomNoise.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/InstanceCount.h>
+#include <DDDigi/DigiFactories.h>
+//#include <DDDigi/DigiRandomNoise.h>
 
 // C/C++ include files
 
diff --git a/DDDigi/python/DDDigiDict.C b/DDDigi/python/DDDigiDict.C
index 7b39474324e4e1aebdf58a4326f53015f41fb12b..10f6d167f837dd6748889eecaf631fa88b482835 100644
--- a/DDDigi/python/DDDigiDict.C
+++ b/DDDigi/python/DDDigiDict.C
@@ -31,16 +31,16 @@
 #pragma clang diagnostic ignored "-Woverlength-strings"
 #endif
 
-#include "DDDigi/DigiData.h"
-#include "DDDigi/DigiHandle.h"
-#include "DDDigi/DigiKernel.h"
-#include "DDDigi/DigiContext.h"
-#include "DDDigi/DigiAction.h"
-#include "DDDigi/DigiSynchronize.h"
-#include "DDDigi/DigiEventAction.h"
-#include "DDDigi/DigiInputAction.h"
-#include "DDDigi/DigiActionSequence.h"
-#include "DDDigi/DigiSignalProcessor.h"
+#include <DDDigi/DigiData.h>
+#include <DDDigi/DigiHandle.h>
+#include <DDDigi/DigiKernel.h>
+#include <DDDigi/DigiContext.h>
+#include <DDDigi/DigiAction.h>
+#include <DDDigi/DigiSynchronize.h>
+#include <DDDigi/DigiEventAction.h>
+#include <DDDigi/DigiInputAction.h>
+#include <DDDigi/DigiActionSequence.h>
+#include <DDDigi/DigiSignalProcessor.h>
 
 struct DDDigiDict  {};
 
diff --git a/DDDigi/python/dddigi.py b/DDDigi/python/dddigi.py
index acd7bb17d115e9524d1e919309295c36e7646e2f..f86708c5d416ba74376207a944b4d7040ff634db 100644
--- a/DDDigi/python/dddigi.py
+++ b/DDDigi/python/dddigi.py
@@ -9,7 +9,8 @@
 #
 # ==========================================================================
 from __future__ import absolute_import, unicode_literals
-from dd4hep_base import *  # noqa: F403
+from dd4hep_base import *  # noqa: F401
+
 
 logger = None
 
@@ -285,4 +286,4 @@ try:
   import digitize
   Digitize = digitize.Digitize
 except Exception as X:
-  logger.error('Failed to import digitize: '+str(X))
+  logger.error('Failed to import digitize: ' + str(X))
diff --git a/DDDigi/src/DigiLockedAction.cpp b/DDDigi/src/DigiLockedAction.cpp
index b6dc4997127b9ddd2d3daaf6923889bbb07cab6e..daa112fd8be9660f4071b1db16290d4266fa559f 100644
--- a/DDDigi/src/DigiLockedAction.cpp
+++ b/DDDigi/src/DigiLockedAction.cpp
@@ -12,9 +12,9 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/Printout.h"
-#include "DD4hep/InstanceCount.h"
-#include "DDDigi/DigiLockedAction.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/InstanceCount.h>
+#include <DDDigi/DigiLockedAction.h>
 
 // C/C++ include files
 
diff --git a/DDDigi/src/DigiPoissonNoise.cpp b/DDDigi/src/DigiPoissonNoise.cpp
index 0dbba79476ee46e717ab17d2e8908c651c57b229..85f4ff81cb7b6f3f5199690e1b4d40258c22a168 100644
--- a/DDDigi/src/DigiPoissonNoise.cpp
+++ b/DDDigi/src/DigiPoissonNoise.cpp
@@ -12,10 +12,10 @@
 //==========================================================================
 
 // Framework include files
-#include "DD4hep/InstanceCount.h"
-#include "DDDigi/DigiPoissonNoise.h"
-#include "DDDigi/DigiSegmentation.h"
-#include "DDDigi/DigiRandomGenerator.h"
+#include <DD4hep/InstanceCount.h>
+#include <DDDigi/DigiPoissonNoise.h>
+#include <DDDigi/DigiSegmentation.h>
+#include <DDDigi/DigiRandomGenerator.h>
 
 using namespace dd4hep::digi;
 
diff --git a/DDDigi/src/DigiRandomGenerator.cpp b/DDDigi/src/DigiRandomGenerator.cpp
index 984ba26d3f768341fa5b057991da935531bdee95..14a29c6ccb9376cfa54509bcb2f1d14e3abdcd16 100644
--- a/DDDigi/src/DigiRandomGenerator.cpp
+++ b/DDDigi/src/DigiRandomGenerator.cpp
@@ -24,10 +24,10 @@
 //==========================================================================
 
 // Framework include files
-#include "DDDigi/DigiRandomGenerator.h"
+#include <DDDigi/DigiRandomGenerator.h>
 #include <Math/ProbFuncMathCore.h>
 #include <Math/SpecFuncMathCore.h>
-#include "Math/QuantFuncMathCore.h"
+#include <Math/QuantFuncMathCore.h>
 #include <cmath>
 
 
diff --git a/DDDigi/src/FalphaNoise.cpp b/DDDigi/src/FalphaNoise.cpp
index 40d085c2cac54c694e3efce12e7536343d991599..70946b8168bb545d58ef10d3f94315a359c92e16 100644
--- a/DDDigi/src/FalphaNoise.cpp
+++ b/DDDigi/src/FalphaNoise.cpp
@@ -63,7 +63,7 @@ using namespace dd4hep::detail;
 * 
 */
 
-//#include "cnoise.h"
+//#include <cnoise.h>
 #ifndef __CNOISE_H
 #define __CNOISE_H
 
diff --git a/DDDigi/test_task_queue.cpp b/DDDigi/test_task_queue.cpp
index 345f1ebfbf741bcaea04382cfe1c116fe5728dac..76ae7e9a1789c5d27949b9bd09147689c8bffd79 100644
--- a/DDDigi/test_task_queue.cpp
+++ b/DDDigi/test_task_queue.cpp
@@ -10,7 +10,7 @@
 // Author     : M.Frank
 //
 //==========================================================================
-#include "tbb/tbb.h"
+#include <tbb/tbb.h>
 #include <iostream>
 using namespace tbb;
 using namespace std;