diff --git a/Detectors/MUON/MCH/Align/CMakeLists.txt b/Detectors/MUON/MCH/Align/CMakeLists.txt
index 4f9c3cd7f35b8..2ef8fd3495658 100644
--- a/Detectors/MUON/MCH/Align/CMakeLists.txt
+++ b/Detectors/MUON/MCH/Align/CMakeLists.txt
@@ -31,8 +31,7 @@ o2_add_library(MCHAlign
 
 o2_target_root_dictionary(MCHAlign
   HEADERS
-    include/MCHAlign/Aligner.h
-    include/MCHAlign/AlignmentSpec.h)
+    include/MCHAlign/Aligner.h)
 
 o2_add_executable(
         alignment-workflow
diff --git a/Detectors/PHOS/calib/CMakeLists.txt b/Detectors/PHOS/calib/CMakeLists.txt
index c54001e08eee9..eca804037d53b 100644
--- a/Detectors/PHOS/calib/CMakeLists.txt
+++ b/Detectors/PHOS/calib/CMakeLists.txt
@@ -30,21 +30,14 @@ o2_add_library(PHOSCalibWorkflow
 o2_add_header_only_library(PHOSCalib)
 
 o2_target_root_dictionary(PHOSCalibWorkflow
-                          HEADERS include/PHOSCalibWorkflow/PHOSPedestalCalibDevice.h
-                                  include/PHOSCalibWorkflow/PHOSHGLGRatioCalibDevice.h
-                                  include/PHOSCalibWorkflow/PHOSTurnonCalibrator.h
+                          HEADERS include/PHOSCalibWorkflow/PHOSTurnonCalibrator.h
                                   include/PHOSCalibWorkflow/RingBuffer.h
                                   include/PHOSCalibWorkflow/ETCalibHistos.h
                                   include/PHOSCalibWorkflow/PHOSEnergyCalibrator.h
-                                  include/PHOSCalibWorkflow/PHOSEnergyCalibDevice.h
                                   include/PHOSCalibWorkflow/TurnOnHistos.h
                                   include/PHOSCalibWorkflow/PHOSTurnonCalibrator.h
-                                  include/PHOSCalibWorkflow/PHOSTurnonCalibDevice.h
                                   include/PHOSCalibWorkflow/PHOSRunbyrunCalibrator.h
-                                  include/PHOSCalibWorkflow/PHOSRunbyrunCalibDevice.h
                                   include/PHOSCalibWorkflow/PHOSL1phaseCalibrator.h
-                                  include/PHOSCalibWorkflow/PHOSL1phaseCalibDevice.h
-                                  include/PHOSCalibWorkflow/PHOSBadMapCalibDevice.h
                           LINKDEF src/PHOSCalibWorkflowLinkDef.h)
 
 o2_add_executable(calib-workflow
diff --git a/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSEnergyCalibrator.h b/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSEnergyCalibrator.h
index 65fb9978bd767..fcdd0bd7e1d2b 100644
--- a/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSEnergyCalibrator.h
+++ b/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSEnergyCalibrator.h
@@ -15,8 +15,6 @@
 /// @file   PHOSEnergyCalibtor.h
 /// @brief  Device to collect energy and time PHOS energy and time calibration.
 
-#include "Framework/Task.h"
-#include "Framework/WorkflowSpec.h"
 #include "DetectorsCalibration/TimeSlotCalibration.h"
 #include "DataFormatsPHOS/TriggerRecord.h"
 #include "DataFormatsPHOS/Cluster.h"
@@ -32,9 +30,7 @@
 
 using namespace o2::framework;
 
-namespace o2
-{
-namespace phos
+namespace o2::phos
 {
 
 // structure used to store digit info for re-calibration
@@ -156,7 +152,6 @@ class PHOSEnergyCalibrator final : public o2::calibration::TimeSlotCalibration<o
   std::unique_ptr<ETCalibHistos> mHistos; /// final histograms
 };
 
-} // namespace phos
 } // namespace o2
 
 #endif
diff --git a/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSL1phaseCalibrator.h b/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSL1phaseCalibrator.h
index 7e9f1a665dc87..e26fb9c5c88a5 100644
--- a/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSL1phaseCalibrator.h
+++ b/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSL1phaseCalibrator.h
@@ -15,8 +15,6 @@
 /// @file   PHOSRunbyrunCalibDevice.h
 /// @brief  Device to calculate PHOS time shift (L1phase)
 
-#include "Framework/Task.h"
-#include "Framework/ProcessingContext.h"
 #include "DataFormatsPHOS/BadChannelsMap.h"
 #include "DataFormatsPHOS/CalibParams.h"
 #include "DataFormatsPHOS/TriggerRecord.h"
@@ -25,9 +23,7 @@
 
 using namespace o2::framework;
 
-namespace o2
-{
-namespace phos
+namespace o2::phos
 {
 
 class PHOSL1phaseSlot
@@ -95,7 +91,6 @@ class PHOSL1phaseCalibrator final : public o2::calibration::TimeSlotCalibration<
   ClassDefOverride(PHOSL1phaseCalibrator, 3);
 };
 
-} // namespace phos
 } // namespace o2
 
 #endif
diff --git a/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSRunbyrunCalibrator.h b/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSRunbyrunCalibrator.h
index 5bd2d239c8786..2a71027ed4aa1 100644
--- a/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSRunbyrunCalibrator.h
+++ b/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSRunbyrunCalibrator.h
@@ -15,8 +15,6 @@
 /// @file   PHOSRunbyrunCalibDevice.h
 /// @brief  Device to calculate PHOS energy run by run corrections
 
-#include "Framework/Task.h"
-#include "Framework/ProcessingContext.h"
 #include "DataFormatsPHOS/BadChannelsMap.h"
 #include "DataFormatsPHOS/TriggerRecord.h"
 #include "DetectorsCalibration/TimeSlotCalibration.h"
@@ -28,9 +26,11 @@
 
 using namespace o2::framework;
 
-namespace o2
-{
-namespace phos
+namespace o2::framework {
+  struct ProcessingContext;
+}
+
+namespace o2::phos
 {
 
 class PHOSRunbyrunSlot
@@ -105,7 +105,6 @@ class PHOSRunbyrunCalibrator final : public o2::calibration::TimeSlotCalibration
   ClassDefOverride(PHOSRunbyrunCalibrator, 1);
 };
 
-} // namespace phos
 } // namespace o2
 
 #endif
