From ca4719944fbbee7b64c5f8c87fa630e8a8d5cebc Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Mon, 7 Sep 2020 12:41:44 +0200
Subject: [PATCH] Remove unused IJobOptionsSvc include

---
 Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx            | 1 -
 .../AthenaMonitoring/ManagedMonitorToolBase.h                 | 1 -
 Control/AthenaMonitoring/src/ManagedMonitorToolTest.cxx       | 1 -
 Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx         | 1 -
 Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx         | 1 -
 Control/AthenaServices/src/AthenaOutputStream.cxx             | 1 -
 Control/SGComps/src/SGFolder.cxx                              | 1 -
 Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx | 1 -
 .../AthenaRootComps/src/RootNtupleOutputMetadataTool.cxx      | 1 -
 Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx | 1 -
 .../AFP/AFP_Monitoring/src/AFPHitsMonitorTool.cxx             | 1 -
 .../AFP/AFP_Monitoring/src/AFPTechnicalMonitorTool.cxx        | 1 -
 .../InDetAlignmentMonitoring/src/IDAlignMonEfficiencies.cxx   | 1 -
 .../InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx  | 1 -
 .../InDetAlignmentMonitoring/src/IDAlignMonNtuple.cxx         | 1 -
 .../InDetAlignmentMonitoring/src/IDAlignMonPVBiases.cxx       | 1 -
 .../InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx      | 1 -
 .../InDetAlignmentMonitoring/src/IDAlignMonSivsTRT.cxx        | 1 -
 .../InDetAlignmentMonitoring/src/IDAlignMonTrackSegments.cxx  | 1 -
 .../src/IDAlignMonTruthComparison.cxx                         | 1 -
 .../InDetAlignmentMonitoring/src/InDetAlignMonBeamSpot.cxx    | 1 -
 .../InDetGlobalMonitoring/src/InDetGlobalBeamSpotMonTool.cxx  | 1 -
 .../InDetPerformanceMonitoring/src/IDPerfMonKshort.cxx        | 1 -
 .../InDetPerformanceMonitoring/src/IDPerfMonWenu.cxx          | 1 -
 .../InDetPerformanceMonitoring/src/IDPerfMonZee.cxx           | 1 -
 .../InDetVertexMonitoring/src/InDetVertexMonitoring.cxx       | 1 -
 .../MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.cxx  | 2 --
 .../MuonCSC_CnvTools/src/CSC_RawDataProviderToolCore.cxx      | 2 --
 .../MuonCSC_CnvTools/src/CSC_RawDataProviderToolMT.cxx        | 2 --
 .../MuonMDT_CnvTools/src/MDT_RawDataProviderToolCore.cxx      | 1 -
 .../MuonRPC_CnvTools/src/RPC_RawDataProviderToolMT.cxx        | 1 -
 .../MuonTGC_CnvTools/src/TGC_RawDataProviderToolCore.cxx      | 1 -
 .../AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx    | 1 -
 .../AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx    | 1 -
 .../ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx   | 1 -
 .../ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx   | 1 -
 .../ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx    | 1 -
 .../HeavyIonPhys/HIEventUtils/Root/HIEventSelectionTool.cxx   | 4 ----
 38 files changed, 44 deletions(-)

diff --git a/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx b/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx
index df63dbfab66..d66b52db825 100644
--- a/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx
+++ b/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx
@@ -4,7 +4,6 @@
 
 #include "HiveExSvc.h"
 #include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/ConcurrencyFlags.h"
 #include "GaudiKernel/EventContext.h"
 
diff --git a/Control/AthenaMonitoring/AthenaMonitoring/ManagedMonitorToolBase.h b/Control/AthenaMonitoring/AthenaMonitoring/ManagedMonitorToolBase.h
index 05c9f4214af..aa7a1713616 100644
--- a/Control/AthenaMonitoring/AthenaMonitoring/ManagedMonitorToolBase.h
+++ b/Control/AthenaMonitoring/AthenaMonitoring/ManagedMonitorToolBase.h
@@ -56,7 +56,6 @@ class IDQFilterTool;
 //#include "../src/AthMonBench.h"
 
 #include "GaudiKernel/IHistogramSvc.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/IMessageSvc.h"
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/MsgStream.h"
diff --git a/Control/AthenaMonitoring/src/ManagedMonitorToolTest.cxx b/Control/AthenaMonitoring/src/ManagedMonitorToolTest.cxx
index 47ddd5f7c31..c53b4a6c2dc 100644
--- a/Control/AthenaMonitoring/src/ManagedMonitorToolTest.cxx
+++ b/Control/AthenaMonitoring/src/ManagedMonitorToolTest.cxx
@@ -8,7 +8,6 @@
 
 #include <sstream>
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/StatusCode.h"
 
