diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h
index a005d5f418ce1ebd7ceae2f563dd55a670d4a223..df76144343b301fe6909f59275a36fcaffe7ca78 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.h
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/TileCalibAlgs/TileLaserDefaultCalibTool.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 TILECALIBALG_TILELASERDEFAULTCALIBTOOL_H
@@ -14,7 +14,6 @@
 #include "TileConditions/ITileDCSTool.h"
 #include "TileEvent/TileRawChannelContainer.h"
 #include "TileEvent/TileLaserObject.h"
-#include "TileConditions/ITileBadChanTool.h"
 #include "TileMonitoring/ITileStuckBitsProbsTool.h"
 
 
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx
index 44c26aa9810aea394d12cfb64a0a17fba86698a0..c7cce53a8a00d37773694d09d9177ba1524f7aae 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileDigiNoiseCalibAlg.cxx
@@ -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
 */
 
 // ********************************************************************
@@ -23,7 +23,6 @@
 
 // Tile includes
 #include "TileCalibAlgs/TileDigiNoiseCalibAlg.h"
-#include "TileEvent/TileRawChannelContainer.h"
 #include "CaloIdentifier/TileID.h"
 #include "TileIdentifier/TileHWID.h"
 #include "TileEvent/TileDigitsContainer.h"
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileRawChNoiseCalibAlg.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileRawChNoiseCalibAlg.cxx
index 7ca07f53e033039b5c71982b6933fce8f1938093..f2b4166b7fc03e110fbe651bd28496d8b618a88a 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileRawChNoiseCalibAlg.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileRawChNoiseCalibAlg.cxx
@@ -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
 */
 
 // ****** **************************************************************
@@ -26,7 +26,6 @@
 #include "TileEvent/TileRawChannelContainer.h"
 #include "CaloIdentifier/TileID.h"
 #include "TileIdentifier/TileHWID.h"
-#include "TileCalibBlobObjs/TileCalibUtils.h"
 #include "TileEvent/TileDigitsContainer.h"
 #include "TileEvent/TileBeamElemContainer.h"
 #include "TileByteStream/TileBeamElemContByteStreamCnv.h"
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobObjs/test/TileCalibDrawerFlt_test.cxx b/TileCalorimeter/TileCalib/TileCalibBlobObjs/test/TileCalibDrawerFlt_test.cxx
index 681a89b118f42f99ee23688e9e0255c46685bc40..d52dc9756133e150fcea438d5f9aa8cc0c8ebe2d 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobObjs/test/TileCalibDrawerFlt_test.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibBlobObjs/test/TileCalibDrawerFlt_test.cxx
@@ -4,10 +4,10 @@
 
 #undef NDEBUG
 
-//=== AttributeList
-//#include "CoralBase/Attribute.h"
+
 #include "TileCalibBlobObjs/TileCalibDrawerFlt.h"
 
+//=== AttributeList
 #include "CoralBase/Blob.h"
 #include "CoralBase/Attribute.h"
 #include "CoralBase/AttributeList.h"
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobObjs/test/TileCalibDrawerOfc_test.cxx b/TileCalorimeter/TileCalib/TileCalibBlobObjs/test/TileCalibDrawerOfc_test.cxx
index f7d0b2a95ec7ad9b76c0010a5aa50b4e03c0ea1b..acb2b7caf826ce32b73135a0bbf0193d8aea5ad4 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobObjs/test/TileCalibDrawerOfc_test.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibBlobObjs/test/TileCalibDrawerOfc_test.cxx
@@ -4,10 +4,10 @@
 
 #undef NDEBUG
 
-//=== AttributeList
-//#include "CoralBase/Attribute.h"
+
 #include "TileCalibBlobObjs/TileCalibDrawerOfc.h"
 
+//=== AttributeList
 #include "CoralBase/Blob.h"
 #include "CoralBase/Attribute.h"
 #include "CoralBase/AttributeList.h"
diff --git a/TileCalorimeter/TileMonitoring/root/include/tile_monitor.h b/TileCalorimeter/TileMonitoring/root/include/tile_monitor.h
index 3fdc65f75053d7d5798289f8a5ae57c466207f87..dad9b24383625e8e97e75c46c23afcb704996f61 100644
--- a/TileCalorimeter/TileMonitoring/root/include/tile_monitor.h
+++ b/TileCalorimeter/TileMonitoring/root/include/tile_monitor.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
 */
 
 #include <iostream>
@@ -18,7 +18,6 @@
 #include "TGraph.h"
 #include "TH1.h"
 #include "TH2.h"
