diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/chi2validation_x.cpp b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/chi2validation_x.cpp
index 894f7d730501001f20e61a2dc042d2126a2f896b..60e4294fe46e96f1f22a905e84b56c72b9c8cb93 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/chi2validation_x.cpp
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/chi2validation_x.cpp
@@ -21,10 +21,8 @@
 #include <TAxis.h>
 #include "TFile.h"
 #include "TH1F.h"
-#include "TStyle.h"
 #include "TLine.h"
 #include "TSystem.h"
-#include "TEventList.h"
 #include "TMatrixD.h"
 
 #include <iostream>
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/combineUnbiasedResPlots_x.cpp b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/combineUnbiasedResPlots_x.cpp
index 1485dd765662bb7606ce932422280170282541a7..e1a0699d9acce105afa1c94f2454217e67a747a3 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/combineUnbiasedResPlots_x.cpp
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/combineUnbiasedResPlots_x.cpp
@@ -10,7 +10,6 @@
 #include "TGraphErrors.h"
 #include "TText.h"
 #include "TLegend.h"
-#include "TF1.h"
 #include "TChain.h"
 #include "TPaveStats.h"
 
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/muontrackplots_x.cpp b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/muontrackplots_x.cpp
index 63d21254cc72d4238c2c99e4cf8fced7f0aa6140..ef8b41cf98d07373d51c72b442b5c9d51da8b112 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/muontrackplots_x.cpp
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/muontrackplots_x.cpp
@@ -21,7 +21,6 @@
 #include <TAxis.h>
 #include "TFile.h"
 #include "TH1F.h"
-#include "TStyle.h"
 #include "TLine.h"
 #include "TSystem.h"
 #include "TH2F.h"
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/plotCorr.C b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/plotCorr.C
index 0d210ff4fa0f287c0182a4244a28bc31c2f215fa..58474f7bf1f1f1b636270b7236967371ba2f567a 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/plotCorr.C
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/plotCorr.C
@@ -10,7 +10,6 @@
 #include "TGraphErrors.h"
 #include "TText.h"
 #include "TLegend.h"
-#include "TF1.h"
 #include "TChain.h"
 #include "TH2F.h"
 #include "TProfile.h"
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/unbiasedResPlots_x.cpp b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/unbiasedResPlots_x.cpp
index 1a3aa6855781611f0c0f44b8ad7e89e9a79786ef..dddb507a461fd605de789acc98bd369877856eb2 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/unbiasedResPlots_x.cpp
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/unbiasedResPlots_x.cpp
@@ -11,7 +11,6 @@
 #include "TGraphErrors.h"
 #include "TText.h"
 #include "TLegend.h"
-#include "TF1.h"
 #include "TChain.h"
 #include "TPaveStats.h"
 #include "TProfile.h"
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
index 53ed1e7fb7b7f4ac5d35edf87618842ec551a858..c61391da535885dd3e09bdf2aa0384a442708efd 100644
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
@@ -5,14 +5,8 @@
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/StatusCode.h"
-
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/StatusCode.h"
-
 #include "StoreGate/StoreGateSvc.h"
-
 #include "MuonCablingServers/TGCcablingServerSvc.h"
-#include "GaudiKernel/MsgStream.h"
 
 TGCcablingServerSvc::TGCcablingServerSvc(const std::string& name, ISvcLocator* sl) : 
 AthService( name, sl )
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
index 771c38d822f3fd25dfb4d04ef4485cfda1e9d203..83770fdca77d7eb08603fd61bd15f53f1fc02bae 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-
 #ifndef MUONMDT_CABLING_MUONMDT_CABLINGSVC_H
 #define MUONMDT_CABLING_MUONMDT_CABLINGSVC_H
 
@@ -11,15 +10,12 @@
 #include "GaudiKernel/IInterface.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ServiceHandle.h"
-#include "AthenaKernel/IOVSvcDefs.h"
 
 class MuonMDT_CablingMap;
 class MdtMezzanineType;
 class StoreGateSvc;
-//class IMDTcablingSvc;
 class IMDTCablingDbTool;
 class ITagInfoMgr;
-
 class IdentifierHash;
 
 #include <list>
@@ -27,12 +23,7 @@ class IdentifierHash;
 
 static const InterfaceID IID_IMuonMDT_CablingSvc("MuonMDT_CablingSvc", 1, 0);
 