diff --git a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
index 523cb839583..3813a628003 100644
--- a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
@@ -28,7 +28,6 @@
 #include "GaudiKernel/IDataManagerSvc.h"
 #include "GaudiKernel/IDataProviderSvc.h"
 #include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/GaudiException.h"
 #include "GaudiKernel/AppReturnCode.h"
 #include "GaudiKernel/MsgStream.h"
diff --git a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
index fa97ddab83b..c0b5fdf92e1 100644
--- a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
@@ -21,7 +21,6 @@
 #include "GaudiKernel/IDataManagerSvc.h"
 #include "GaudiKernel/IDataProviderSvc.h"
 #include "GaudiKernel/IConversionSvc.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/GaudiException.h"
 #include "GaudiKernel/AppReturnCode.h"
 #include "GaudiKernel/MsgStream.h"
diff --git a/Control/AthenaServices/src/AthenaOutputStream.cxx b/Control/AthenaServices/src/AthenaOutputStream.cxx
index 6d521d15da2..93d123b1793 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStream.cxx
@@ -13,7 +13,6 @@
 #include "GaudiKernel/IProperty.h"
 #include "GaudiKernel/ClassID.h"
 #include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/AlgTool.h"
 
 #include "AthenaKernel/IClassIDSvc.h"
diff --git a/Control/SGComps/src/SGFolder.cxx b/Control/SGComps/src/SGFolder.cxx
index 231af172592..70a5e47cd05 100644
--- a/Control/SGComps/src/SGFolder.cxx
+++ b/Control/SGComps/src/SGFolder.cxx
@@ -7,7 +7,6 @@
 #include <iostream>
 #include <vector>
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/IMessageSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ISvcLocator.h"
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
index 43aa3e70f5f..e1afd173d9f 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
@@ -13,7 +13,6 @@
 #include "GaudiKernel/FileIncident.h"
 
 #include "GaudiKernel/IOpaqueAddress.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/IIncidentSvc.h"
 #include "GaudiKernel/AttribStringParser.h"
 
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputMetadataTool.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputMetadataTool.cxx
index 28d83f1e276..fbd4939a073 100755
--- a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputMetadataTool.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputMetadataTool.cxx
@@ -18,7 +18,6 @@
 #include "GaudiKernel/IOpaqueAddress.h"
 #include "GaudiKernel/IRegistry.h"
 #include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 
 // Athena
 #include "AthenaKernel/IClassIDSvc.h"
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
index 28deebbc9aa..a0723224e94 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
@@ -10,7 +10,6 @@
 #include "EventStorage/pickDataReader.h"
 #include "EventStorage/DataReader.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "Gaudi/Property.h"
 
 #include "PersistentDataModel/DataHeader.h"
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPHitsMonitorTool.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPHitsMonitorTool.cxx
index 28e97033f40..8ae860c33cf 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPHitsMonitorTool.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPHitsMonitorTool.cxx
@@ -12,7 +12,6 @@
 #include <xAODForward/AFPSiHitContainer.h>
 
 #include <AthenaMonitoring/AthenaMonManager.h>
-#include <GaudiKernel/IJobOptionsSvc.h>
 #include <GaudiKernel/MsgStream.h>
 #include <GaudiKernel/StatusCode.h>
 
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalMonitorTool.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalMonitorTool.cxx
index b696e59f073..96963472016 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalMonitorTool.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/AFPTechnicalMonitorTool.cxx
@@ -8,7 +8,6 @@
 #include <AFP_RawEv/AFP_SiRawData.h>
 #include <AFP_RawEv/AFP_RawContainer.h>
 