-#include "TGraph.h"
 #include "TProfile.h"
 #include "TCanvas.h"
 #include "TStyle.h"
diff --git a/TileCalorimeter/TileMonitoring/src/TileDQFragMonTool.cxx b/TileCalorimeter/TileMonitoring/src/TileDQFragMonTool.cxx
index ed40bdaaf23dce8be1643f9aa4acf4c4da633120..32a248f6c7689115d71f97bfe4a73729e84ffae5 100644
--- a/TileCalorimeter/TileMonitoring/src/TileDQFragMonTool.cxx
+++ b/TileCalorimeter/TileMonitoring/src/TileDQFragMonTool.cxx
@@ -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
 */
 
 // ********************************************************************
@@ -27,7 +27,6 @@
 #include "TVirtualPad.h"
 #include "TCanvas.h"
 #include "TStyle.h"
-#include "TCanvas.h"
 #include "TLatex.h"
 
 #include <iostream>
diff --git a/TileCalorimeter/TileRawUtils/src/RegSelCondAlg_Tile.cxx b/TileCalorimeter/TileRawUtils/src/RegSelCondAlg_Tile.cxx
index 6c99ac143f037ecc78718a18ba88f978432fc408..3d567db0f39f9f2d8072a196a7cd021dd5e4d2a8 100644
--- a/TileCalorimeter/TileRawUtils/src/RegSelCondAlg_Tile.cxx
+++ b/TileCalorimeter/TileRawUtils/src/RegSelCondAlg_Tile.cxx
@@ -34,9 +34,6 @@
 #include "TileByteStream/TileROD_Decoder.h"
 #include "TileRawUtils/TileRegionSelectorTable.h"
 
-
-#include "RegionSelector/RegionSelectorLUT.h" 
-
 #include <cmath>
 #include <iostream>
 #include <string>
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
index b67c1087fb72cea2882577f95a7db03fb6915034..cd970008cd3ef54fcc5f06696745cbd146f3e546 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
@@ -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
 */
 
 // small hack to enable datapool usage
@@ -11,7 +11,6 @@
 #include "CaloIdentifier/TileID.h"
 #include "TileIdentifier/TileHWID.h"
 #include "TileConditions/TileInfo.h"
-#include "CLHEP/Matrix/Matrix.h"
 
 // Atlas includes
 #include "AthAllocators/DataPool.h"
diff --git a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.h b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.h
index 917cd1d3b4ac5345c27dff9cf1a993db03a978f9..c7d4db9e4d27360548be91a0f8a9487d0d3cf44a 100644
--- a/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.h
+++ b/TileCalorimeter/TileSimAlgs/TileSimAlgs/TileDigitsMaker.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
 */
 
 //****************************************************************************
@@ -47,7 +47,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 
 #include "CLHEP/Random/RandomEngine.h"
-#include "TileEvent/TileHitContainer.h"
 
 
 class IAthRNGSvc;
diff --git a/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx b/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
index 15435c61d4fb3068df69275efc3908ba95427662..5686d6136f480c517040c948c299e5a20511516f 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
@@ -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
 */
 
 //************************************************************
@@ -30,7 +30,6 @@
 // For the Athena-based random numbers.
 #include "AthenaKernel/IAthRNGSvc.h"
 #include "AthenaKernel/RNGWrapper.h"
-#include "CLHEP/Random/RandomEngine.h"
 
 #include "CLHEP/Random/Randomize.h"
 #include "CLHEP/Random/RandomEngine.h"
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
index 12b172bee4b213e6e5d9d37e395717f9459f0ef1..0df2ace0895bd7e8654dbc82089bf508cfea065e 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
@@ -31,7 +31,6 @@
 #include "TileByteStream/TileROD_Decoder.h"
 #include "TileByteStream/TileHid2RESrcID.h"
 #include "TileEvent/TileDigitsContainer.h"
-#include "TileByteStream/TileROD_Decoder.h"
 
 #include <vector> 
 #include <string> 
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamCnv.cxx
index a2dd4d27410bdd76c1075d065558eb5a63b0eb02..e3534fc9583adb5c347752477a9e4af4901c15a5 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileLaserObjByteStreamCnv.cxx
@@ -31,7 +31,6 @@
 #include "TileByteStream/TileHid2RESrcID.h"
 #include "TileIdentifier/TileTBFrag.h"
 #include "TileEvent/TileLaserObject.h"
-#include "TileByteStream/TileROD_Decoder.h"