-
-
-class MuonMDT_CablingSvc : public AthService 
-			   //			   virtual public IInterface, 
-
-{
+class MuonMDT_CablingSvc : public AthService  {
 
  public:
 
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/MdtRtRelation.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/MdtRtRelation.cxx
index d5d532d063a3108b704642c05fa7487e48652204..1f270f71030c1a8cc8a40d0c274fb2015ab9cfd9 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/MdtRtRelation.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/MdtRtRelation.cxx
@@ -1,12 +1,11 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "MdtCalibData/IRtRelation.h"
 #include "MdtCalibData/IRtResolution.h"
 #include "MdtCalibData/TrRelation.h"
 #include "MdtCalibData/MdtRtRelation.h"
-#include "MdtCalibData/TrRelation.h"
 
 namespace MuonCalib {
 
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationAnalytic.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationAnalytic.cxx
index 1a3c8c07f5622e056c4df7015e0a90e6276a21a1..c8bde808be2254d220c7952e92210b202461bf3e 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationAnalytic.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationAnalytic.cxx
@@ -37,8 +37,6 @@
 #include "MdtCalibRt/RtParabolicExtrapolation.h"
 #include "MdtCalibData/RtFromPoints.h"
 #include "MdtCalibData/IRtRelation.h"
-#include "MdtCalibData/RtRelationLookUp.h"
-#include "MdtCalibRt/RtCalibrationOutput.h"
 #include "MdtCalibInterfaces/IMdtCalibrationOutput.h"
 #include "MuonCalibEventBase/MuonCalibSegment.h"
 #include "MuonCalibMath/BaseFunction.h"
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationCurved.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationCurved.cxx
index 009f4ca9c93334e59d2faf3ce666d8d6d4c4589a..58794f6b268b1242120ec771160d2a594db24f24 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationCurved.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationCurved.cxx
@@ -37,9 +37,7 @@
 #include "MdtCalibRt/AdaptiveResidualSmoothing.h"
 #include "MdtCalibInterfaces/IMdtCalibrationOutput.h"
 #include "MdtCalibData/IRtRelation.h"
-#include "MdtCalibData/RtRelationLookUp.h"
 #include "MdtCalibData/RtScaleFunction.h"
-#include "MdtCalibRt/RtCalibrationOutput.h"
 #include "MdtCalibFitters/CurvedPatRec.h"
 #include "MuonCalibEventBase/MuonCalibSegment.h"
 #include "MuonCalibMath/BaseFunction.h"
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/MdtCalibT0/T0CalibrationMT.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/MdtCalibT0/T0CalibrationMT.h
index 709c49b5453b35780fed51942ec58cf1148be3fd..2f0b52808fac4f3bc151eeff5429558ba84555ca 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/MdtCalibT0/T0CalibrationMT.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/MdtCalibT0/T0CalibrationMT.h
@@ -1,17 +1,10 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-//   T0CalibrationMT.h
-//   Header file for class T0CalibrationMT
-///////////////////////////////////////////////////////////////////
-// (c) ATLAS Detector software
-///////////////////////////////////////////////////////////////////
-// 
-///////////////////////////////////////////////////////////////////
-
 #ifndef T0CALIBRATIONMT_H
 #define T0CALIBRATIONMT_H
+
 #include <iostream>
 #include <string>
 #include <vector>
@@ -20,12 +13,7 @@
 
 #include "MdtCalibInterfaces/IMdtCalibration.h"
 #include "MdtCalibData/MdtTubeFitContainer.h"
-#include "MdtCalibData/MdtTubeFitContainer.h"
 #include "MuonCalibStandAloneBase/NtupleStationId.h"
-//#include "T0MTSettings.h"
-//#include "T0MTHistos.h"
-//#include "ADCMTHistos.h"
-//#include "HistogramId.h"
 
 class TH1;
 class TFile;
@@ -42,9 +30,6 @@ class T0ADCHistos;
 class ADCMTHistos;
 class HistogramId;
 class MdtRelativeTubeT0;
-//class MdtTubeFitContainer;
-
-
 
 /**@class T0CalibrationMT
    Implementation of a T0 calibration using the MT approach.
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtData_t_r_reso.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtData_t_r_reso.h
index db61b0b4813eca6b8e1b2047264ec821783e1e00..0fa9c32b9759f56bb26e47da42ebb1e3f6c746aa 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtData_t_r_reso.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtData_t_r_reso.h
@@ -7,7 +7,6 @@
 
 #include <iostream>
 #include <vector>
-#include <iostream>
 
 namespace MuonCalib {
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/ExtraTreeTrackFillerTool.cxx b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/ExtraTreeTrackFillerTool.cxx
index 2574566541d8f170b1b65310d19c068833e2cc64..5fe2aeca0769f8b56cd884c25f474b287eec1d7d 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/ExtraTreeTrackFillerTool.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/ExtraTreeTrackFillerTool.cxx
@@ -22,7 +22,6 @@
 #include "TrkDetElementBase/TrkDetElementBase.h"
 #include "TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrack.h"
 #include "TrkMeasurementBase/MeasurementBase.h"
-#include "TrkTrack/Track.h"
 #include "TrkParameters/TrackParameters.h"
 #include "TrkRIO_OnTrack/RIO_OnTrack.h"
 #include "TrkEventPrimitives/ParamDefs.h"
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedSegment.h b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedSegment.h
index c2958702910b1c1ed493f704f0ea7426313c43ba..bfdcdbb06515052e7900ce37d0756e3fefa2231d 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedSegment.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedSegment.h
@@ -9,7 +9,6 @@
 
 #include "MuonCalibExtraTreeEvent/MuonCalibTrackSummary.h"
 #include "MuonCalibExtraUtils/MuonCalibLayerMapping.h"
-#include "MuonCalibEventBase/MuonCalibSegment.h"
 #include "MuonCalibExtraTreeEvent/MuonCalibRawHitAssociationMap.h"
 #include "CxxUtils/checker_macros.h"
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx
index 57932cef85252787a32d2fdd62670cfddf1ba2f0..63602131f4312a8d6fb56a78b1b8dbb406346b1a 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx
@@ -23,7 +23,6 @@
 #include "MuonCalibEventBase/MuonCalibPattern.h"
 #include "MuonCalibEventBase/MuonCalibSegment.h"
 #include "MuonCalibEventBase/MuonCalibRawHitCollection.h"
-#include "MuonCalibEventBase/MuonCalibTruthCollection.h"
 #include "MuonCalibStl/DeleteObject.h"
 #include "GaudiKernel/MsgStream.h"
 #include "AthenaKernel/getMessageSvc.h"
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedRawHits.cxx b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedRawHits.cxx
index 34bb0434b3b6677c79965b2b1f7c26b73131b5c0..c4a41fcff3d09356f85a787905ec2ebd3afe8811 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedRawHits.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedRawHits.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "MuonCalibExtraTreeEvent/MuonCalibExtendedRawHits.h"
@@ -17,7 +17,6 @@
 
 #include "MuonCalibExtraUtils/MuonFixedIdPrinter.h"
 #include "MuonCalibExtraUtils/MuonFixedIdManipulator.h"
-#include "MuonCalibExtraUtils/MuonFixedIdPrinter.h"
 
 #include <sstream>
 
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonEventNtupleBranch.cxx b/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonEventNtupleBranch.cxx
index ab5786a9cd01fdd5b8049b522e5ea3c4f0d9466b..609bfd4c253119632c73cc0f9c838a8a39b67635 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonEventNtupleBranch.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonEventNtupleBranch.cxx
@@ -10,7 +10,6 @@
 //other packages
 #include "CLHEP/Vector/ThreeVector.h"
 #include "TTree.h"
-#include "TString.h"
 
 // std packages
 #include <iostream>
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/MdtCalibIOSvc/MdtCalibOutputDbSvc.h b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/MdtCalibIOSvc/MdtCalibOutputDbSvc.h
index 75e7b98166926a958c691bc4951997c9cfbf2c22..bd860ed1156c70f0adf4734c935450efc90d906f 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/MdtCalibIOSvc/MdtCalibOutputDbSvc.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/MdtCalibIOSvc/MdtCalibOutputDbSvc.h
@@ -43,8 +43,6 @@ namespace MuonCalib {
   class IRtResolution;
   class MdtTubeFitContainer;
 }
-//class CalibDBCoral;
-#include "MdtCalibUtils/RtDataFromFile.h"
 
 // interface to enable retrieving of a pointer to the singleton //
 const InterfaceID IID_IMdtCalibOutputDbSvc("MdtCalibOutputDbSvc", 1, 0);
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionSelectionSvc.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionSelectionSvc.cxx
index d7f012df6269f5d8fec8fce9c3059f336955a6b4..a8b7aa1c476da63bb57fa6476222a60a61f37211 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionSelectionSvc.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionSelectionSvc.cxx
@@ -23,7 +23,6 @@
 #include "TTree.h"
 #include "TFile.h"
 #include "TDirectory.h"
-#include "TTree.h"
 #include "TKey.h"
 
 using namespace MuonCalib;
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRDO_Decoder.h b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRDO_Decoder.h
index 405c511f94ac79ea9a193b3f4f4a0e7437021991..896ae449d7a106201ca04bc729327ea339c1a829 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRDO_Decoder.h
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRDO_Decoder.h
@@ -11,12 +11,7 @@
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
-
 #include "CSCcabling/CSCcablingSvc.h"
-
-#include "GaudiKernel/ServiceHandle.h"
-#include "CSCcabling/CSCcablingSvc.h"
-
 #include "MuonIdHelpers/IMuonIdHelperSvc.h"
 
 #include <inttypes.h>
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx
index 67caf1c1dbdc5ce1d23c35e7488e8004807d039c..a2525cc73c01d3b715b20b918ab827892ab2cee5 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx
@@ -1,11 +1,9 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "MdtPrepDataContainerCnv.h"
 
-#include "MdtPrepDataContainerCnv.h"
-
 // Gaudi
 #include "GaudiKernel/StatusCode.h"
 #include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSegmentCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSegmentCnv_p2_test.cxx
index ed5291264dd341b024e429194b6ec26debfa2ac6..0e6dbaf06c022f689626ada8c2aab1a14e926afa 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSegmentCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSegmentCnv_p2_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -18,7 +18,6 @@
 #include "TrkEventPrimitives/FitQuality.h"
 #include "TrkEventPrimitives/CurvilinearUVT.h"
 #include "TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrack.h"
-#include "TrkEventTPCnv/SegmentCollectionCnv_tlp3.h"
 #include "TestTools/leakcheck.h"
 #include "TestTools/FLOATassert.h"
 #include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/MuonJiveXML/TrigRpcDataRetriever.h b/MuonSpectrometer/MuonCnv/MuonJiveXML/MuonJiveXML/TrigRpcDataRetriever.h
index b9e8f7dd1f29814f4afe6f2b5bf1adf0607c8387..f7e27ea3647827eeab9d38dac53ab5575aaf0175 100644
--- a/MuonSpectrometer/MuonCnv/MuonJiveXML/MuonJiveXML/TrigRpcDataRetriever.h
+++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/MuonJiveXML/TrigRpcDataRetriever.h
@@ -8,18 +8,13 @@
 #include <string>
 
 #include "JiveXML/IDataRetriever.h"
-
 #include "AthenaBaseComps/AthAlgTool.h"
-
 #include "MuonReadoutGeometry/MuonDetectorManager.h"
 #include "MuonReadoutGeometry/RpcReadoutElement.h"
 #include "MuonRPC_CnvTools/IRPC_RDO_Decoder.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
-
-#include "GaudiKernel/ServiceHandle.h"
 #include "MuonIdHelpers/IMuonIdHelperSvc.h"
-
 #include "RPC_CondCabling/RpcCablingCondData.h"
 #include "StoreGate/ReadCondHandleKey.h"
 
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.cxx b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.cxx
index 55336736a6b72003bc97b262af13a6cefdc355db..2befd4acdc5f0a27f0aebb0d21129d63a58642a2 100755
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.cxx
@@ -4,8 +4,6 @@
 
 #include "RpcROD_Decoder.h"
 
-#include <algorithm> 
-
 #include <deque>
 #include <vector>
 #include <utility>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
index 8365ca781ac42ca938b49a9e41b16f28dff03c39..7f9b8e53613f5f7fe6908d45e10d88e4735ecfba 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
@@ -35,7 +35,6 @@
 #include "MdtCalibData/BFieldCorFunc.h"
 #include "MdtCalibData/WireSagCorFunc.h"
 #include "MdtCalibData/MdtSlewCorFuncHardcoded.h"
-#include "MdtCalibData/CalibFunc.h"
 #include "GaudiKernel/PhysicalConstants.h"
 
 //TODO: use smart pointers
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDataCollectionBase.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDataCollectionBase.h
index 8b46e52202a710a5552679b2b55f60b29586934a..41fe3500f0f1168c2f2f1f7e77fc603aa1541c53 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDataCollectionBase.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDataCollectionBase.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CSCCONDDATACOLLECTIONBASE_H 
@@ -13,20 +13,13 @@
 
         Exists so that CscCondDataCollection objects of different types can be stored in the same vector, map, etc. 
 **/
-#include <sstream>
+
 #include "AthContainers/DataVector.h"
 #include "StoreGate/DataHandle.h"
-//#include "AthenaKernel/CLASS_DEF.h"
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
 #include "MuonCondData/CscCondData.h"
-#include <sstream>
 
-class CondAttrListCollection;
-/*
-namespace std {
-typedef istringstream;
-}
- */
+#include <sstream>
 
 namespace MuonCalib {
   class CscCondDataCollectionBase 
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDbData.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDbData.h
index 733d0af094afd76d76eb8d18ba77555a74d970a8..40d27267e79cfc50a22be32f6fe268ca1ac740e3 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDbData.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDbData.h
@@ -140,7 +140,6 @@ public:
 };
 
 CLASS_DEF( CscCondDbData, 10742890, 1)
-#include "AthenaKernel/CondCont.h"
 CLASS_DEF( CondCont<CscCondDbData>, 43297256, 0)
 
 #endif
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/MdtCondDbData.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/MdtCondDbData.h
index 8f8b09372ec8b4680db1b188227ea4a4e414e847..5c7fbf920d948632c7babfdce8eb472c60c9292b 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/MdtCondDbData.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/MdtCondDbData.h
@@ -105,7 +105,6 @@ private:
 };
 
 CLASS_DEF( MdtCondDbData, 58088442, 1)
-#include "AthenaKernel/CondCont.h"
 CLASS_DEF( CondCont<MdtCondDbData>, 62077248, 0)
 
 #endif
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/RpcCondDbData.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/RpcCondDbData.h
index 8bb33673eae669e772181b24a9ce83536067dd0a..521d934614ca8bdbf474a5635a5550081b5f74d6 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/RpcCondDbData.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/RpcCondDbData.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONCONDDATA_RPCCONDDBDATA_H
@@ -120,7 +120,6 @@ public:
 };
 
 CLASS_DEF( RpcCondDbData, 25128902, 1)
-#include "AthenaKernel/CondCont.h"
 CLASS_DEF( CondCont<RpcCondDbData>, 178635428, 0)
 
 #endif
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/TgcCondDbData.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/TgcCondDbData.h
index 8660cc8d8066c527a7b363d7d3723d6aa6ec20f8..7c767e5b1c920ce63071e781af9070f24367d7e7 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/TgcCondDbData.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/TgcCondDbData.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONCONDDATA_TGCCONDDBDATA_H
@@ -49,7 +49,6 @@ private:
 };
 
 CLASS_DEF( TgcCondDbData, 130737053, 1)