-#include <GaudiKernel/IJobOptionsSvc.h>
 #include <GaudiKernel/MsgStream.h>
 #include <GaudiKernel/StatusCode.h>
 #include <AthenaMonitoring/AthenaMonManager.h>
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonEfficiencies.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonEfficiencies.cxx
index a3651a9ff7b..a1e282594b7 100755
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonEfficiencies.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonEfficiencies.cxx
@@ -7,7 +7,6 @@
 // AUTHORS: Beate Heinemann, Tobias Golling, John Alison, Lauren Tompkins
 // **********************************************************************
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/MsgStream.h"
 
 #include "TrkParameters/TrackParameters.h"
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx
index ee115b67e5f..ac711f0f955 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx
@@ -15,7 +15,6 @@
 
 #include "LWHists/TH1F_LW.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/MsgStream.h"
 
 #include "AtlasDetDescr/AtlasDetectorID.h"
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonNtuple.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonNtuple.cxx
index 17e12ba82be..5f017a380f9 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonNtuple.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonNtuple.cxx
@@ -13,7 +13,6 @@
 #include <math.h>
 #include "TMath.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "InDetIdentifier/PixelID.h"
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonPVBiases.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonPVBiases.cxx
index 88537688b9a..26fe3049985 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonPVBiases.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonPVBiases.cxx
@@ -16,7 +16,6 @@
 #include "TProfile2D.h"
 #include "TMath.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/MsgStream.h"
 
 #include "AtlasDetDescr/AtlasDetectorID.h"
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
index d01f5ea6b20..3f51bd2982b 100755
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
@@ -24,7 +24,6 @@
 #include "TFitResult.h"
 #include "TFitResultPtr.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "StoreGate/ReadHandle.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "InDetIdentifier/PixelID.h"
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonSivsTRT.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonSivsTRT.cxx
index 35c72f34082..31a25ad5632 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonSivsTRT.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonSivsTRT.cxx
@@ -16,7 +16,6 @@
 #include "TProfile.h"
 #include "TMath.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 
 
 
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTrackSegments.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTrackSegments.cxx
index 7c4f54fc87e..3e4a6989120 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTrackSegments.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTrackSegments.cxx
@@ -14,7 +14,6 @@
 #include "LWHists/TH2F_LW.h"
 #include "TProfile.h"
 #include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "IDAlignMonTrackSegments.h"
 #include "TrkTrackSummary/TrackSummary.h"
 #include "InDetTrackSplitterTool/IInDetTrackSplitterTool.h"
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTruthComparison.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTruthComparison.cxx
index f2552ab3d9a..b4938715428 100755
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTruthComparison.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonTruthComparison.cxx
@@ -15,7 +15,6 @@
 #include "TMath.h"
 #include "TROOT.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/MsgStream.h"
 
 #include "AtlasHepMC/GenParticle.h"
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/InDetAlignMonBeamSpot.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/InDetAlignMonBeamSpot.cxx
index 0ca921199f4..9720d648643 100755
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/InDetAlignMonBeamSpot.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/InDetAlignMonBeamSpot.cxx
@@ -9,7 +9,6 @@
 #include "TH2.h"
 #include "TProfile.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 //#include "GaudiKernel/MsgStream.h"
 
 #include "TrkEventPrimitives/ParamDefs.h"
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBeamSpotMonTool.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBeamSpotMonTool.cxx
index b7fcaa3bb4d..a8ab9cfb5dd 100755
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBeamSpotMonTool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/InDetGlobalBeamSpotMonTool.cxx
@@ -10,7 +10,6 @@
 
 
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "StoreGate/ReadHandle.h"
 
 #include "TrkEventPrimitives/ParamDefs.h"
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonKshort.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonKshort.cxx
index d6f0dd5f3c8..0ab877facd4 100755
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonKshort.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonKshort.cxx
@@ -19,7 +19,6 @@
 #include "TRandom.h"
 
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/SystemOfUnits.h"
 #include "GaudiKernel/PhysicalConstants.h"
 
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonWenu.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonWenu.cxx
index ac2ad9bf6fb..296fac6f5c4 100755
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonWenu.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonWenu.cxx
@@ -16,7 +16,6 @@
 //#include "TMath.h"
 #include "TLorentzVector.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "StoreGate/StoreGateSvc.h"
 
 #include "IdDictDetDescr/IdDictManager.h"
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonZee.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonZee.cxx
index 848855955d6..858519a717a 100755
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonZee.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonZee.cxx
@@ -15,7 +15,6 @@
 #include "TProfile.h"
 #include "TLorentzVector.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "StoreGate/StoreGateSvc.h"
 
 #include "IdDictDetDescr/IdDictManager.h"
