diff --git a/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx b/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx
index df63dbfab661499defdc22ce1c982c8bfa2e0a7e..d66b52db8251de2bf99631291e69d7ca0e765e9a 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 05c9f4214af3b1fa0c8f458a78e7d27c100229cb..aa7a1713616e42b577bba90024b65416c9c38fa2 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 47ddd5f7c31860a172ac4d4fd63217713eba481c..c53b4a6c2dcaa9773df12ba1b894317d4715c988 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 523cb8395831b695ca080e2b26bd72340c41d3b8..3813a628003922d3dd59dea5fbd9a388121ba4bb 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 fa97ddab83badd89cfbb1b6e17480b489c01c11d..c0b5fdf92e144610ad74f17ab6a37fefe8308552 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 6d521d15da2fbc1630558e91b6aef55c09cf6477..93d123b17938cc63aebd380f9667d7a5268ebf12 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 231af172592a37bf49f6602a89ee1b6d3c11d856..70a5e47cd053596930e92ce50973b87e81d63980 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 43aa3e70f5fdce131a8ce895101661eb0c5920a0..e1afd173d9f1cacd3f8617288d10ac9fae60277e 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 28d83f1e276378c1030902422897bc90632c37cb..fbd4939a0735eecff890a93a7cd1714976ec63a1 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 28deebbc9aa6fcfae4348524efc34afe305524f8..a0723224e942fe54eb633efc1947a8a33a170698 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 28e97033f4031c060bf1fb29cbfaf1ff68dd63f7..8ae860c33cf904ca429593cccebe6078374bb62f 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 b696e59f073eaaee2f2fb0cec24763ae49a4e0ad..9696347201644b4ed3d3fffc6a598ceb42099122 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 a3651a9ff7bde06cadf6f53c6f1d38961a5df234..a1e282594b70d32d1e43cb836ec4b22209cd7e6b 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 ee115b67e5f034df38923154bf1bf76b7988dada..ac711f0f955b0d819bb7ec99e204cf1780000a55 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 17e12ba82beb21c86bdc534e4f1d31b4e0ae15e5..5f017a380f96ac9b1d07afe60eed585b81531d3d 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 88537688b9aa8fd14131254c3914165af8f781fa..26fe304998503ee91103eb009ac2a1e4ec519fb5 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 d01f5ea6b202810bb467bd62d45b10e759fa3020..3f51bd2982b242ebe55dff1dd13a27cf1ec316ec 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 35c72f34082ea555a62e29d286263f9d8a08e915..31a25ad56328dda3d4d7da404196d2e705bb1694 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 7c4f54fc87e960a35b28fff2d4ba6aec0a564f90..3e4a698912046bd8c73cc7d1bd6258d18f2c7bda 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 f2552ab3d9a0dfc0260c0fa6fbbffee9f342e329..b49387154288b510bd4750a4256a92eb5d3e76b5 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 0ca921199f492434715953f51a21f312d9188276..9720d6486431efccb47d4e864bff2f8abc60d9ff 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 b7fcaa3bb4d041df6543b136cc828a00f03aa2a4..a8ab9cfb5dd570d9943664d86ab5b1b58acb1708 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 d6f0dd5f3c80f094371977a4135522cf1b84853d..0ab877facd4f6f3efe92ddefff25c876300dc5cf 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 ac2ad9bf6fb1637492c4605d61bcd2864d87d414..296fac6f5c4fff1775907fe977e20d00b26e83a8 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 848855955d6d408f405334da79f616187e89fa29..858519a717a7d8e324160a7e7d9e378c59c9fa41 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 6981cbdb628743bdf16b8fab9307a2114b8316b9..01767f3ccf31261843498b66fb5fc9e717a34e86 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 6915dc9ae72187a1eba395e3a0d2da27a8a56abe..b5c042234bb639c26c7a5d327225214c90a3e00b 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 90266c0f3fb81da0775a71e12593476717d21194..cc2b21e0b532853ef060031f6986d0458100aa9e 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 69a32a274581880d5358e0bd891767f4fe276e65..cae1e0731b6b6922fda1e49d62aaf11684d9452b 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 cc29a4b90f66cfdd2bf7beb1b6ebd304d724e663..dca71089f3761b287450903b3e5f481b9bb24619 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 0ea9287e4e85930ea0a7851d2445504fa042d568..ef8685c83753e9d16149d085a70bf786beb5d644 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 11b263d8d47d489683af54ff286900afb8d0cf14..1755df3be9db5bf00081aec2f2c939914a5df6b9 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 fd4c83812d9c9ecfea902693e5824fe9b5d6c803..50558acd75fca99d9d94e3097b4f8dcc784cbf8a 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 c535efd8548284e80f538cf3596c79b00a49522b..cb50503fb8db71c7f5b80d032b2e689c4af8e027 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 c3bc8d9be458bbe01f4f6f95ca286640568a81fe..91fbbd3694b9c9138cf02001b56ed681d04559b7 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 685e364ea91b1e685daca484cb90795df4bbeebe..dbf1e988eb5e704f0e74fb37f7622a6b0c497e13 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 a9d5cd41acc8a6e2dcc7817da8f306fe855573a0..77a29ea721ffb62e1bb4111adbb2b5e0a1462911 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 4630127c327a927f67ca9b6762893f15369875b9..93ad9ee552b6199f68c742437bdce732acd19ced 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
 {