-#include "AthenaKernel/CondCont.h"
 CLASS_DEF( CondCont<TgcCondDbData>, 178252645, 0)
 
 #endif
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/CSC_DCSConditionsSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/CSC_DCSConditionsSvc.h
index c53cda4c93b6d493899bf7a52728cb02d0f59753..2f99c415b62762723a7adba2f6482c1e1b0797d7 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/CSC_DCSConditionsSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/CSC_DCSConditionsSvc.h
@@ -14,10 +14,8 @@
 #include "MuonCondInterface/ICSC_DCSConditionsTool.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/IIOVDbSvc.h" 
 
 #include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsRun2Svc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsRun2Svc.h
index 74e287b815142975529f9c0af652d5b1af620176..fd39b9800ecd030ab50383f8c8142ee7010c2ed2 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsRun2Svc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsRun2Svc.h
@@ -14,10 +14,8 @@
 #include "MuonCondInterface/IMDT_DCSConditionsRun2Tool.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/IIOVDbSvc.h" 
 
 #include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsSvc.h
index 1ea00c5723ff57e54daa7365bfff888029a240f6..af72a04a36c83d33a67dc6e730b86373b45cfe4e 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsSvc.h
@@ -14,10 +14,8 @@
 #include "MuonCondInterface/IMDT_DCSConditionsTool.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/IIOVDbSvc.h" 
 
 #include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MdtCoolStrSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MdtCoolStrSvc.h
