Merge 4d07555 into sapling-pr-archive-ktf

Author: ktf

Detectors/TPC/workflow/src/tpc-integrate-idc.cxx

@@ -11,6 +11,7 @@
 
 #include <vector>
 #include <string>
+#include <thread>
 #include "Algorithm/RangeTokenizer.h"
 #include "Framework/WorkflowSpec.h"
 #include "Framework/ConfigParamSpec.h"

Detectors/TPC/workflow/src/tpc-krypton-clusterer.cxx

@@ -12,6 +12,7 @@
 #include <vector>
 #include <string>
 #include <unordered_map>
+#include <thread>
 
 #include "Algorithm/RangeTokenizer.h"
 #include "Framework/WorkflowSpec.h"

Framework/Core/include/Framework/ServiceRegistry.h

@@ -14,17 +14,13 @@
 #include "Framework/ThreadSafetyAnalysis.h"
 #include "Framework/ServiceHandle.h"
 #include "Framework/ServiceSpec.h"
-#include "Framework/ServiceRegistryHelpers.h"
 #include "Framework/CompilerBuiltins.h"
 #include "Framework/TypeIdHelpers.h"
 
-#include <algorithm>
 #include <array>
-#include <functional>
 #include <string>
 #include <type_traits>
 #include <typeinfo>
-#include <thread>
 #include <atomic>
 #include <mutex>
 

Framework/Core/src/ArrowSupport.cxx

@@ -31,6 +31,8 @@
 #include "WorkflowHelpers.h"
 #include "Framework/WorkflowSpecNode.h"
 #include "Framework/AnalysisSupportHelpers.h"
+#include "Framework/ServiceRegistryRef.h"
+#include "Framework/ServiceRegistryHelpers.h"
 
 #include "CommonMessageBackendsHelpers.h"
 #include <Monitoring/Monitoring.h>

Framework/Core/src/DataProcessingStates.cxx

@@ -18,6 +18,7 @@
 #include <iostream>
 #include <atomic>
 #include <utility>
+#include <thread>
 #include <string_view>
 
 namespace o2::framework

Framework/Core/src/WorkflowHelpers.cxx

@@ -27,6 +27,7 @@
 #include "Framework/DataTakingContext.h"
 #include "Framework/DefaultsHelpers.h"
 #include "Framework/Signpost.h"
+#include "Framework/ServiceRegistryHelpers.h"
 
 #include "Framework/Variant.h"
 #include "Headers/DataHeader.h"

Framework/Core/src/runDataProcessing.cxx

@@ -34,6 +34,7 @@
 #include "Framework/DeviceState.h"
 #include "Framework/DeviceConfig.h"
 #include "DeviceStateHelpers.h"
+#include "Framework/ServiceRegistryHelpers.h"
 #include "Framework/DevicesManager.h"
 #include "Framework/DebugGUI.h"
 #include "Framework/LocalRootFileService.h"

Framework/Core/test/test_ComputingQuotaEvaluator.cxx

@@ -16,6 +16,7 @@
 #include "Framework/Logger.h"
 #include "Framework/TimingHelpers.h"
 #include "Framework/DataProcessingStats.h"
+#include "Framework/ServiceRegistryHelpers.h"
 #include "uv.h"
 
 #pragma GCC diagnostic push

Framework/Core/test/test_DataRelayer.cxx

@@ -22,6 +22,7 @@
 #include "Framework/TimingHelpers.h"
 #include "../src/DataRelayerHelpers.h"
 #include "Framework/DataProcessingHeader.h"
+#include "Framework/ServiceRegistryHelpers.h"
 #include "Framework/WorkflowSpec.h"
 #include <Monitoring/Monitoring.h>
 #include <fairmq/TransportFactory.h>

Framework/Core/test/test_Services.cxx

@@ -14,6 +14,7 @@
 #include "Framework/ServiceRegistry.h"
 #include "Framework/CallbackService.h"
 #include "Framework/CommonServices.h"
+#include "Framework/ServiceRegistryHelpers.h"
 #include <Framework/DeviceState.h>
 #include <catch_amalgamated.hpp>
 #include <fairmq/ProgOptions.h>