diff --git a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/InDetVertexMonitoring.cxx b/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/InDetVertexMonitoring.cxx
index 6981cbdb628..01767f3ccf3 100644
--- a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/InDetVertexMonitoring.cxx
+++ b/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/InDetVertexMonitoring.cxx
@@ -10,7 +10,6 @@
 #include "TMath.h"
 
 #include "AthenaBaseComps/AthMessaging.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/StatusCode.h"
 
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.cxx
index 6915dc9ae72..b5c042234bb 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.cxx
@@ -16,8 +16,6 @@
 #include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
 #include "ByteStreamData/RawEvent.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
-
 #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/WriteHandle.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderToolCore.cxx
index 90266c0f3fb..cc2b21e0b53 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderToolCore.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderToolCore.cxx
@@ -16,8 +16,6 @@
 #include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
 #include "ByteStreamData/RawEvent.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
-
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/WriteHandle.h"
 
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderToolMT.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderToolMT.cxx
index 69a32a27458..cae1e0731b6 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderToolMT.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderToolMT.cxx
@@ -16,8 +16,6 @@
 #include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
 #include "ByteStreamData/RawEvent.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
-
 #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/WriteHandle.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderToolCore.cxx
index cc29a4b90f6..dca71089f37 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderToolCore.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderToolCore.cxx
@@ -4,7 +4,6 @@
 
 #include "MDT_RawDataProviderToolCore.h"
 #include "MuonRDO/MdtCsmContainer.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
 
 
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderToolMT.cxx b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderToolMT.cxx
index 0ea9287e4e8..ef8685c8375 100644
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderToolMT.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderToolMT.cxx
@@ -7,7 +7,6 @@
 #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
 
 #include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 
 // #include "valgrind/callgrind.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TGC_RawDataProviderToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TGC_RawDataProviderToolCore.cxx
index 11b263d8d47..1755df3be9d 100644
--- a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TGC_RawDataProviderToolCore.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TGC_RawDataProviderToolCore.cxx
@@ -13,7 +13,6 @@
 #include "TGCcablingInterface/ITGCcablingServerSvc.h"
 
 #include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 
 //================ Constructor =================================================
 
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
index fd4c83812d9..50558acd75f 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
@@ -16,7 +16,6 @@
 
 // FrameWork includes
 #include "Gaudi/Property.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "DerivationFrameworkInterfaces/IAugmentationTool.h"
 #include "ExpressionEvaluation/ExpressionParser.h"
 #include "ExpressionEvaluation/SGxAODProxyLoader.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx
index c535efd8548..cb50503fb8d 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx
@@ -30,7 +30,6 @@
 // FrameWork includes
 #include "StoreGate/ThinningHandle.h"
 #include "Gaudi/Property.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 
 //Standard includes
 #include <cstdlib>
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx
index c3bc8d9be45..91fbbd3694b 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx
@@ -26,7 +26,6 @@
 #include "StoreGate/ThinningHandle.h"
 #include "StoreGate/ReadHandle.h"
 #include "Gaudi/Property.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 
 ///////////////////////////////////////////////////////////////////
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx
index 685e364ea91..dbf1e988eb5 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx
@@ -22,7 +22,6 @@
 // FrameWork includes
 #include "StoreGate/ThinningHandle.h"
 #include "Gaudi/Property.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 
 ///////////////////////////////////////////////////////////////////
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx
index a9d5cd41acc..77a29ea721f 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx
@@ -23,7 +23,6 @@
 // FrameWork includes
 #include "StoreGate/ThinningHandle.h"
 #include "Gaudi/Property.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/ThreadLocalContext.h"
 
 ///////////////////////////////////////////////////////////////////
diff --git a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/Root/HIEventSelectionTool.cxx b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/Root/HIEventSelectionTool.cxx
index 4630127c327..93ad9ee552b 100644
--- a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/Root/HIEventSelectionTool.cxx
+++ b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/Root/HIEventSelectionTool.cxx
@@ -12,10 +12,6 @@
 #include <iomanip>
 #include <iostream>
 
-#ifndef ROOTCORE
-#include "GaudiKernel/IJobOptionsSvc.h"
-#endif
-
 namespace HI
 {
 
-- 
GitLab