index 0f025daa0f6618f5ed099272c805c3534c5c1d07..d9aceb686444b17c0fdb7a2fb9e237fe51a05c28 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MdtCoolStrSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MdtCoolStrSvc.h
@@ -11,7 +11,7 @@
 #include "AthenaBaseComps/AthService.h"
 
 #include "MuonCondInterface/MdtICoolStrSvc.h"
-#include "GaudiKernel/Service.h"
+
 namespace MuonCalib {
 class MdtCoolStrSvc : public AthService, virtual MdtICoolStrSvc
 {
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_DCSConditionsSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_DCSConditionsSvc.h
index ed944a6c07e41f4e666da437e8dbb992b0be74a0..4878ac3d39ff7d4c6ad6bffe348eb10b94e673bf 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_DCSConditionsSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_DCSConditionsSvc.h
@@ -14,10 +14,8 @@
 #include "MuonCondInterface/IRPC_DCSConditionsTool.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/IIOVDbSvc.h" 
 
 #include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_STATUSConditionsSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_STATUSConditionsSvc.h
index c6455825d4de5d5b1fdbf4e58aa6ce7f1e25607a..8f7e0dcb400d955f98dbedb54d2406ac432e2195 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_STATUSConditionsSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_STATUSConditionsSvc.h
@@ -14,10 +14,8 @@
 #include "MuonCondInterface/IRpcDetectorStatusDbTool.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/IIOVDbSvc.h" 
 
 #include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_TriggerSvc_test.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_TriggerSvc_test.h
index e582c4e3f3a5b0d8ab8101c47562f8195a0ed1fe..dac0a12776f209a2dc6a70a6a193d6a381dfe5fd 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_TriggerSvc_test.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_TriggerSvc_test.h
@@ -14,10 +14,8 @@
 #include "MuonCondInterface/IRPC_TriggerSvc_test.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/IIOVDbSvc.h" 
 
 #include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RpcStatusDbSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RpcStatusDbSvc.h
index fe0006a6f6e5b0839fd987c7864f742824034e77..9187420bf0fb20f93925d207a70a88b016c7433b 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RpcStatusDbSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RpcStatusDbSvc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONCONDSVC_RPCSTATUSDBSVC_H
@@ -12,9 +12,6 @@
 #include "AthenaBaseComps/AthService.h"
 
 #include "MuonCondInterface/IRpcDetectorStatusDbTool.h"
-//#include "MuonCondData/RpcCalibDataContainer.h"
-//#include "MuonCondData/RpcStripStatus.h"
-
 
 class IIOVSvc;
 
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
index 0606e2b108e80435581e7002e78df66ad4a1380b..4b205e39d39ac166670364b0d51aff33cd98290c 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
@@ -20,7 +20,6 @@
 #include "AGDDKernel/AliasStore.h"
 #include "AGDDKernel/AGDDDetector.h"
 #include "AGDDKernel/AGDDDetectorStore.h"
-#include "AGDD2GeoSvc/IAGDD2GeoSvc.h"
 
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "RDBAccessSvc/IRDBRecord.h"
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx
index 1d59c4e37153dead431d1ac8fb9e7d5f91511a9d..7d84ed60da0e55ae779101e77aa64e57e7b8c501 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx
@@ -7,9 +7,6 @@
 #include "MuonIdHelpers/CscIdHelper.h"
 #include "GeoModelKernel/GeoPhysVol.h"
 #include "GeoModelKernel/GeoFullPhysVol.h"
-
-#include "MuonAlignmentData/CscInternalAlignmentPar.h"
-
 #include "TrkSurfaces/PlaneSurface.h"
 #include "TrkSurfaces/TrapezoidBounds.h"
 #include "TrkSurfaces/RotatedTrapezoidBounds.h"
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx
index a5587a3c1582c9c07595f91f3ed1f420351b241f..eca19e25dda0bfba1097e23ed21f6573265836ea 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx
@@ -15,7 +15,6 @@
 #include "GaudiKernel/MsgStream.h"
 #include "TrkSurfaces/PlaneSurface.h"
 #include "TrkSurfaces/RectangleBounds.h"
-#include "GaudiKernel/MsgStream.h"
 #include "AthenaKernel/getMessageSvc.h"
 #include <TString.h> // for Form
 
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
index 9019b39bc1908b2138bd9cf6b9fca00b342c88e3..faee8bc20a011b8eef49ec860ff81e0aa65409b8 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
@@ -17,7 +17,6 @@
 #include "MuonReadoutGeometry/RpcReadoutSet.h"
 #include "MuonReadoutGeometry/MuonStation.h"
 #include "CSCcabling/CSCcablingSvc.h"
-#include "RegSelLUT/RegSelSiLUT.h"
 
 #include <iostream>
 #include <vector>
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
index f1586dae8b31365675ae38a41ccd8a5f262db923..c4ae68c060cb7c5be8a0c7d1ec48ded155d1b12f 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
@@ -16,7 +16,6 @@
 #include "MuonReadoutGeometry/TgcReadoutElement.h"
 #include "MuonReadoutGeometry/RpcReadoutSet.h"
 #include "MuonReadoutGeometry/MuonStation.h"
-#include "RegSelLUT/RegSelSiLUT.h"
 #include "MuonMDT_Cabling/MuonMDT_CablingSvc.h"
 
 #include <iostream>
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx
index 3e5567f828f1838d8c099b9f728a9974f8803128..f8a07484ce9c8d7c6b80c16b2b9d38f44d8f8f22 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx
@@ -14,7 +14,6 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #include "MuonAGDDDescription/MMDetectorHelper.h"
 #include "MuonAGDDDescription/MMDetectorDescription.h"
 #include "MuonReadoutGeometry/MuonStation.h"
-#include "RegSelLUT/RegSelSiLUT.h"
 
 #include <iostream>
 #include <vector>
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
index 0bdbfe59bb1d924a970df774925323db8d980bbf..8edafe06a46ede6536364ed7c5d8bc5eb5d3862d 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
@@ -5,11 +5,6 @@
 #include "MuonRegionSelector/TGC_RegionSelectorTable.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "Identifier/IdentifierHash.h"
-
-#include <iostream>
-#include <fstream>
-#include <string>
-
 #include "RegSelLUT/StoreGateIDRS_ClassDEF.h" 
 #include "RegSelLUT/RegSelModule.h" 
 #include "RegSelLUT/RegSelSiLUT.h" 
@@ -17,12 +12,12 @@
 #include "MuonReadoutGeometry/MuonReadoutElement.h" 
 #include "MuonReadoutGeometry/TgcReadoutElement.h"
 #include "MuonReadoutGeometry/MuonStation.h"
-#include "RegSelLUT/RegSelSiLUT.h"
 #include "MuonTGC_Cabling/MuonTGC_CablingSvc.h"
 
 #include <iostream>
 #include <vector>
 #include <fstream>
+#include <string>
 
 TGC_RegionSelectorTable::TGC_RegionSelectorTable(const std::string& type, 
 						 const std::string& name,
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx
index 5a93655c60df951282b5f29985bed77c8788d517..65195f93172871d511de98e888a30cac28c1b766 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx
@@ -32,12 +32,6 @@
 
 #include "MuonReadoutGeometry/MuonStation.h"
 
-#include "RegSelLUT/RegSelSiLUT.h"
-
-
-/// not implemented yet
-/// #include "Muon_sTGC_Cabling/MuonMM_CablingSvc.h"
-
 #include "sTGC_RegSelCondAlg.h"
 
 
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx
index 7c6f9604d8dc966c687753ad74b16764bad1fda5..2688f15610dfc4abf04e3b47cd8cc49eb86c1a17 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx
@@ -19,7 +19,6 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #include "MuonAGDDDescription/sTGCDetectorHelper.h"
 #include "MuonAGDDDescription/sTGCDetectorDescription.h"
 #include "MuonReadoutGeometry/MuonStation.h"
-#include "RegSelLUT/RegSelSiLUT.h"
 
 #include <iostream>
 #include <vector>
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
index 3102d20636f672449a7cefc1f9dd0790f0cc43ec..030cf625672d0cd7ca87d3e61ae683c5a6d4bb5d 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
@@ -51,12 +51,6 @@
 #include "GeoModelKernel/GeoPgon.h"
 #include "GeoModelKernel/GeoPara.h"
 #include "GeoModelKernel/GeoVolumeCursor.h"
-#include "GeoModelKernel/GeoShape.h"
-#include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/GeoShapeSubtraction.h"
-#include "GeoModelKernel/GeoBox.h"
-#include "GeoModelKernel/GeoTrd.h"
-#include "GeoModelKernel/GeoVolumeCursor.h"
 
 #include <map>
 #include <fstream>
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h
index 299bb496dd72c7f6c9049062a53add7218578116..d3ba9e0f0c8180d9cf955dc1b4c6c0c42217be93 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h
@@ -33,7 +33,6 @@
 #include <iomanip>
 #include <utility>
 #include <string>
-#include <sstream>
 #include <sys/stat.h>
 #include <memory>
 
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
index 5ffebecd268bf1ce52439f639c11ba99d5325dc9..4907d9584be1475a27b87cb1d732682730ebb242 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
@@ -49,7 +49,6 @@ Comments to be added here...
 #include <iomanip>
 #include <utility>
 #include <string>
-#include <sstream>
 #include <sys/stat.h>
 
 class MM_DigitToolInput;
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
index 381bdf51888d06beea80eb5c5c315816e63ca304..b950d26cebf1133abc349c2e8c795728cee0d8b8 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
@@ -36,15 +36,8 @@
 #include "MuonSimEvent/MicromegasHitIdHelper.h"
 #include "TrkDetDescrUtils/GeometryStatics.h"
 #include "TrkEventPrimitives/LocalDirection.h"
-#include "TrkSurfaces/Surface.h"
 #include "PathResolver/PathResolver.h"
 #include "AIDA/IHistogram1D.h"
-#include "MuonReadoutGeometry/MuonDetectorManager.h"
-#include "MuonReadoutGeometry/MMReadoutElement.h"
-#include "MuonReadoutGeometry/MuonChannelDesign.h"
-#include "MuonSimEvent/MicromegasHitIdHelper.h"
-#include "TrkDetDescrUtils/GeometryStatics.h"
-#include "TrkEventPrimitives/LocalDirection.h"
 #include "TrkSurfaces/Surface.h"
 
 //Truth
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h b/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h
index fa8b740b62fc623c71c00b66fe38d3bb10d47a82..96cf97e60510de7758b58d3ac46e7495288e8c85 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
 /*
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
@@ -47,7 +45,6 @@
 #include "MuonSimEvent/RPCSimHit.h"
 #include "MuonSimEvent/RPCSimHitCollection.h"
 #include "HitManagement/TimedHitCollection.h"
-#include "MuonSimData/MuonSimDataCollection.h"
 #include "MuonCondInterface/IRPCConditionsSvc.h"
 #include "MuonCondData/RpcCondDbData.h"
 
diff --git a/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx b/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
index a16c23eac12c0f09fe11f4fbf4a454c1da878a59..5d867fd77717540768a5bf9aca12eb2c5060f306 100644
--- a/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
+++ b/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
@@ -1,24 +1,12 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <fstream>
 #include <iostream>
 #include <string>
-//use the method defined at:  http://annwm.lbl.gov/~leggett/Atlas/gcc-3.2.html
-// #ifdef HAVE_NEW_IOSTREAMS
-//   #include <sstream>
-// typedef std::istringstream my_isstream;
-
-// #else
-// #include <strstream>
-// typedef strstream my_isstream;
-// #endif
-
 #include <sstream>
 typedef std::istringstream my_isstream;
-
-
 #include <cmath>
 #include <cassert>
 
@@ -27,8 +15,6 @@ typedef std::istringstream my_isstream;
 //#define print_level 2 //info
 #define print_level 3 //summary
 
-//
-
 typedef enum iost {READ, WRITE} IOMaterialMap;
 
 class Record
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
index 28befc2018edfa6f78acb5a2f822c2f969b0425d..c0bb9978b6ea31c0b71b18bf92fff6c332d506ac 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
@@ -2,7 +2,6 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-// CscPeakThresholdClusterBuilderTool.cxx
 #include "CscPeakThresholdClusterBuilderTool.h"
 
 #include <sstream>
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.h b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.h
index 19f0b7b312d8411bbf26d24c6e0a81b196fae7b5..6e44b57442cafde86a9ade443f3bfe8f98fe2458 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.h
@@ -2,8 +2,6 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-// CscThresholdClusterBuilderTool.h
-
 #ifndef CscThresholdClusterBuilderTool_H
 #define CscThresholdClusterBuilderTool_H
 
@@ -62,7 +60,6 @@
 #include "MuonPrepRawData/MuonPrepDataContainer.h"
 #include "MuonReadoutGeometry/MuonDetectorManager.h"
 #include "CscClusterization/ICscClusterBuilder.h"
-#include "MuonPrepRawData/CscPrepDataContainer.h"
 
 class ICscCalibTool;
 class ICscStripFitter;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx
index 79bf4a1412884d0493a8152e7cc8675b86d7c787..21389582bf0900d54ab4280486b0ed5bba9d209f 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx
@@ -8,7 +8,6 @@
 #include "TrkEventPrimitives/ParamDefs.h"
 #include "TrkEventPrimitives/ParticleHypothesis.h"
 #include "TrkEventPrimitives/FitQualityOnSurface.h"
-#include "TrkParameters/TrackParameters.h"
 #include "TrkMeasurementBase/MeasurementBase.h"
 #include "TrkSurfaces/DistanceSolution.h"
 #include "TrkGeometry/Layer.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx
index 832a3480b4a97e2ecdca24587327d3c9618b3b4f..e7d857f7f072ad975e4c28c2423b28cd94fbf706 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx
@@ -18,7 +18,6 @@
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TFile.h"
-#include "TTree.h"
 #include "TStyle.h"
 #include "TVector3.h"
 #include <set>
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h
index 08a3ba9463769678113f2cf71a57ed4a9be4587d..cc99d1a403c46cc1fac5df970a819ae71108decd 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h
@@ -16,7 +16,6 @@
 #include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
 #include "MuonRecToolInterfaces/IMuonHoleRecoveryTool.h"
 #include "MuonRecToolInterfaces/IMuonTrackSegmentMatchingTool.h"
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
 #include "MuonRecHelperTools/MuonEDMPrinterTool.h"
 #include "MuonRecToolInterfaces/IMdtDriftCircleOnTrackCreator.h"
 #include "MuonRecToolInterfaces/IMuonClusterOnTrackCreator.h"
@@ -30,7 +29,6 @@
 #include "MuidInterfaces/ICombinedMuonTrackBuilder.h"
 #include "MuonChamberHoleRecoveryTool.h"
 #include "MuonRecToolInterfaces/IMuonSeededSegmentFinder.h"
-#include "MuonChamberHoleRecoveryTool.h"
 #include "IRegionSelector/IRegSelTool.h"
 
 #include "AthenaBaseComps/AthAlgTool.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.h
index 2c9ca258f273e3f80e4f9272b1ff4b3eb8cabdb7..f6e86b22a97745d70c6eafcd6ba088b2abbcfdbe 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.h
@@ -17,7 +17,6 @@
 #include "MuonRecToolInterfaces/IMuonCompetingClustersOnTrackCreator.h"
 #include "MuonIdHelpers/IMuonIdHelperSvc.h"
 #include "MuonRecHelperTools/MuonEDMPrinterTool.h"
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
 #include "TrkFitterInterfaces/ITrackFitter.h"
 #include "TrkExInterfaces/IExtrapolator.h"
 #include "TrkToolInterfaces/IResidualPullCalculator.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx
index 37f5ba4f9d193830a8ffbd9a73dc55527101cc3f..3fb1331cb3d3cfef22f2ea6c09cc4ecee347762e 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx
@@ -5,18 +5,12 @@
 #include "MuonTrackExtrapolationTool.h"
 
 #include "MuonTrackMakerUtils/MuonTSOSHelper.h"
-
 #include "TrkMeasurementBase/MeasurementBase.h"
 #include "TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrack.h"
-
 #include "TrkSurfaces/PerigeeSurface.h"
 #include "TrkSurfaces/DistanceSolution.h"
-
 #include "TrkTrack/TrackStateOnSurface.h"
 #include "TrkTrack/Track.h"
-
-#include "TrkSurfaces/PerigeeSurface.h"
-
 #include "TrkGeometry/TrackingVolume.h"
 #include "TrkGeometry/TrackingGeometry.h"
 #include "TrkGeometry/MagneticFieldProperties.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooCandidateMatchingTool.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooCandidateMatchingTool.h
index 0126b69d8ec008fa222c31e063e61f10442ddc55..63a85c9d75ab362cdb1cc6a090f78a14cab118ce 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooCandidateMatchingTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooCandidateMatchingTool.h
@@ -15,7 +15,6 @@
 #include "CxxUtils/checker_macros.h"
 #include "EventPrimitives/EventPrimitives.h"
 #include "GeoPrimitives/GeoPrimitives.h"
-// For magneticfield
 #include "MagFieldConditions/AtlasFieldCacheCondObj.h"
 #include "MuonRecToolInterfaces/IMuonTrackSegmentMatchingTool.h"
 #include "MuonIdHelpers/IMuonIdHelperSvc.h"
@@ -23,7 +22,6 @@
 #include "MuonRecHelperTools/MuonEDMPrinterTool.h"
 #include "MuonTrackMakerUtils/SortMeasurementsByPosition.h"
 #include "MuonSegmentMakerToolInterfaces/IMuonSegmentMatchingTool.h"
-#include "MuonRecToolInterfaces/IMuonTrackSegmentMatchingTool.h"
 #include "TrkExInterfaces/IExtrapolator.h"
 #include "MuPatCandidateTool.h"
 
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h
index cd3457a486d952bb000f11f7722477f7a58c7134..d4943d12c82b8d46b7fed6a05bb36bb60b735beb 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h
@@ -8,7 +8,6 @@
 #include "AthenaBaseComps/AthAlgTool.h"
 
 #include "AthenaKernel/SlotSpecificObj.h"
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
 #include "MuonTrackMakerUtils/MuonTrackMakerStlTools.h"
 #include "TrkParameters/TrackParameters.h"
 
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx
index c94eb116f07426ee1924f0c79c70427bd3d71c07..b44dc2b6880a498062fd74561c9c15126246f810 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx
@@ -2,19 +2,15 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-
 #include "MuonTrackSteering.h"
-#include "MuonTrackSteeringStrategy.h"
 
+#include "MuonTrackSteeringStrategy.h"
 #include "MuonSegment/MuonSegment.h"
 #include "MuonSegment/MuonSegmentCombination.h"
-
 #include "MuPatSegment.h"
 #include "MuPatCandidateBase.h"
 #include "MuPatTrack.h"
 #include "MuonTrackMakerUtils/MuonTrackMakerStlTools.h"
-
-#include "MuonSegment/MuonSegment.h"
 #include "TrkSegment/SegmentCollection.h"
 #include "TrkTrack/TrackCollection.h"
 #include "TrkParameters/TrackParameters.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.h
index 2c3fd2efb20ccb007e6f50a62a73e7441e7e8334..1907efe70c64d95b8239049f19bbdccfb2685d3f 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.h
@@ -18,8 +18,6 @@
 
 #include "TrkParameters/TrackParameters.h"
 #include "TrkTrack/TrackCollection.h"
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
-
 #include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
 #include "MuonRecHelperTools/MuonEDMPrinterTool.h"
 #include "MuonSegmentMakerToolInterfaces/IMuonSegmentInOverlapResolvingTool.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/TrackStateOnSurfaceComparisonFunction.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/TrackStateOnSurfaceComparisonFunction.h
index afcd86070c29b3f17ab7b18f3e7ed34d4b5b6ba4..30da57d158d87c1e4873d2322bd41d1297c96662 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/TrackStateOnSurfaceComparisonFunction.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/TrackStateOnSurfaceComparisonFunction.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -23,7 +23,6 @@
 #include "TrkSurfaces/DiscSurface.h"
 // extra-maths for cylinder intersections
 #include "TrkSurfaces/CylinderSurface.h"
-#include "TrkSurfaces/CylinderSurface.h"
 #include "TrkSurfaces/SurfaceBounds.h"
 #include "TrkSurfaces/RectangleBounds.h"
 #include "TrkSurfaces/TrapezoidBounds.h"
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.cxx b/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.cxx
index 5fea6adda781d26e674832d40cbd1a2d1b5abc55..7d23f3df3c421310783cd2e44b8bde345e118724 100755
--- a/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.cxx
@@ -29,25 +29,17 @@
 #include "MuonPrepRawData/MMPrepData.h"
 #include "MuonPrepRawData/sTgcPrepData.h"
 #include "TrkParameters/TrackParameters.h" 
-#include "TrkTrack/Track.h"
 #include "TrkFitterInterfaces/ITrackFitter.h"
 #include "TrkExInterfaces/IExtrapolator.h"
 #include "TrkSurfaces/PerigeeSurface.h"
 #include "TrkDetElementBase/TrkDetElementBase.h"
-#include "TrkPrepRawData/PrepRawData.h"
-#include "TrkMeasurementBase/MeasurementBase.h"
-#include "TrkRIO_OnTrack/RIO_OnTrack.h"
 #include "TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrack.h"
 #include "TrackRecord/TrackRecordCollection.h"
 #include "MuonRIO_OnTrack/MdtDriftCircleOnTrack.h"
 #include "MuonRIO_OnTrack/MuonClusterOnTrack.h"
 #include "MuonRIO_OnTrack/MMClusterOnTrack.h"
-#include "MuonPrepRawData/MdtPrepData.h"
-#include "MuonPrepRawData/MMPrepData.h"
-#include "MuonPrepRawData/sTgcPrepData.h"
 #include "MuonPrepRawData/MuonCluster.h"
 #include "MuonSegment/MuonSegment.h"
-#include "AtlasHepMC/GenParticle.h"
 #include "MuonRecHelperTools/MuonEDMPrinterTool.h"
 #include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
 #include "MuonRecToolInterfaces/IMdtDriftCircleOnTrackCreator.h"
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.h b/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.h
index ed21b33141d71982c59ec873ab6ce087a4fc2bfe..104b9073ccc7eba661092581757e9e3fdf51514a 100755
--- a/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.h
+++ b/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.h
@@ -19,7 +19,6 @@
 #include "MuonPattern/MuonPatternCombinationCollection.h"
 #include "MuonPattern/DetailedMuonPatternTruthCollection.h"
 #include "TrkToolInterfaces/ITruthTrajectoryBuilder.h"
-#include "TrkTruthData/DetailedTrackTruth.h"
 #include "TrkTruthData/DetailedSegmentTruth.h"
 #include "TrkTruthData/SubDetHitStatistics.h"
 #include "TrkTruthData/DetailedTrackTruthCollection.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonAlg.h
index d63ec4b50663df5cb625041bed78081925517d40..03eaa12834ec80122c5d1739eaf6c0c21783e9ff 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonAlg.h
@@ -28,7 +28,6 @@
 #include "AthenaMonitoring/DQAtlasReadyFilterTool.h"
 #include "xAODTrigger/MuonRoIContainer.h"
 #include "xAODMuon/MuonContainer.h"
-#include "MuonPrepRawData/MuonPrepDataContainer.h"
 #include "MuonPrepRawData/MMPrepDataContainer.h"
 #include "MuonPrepRawData/MMPrepData.h"
 #include "StoreGate/ReadHandleKey.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataValAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataValAlg.h
index b8486bf76531d505f63c424a7a7ec82e792f0145..41a4450e7fcb4eb5c83ce1340b09932b2c6cd9b3 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataValAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataValAlg.h
@@ -24,7 +24,6 @@
 #include "MuonReadoutGeometry/TgcReadoutElement.h"
 #include "MuonTrigCoinData/TgcCoinData.h"
 #include "MuonTrigCoinData/TgcCoinDataContainer.h"
-#include "MuonReadoutGeometry/MuonDetectorManager.h"
 #include "xAODMuon/MuonSegmentContainer.h"
 #include "StoreGate/ReadHandleKey.h"
 #include "MuonPrepRawData/MdtPrepDataContainer.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.h
index 6059b7113b175bd73c9633f2e6aa5dafd21e74a3..148919f1b098923de2a7ab7a99d6d2c92a6eacf2 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 //////////////////////////////////////////////////////////
@@ -18,8 +18,6 @@
 
 // Header file for the classes stored in the TTree if any.
 #include <vector>
-#include <vector>
-#include <vector>
 
 // Fixed size dimensions of array or collections stored in the TTree if any.
 
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.h
index cf996ee2678a309bf6f4afd5daa04cf4ffeb1af8..a76d356c14190a77b11d14247bec7bd57b5b90f4 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 //////////////////////////////////////////////////////////
@@ -17,12 +17,7 @@
 #include <TFile.h>
 
 // Header file for the classes stored in the TTree if any.
-#include "vector"
-#include "vector"
-#include "vector"
-#include "vector"
-#include "vector"
-#include "vector"
+#include <vector>
 
 class NSWstudies {
 public :
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackPerformanceAlg.h b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackPerformanceAlg.h
index 29f9ff37fd9ce1d5f6614ad5ec20b36feb987436..8a51e1f90a7cdb4687af9871733bbce7a111b1cf 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackPerformanceAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackPerformanceAlg.h
@@ -22,7 +22,6 @@
 #include "MuonSimData/MuonSimDataCollection.h"
 #include "MuonSimData/CscSimDataCollection.h"
 #include "TrackRecord/TrackRecordCollection.h"
-#include "TrkTrack/TrackCollection.h"
 #include "StoreGate/ReadHandleKey.h"
 #include "GeneratorObjects/McEventCollection.h"
 #include "MuonRecHelperTools/IMuonEDMHelperSvc.h"