diff --git a/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSTurnonCalibrator.h b/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSTurnonCalibrator.h
index b0e8e165254b7..5a97c4db97cc0 100644
--- a/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSTurnonCalibrator.h
+++ b/Detectors/PHOS/calib/include/PHOSCalibWorkflow/PHOSTurnonCalibrator.h
@@ -15,8 +15,6 @@
 /// @file   PHOSTurnonCalibrator.h
 /// @brief  Device to calculate PHOS turn-on curve and bad map
 
-#include "Framework/Task.h"
-#include "Framework/WorkflowSpec.h"
 #include "DetectorsCalibration/TimeSlotCalibration.h"
 #include "DataFormatsPHOS/Cluster.h"
 #include "DataFormatsPHOS/Cell.h"
@@ -26,9 +24,7 @@
 
 using namespace o2::framework;
 
-namespace o2
-{
-namespace phos
+namespace o2::phos
 {
 
 class PHOSTurnonSlot
@@ -96,8 +92,6 @@ class PHOSTurnonCalibrator final : public o2::calibration::TimeSlotCalibration<o
   ClassDefOverride(PHOSTurnonCalibrator, 1);
 };
 
-o2::framework::DataProcessorSpec getPHOSTunronCalibDeviceSpec(bool useCCDB);
-} // namespace phos
 } // namespace o2
 
 #endif
diff --git a/Detectors/PHOS/calib/src/PHOSCalibWorkflowLinkDef.h b/Detectors/PHOS/calib/src/PHOSCalibWorkflowLinkDef.h
index 88d90d49d41c4..d439d21bf62e4 100644
--- a/Detectors/PHOS/calib/src/PHOSCalibWorkflowLinkDef.h
+++ b/Detectors/PHOS/calib/src/PHOSCalibWorkflowLinkDef.h
@@ -15,26 +15,20 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class o2::phos::PHOSPedestalCalibDevice + ;
-#pragma link C++ class o2::phos::PHOSHGLGRatioCalibDevice + ;
-#pragma link C++ class o2::phos::PHOSBadMapCalibDevice + ;
 #pragma link C++ class o2::phos::ETCalibHistos + ;
 #pragma link C++ class o2::calibration::TimeSlot < o2::phos::PHOSEnergySlot> + ;
 #pragma link C++ class o2::calibration::TimeSlotCalibration < o2::phos::PHOSEnergySlot> + ;
 #pragma link C++ class o2::phos::TurnOnHistos + ;
 #pragma link C++ class o2::phos::PHOSTurnonSlot + ;
 #pragma link C++ class o2::phos::PHOSTurnonCalibrator + ;
-#pragma link C++ class o2::phos::PHOSTurnonCalibDevice + ;
 #pragma link C++ class o2::calibration::TimeSlot < o2::phos::PHOSTurnonSlot> + ;
 #pragma link C++ class o2::calibration::TimeSlotCalibration < o2::phos::PHOSTurnonSlot> + ;
 #pragma link C++ class o2::phos::PHOSRunbyrunSlot + ;
 #pragma link C++ class o2::phos::PHOSRunbyrunCalibrator + ;
-#pragma link C++ class o2::phos::PHOSRunbyrunCalibDevice + ;
 #pragma link C++ class o2::calibration::TimeSlot < o2::phos::PHOSRunbyrunSlot> + ;
 #pragma link C++ class o2::calibration::TimeSlotCalibration < o2::phos::PHOSRunbyrunSlot> + ;
 #pragma link C++ class o2::phos::PHOSL1phaseSlot + ;
 #pragma link C++ class o2::phos::PHOSL1phaseCalibrator + ;
-#pragma link C++ class o2::phos::PHOSL1phaseCalibDevice + ;
 #pragma link C++ class o2::calibration::TimeSlot < o2::phos::PHOSL1phaseSlot> + ;
 #pragma link C++ class o2::calibration::TimeSlotCalibration < o2::phos::PHOSL1phaseSlot> + ;
 #pragma link C++ class vector < int> + ;