diff --git a/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker.cxx b/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker.cxx
index 003e78422345174d81c9ca81dda47d04ac97d87e..5cce9d6e1e9f53eea386b865ade5bcf8915f20bd 100644
--- a/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker.cxx
+++ b/Calorimeter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker.cxx
@@ -39,7 +39,6 @@
 #include "CaloIdentifier/CaloDM_ID.h"
 
 #include "StoreGate/ReadHandle.h" 
-#include "CLHEP/Units/SystemOfUnits.h"
 
 #include <CLHEP/Geometry/Vector3D.h>
 #include <CLHEP/Units/SystemOfUnits.h>
diff --git a/Calorimeter/CaloClusterCorrection/src/H1WeightToolCSC12Generic.h b/Calorimeter/CaloClusterCorrection/src/H1WeightToolCSC12Generic.h
index 628848d757b5532cb7434b6e4cf8580a75b568ac..1ea88df86ab91786d20557ea54837edd4bcb8082 100755
--- a/Calorimeter/CaloClusterCorrection/src/H1WeightToolCSC12Generic.h
+++ b/Calorimeter/CaloClusterCorrection/src/H1WeightToolCSC12Generic.h
@@ -17,7 +17,6 @@ Created  : Feb 2007
 #include "GaudiKernel/AlgTool.h"
 #include "CaloInterface/IHadronicCalibrationTool.h"
 #include "CaloUtils/ToolWithConstants.h"
-//#include "GaudiKernel/AlgTool.h"
 #include "AthenaBaseComps/AthAlgTool.h"
 #include <string>
 
diff --git a/Calorimeter/CaloCondPhysAlgs/src/CaloCellEnergyCorr2Ntuple.h b/Calorimeter/CaloCondPhysAlgs/src/CaloCellEnergyCorr2Ntuple.h
index d2b0d73472154c63237ad9fdadc17ea0cceaa7a3..3504be156a3390a02a52d8660d7612c8cb476c76 100644
--- a/Calorimeter/CaloCondPhysAlgs/src/CaloCellEnergyCorr2Ntuple.h
+++ b/Calorimeter/CaloCondPhysAlgs/src/CaloCellEnergyCorr2Ntuple.h
@@ -19,7 +19,6 @@
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloInterface/ICaloNoiseTool.h"
 #include "CaloInterface/ICaloMBAverageTool.h"
-#include "GaudiKernel/ToolHandle.h"
 
 #include "GaudiKernel/ITHistSvc.h"
 #include "TTree.h"
diff --git a/Calorimeter/CaloCondPhysAlgs/src/CaloNoise2Ntuple.h b/Calorimeter/CaloCondPhysAlgs/src/CaloNoise2Ntuple.h
index 6e9290cf7534e3125d8d433ce111a7ca01c1795d..fec206282cc7696fd11493950de9427de17995b6 100644
--- a/Calorimeter/CaloCondPhysAlgs/src/CaloNoise2Ntuple.h
+++ b/Calorimeter/CaloCondPhysAlgs/src/CaloNoise2Ntuple.h
@@ -19,7 +19,6 @@
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloInterface/ICaloNoiseTool.h"
 #include "CaloInterface/ICaloMBAverageTool.h"
-#include "GaudiKernel/ToolHandle.h"
 
 #include "GaudiKernel/ITHistSvc.h"
 #include "TTree.h"
diff --git a/Calorimeter/CaloCondPhysAlgs/src/CaloRescaleNoise.h b/Calorimeter/CaloCondPhysAlgs/src/CaloRescaleNoise.h
index 61b23bb36956584712d74ad7d8e770cabb4e17b1..b1e5b03061be6c626d9f5e02622078d96ffd4312 100644
--- a/Calorimeter/CaloCondPhysAlgs/src/CaloRescaleNoise.h
+++ b/Calorimeter/CaloCondPhysAlgs/src/CaloRescaleNoise.h
@@ -19,7 +19,6 @@
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloInterface/ICaloNoiseTool.h"
 #include "CaloInterface/ICaloMBAverageTool.h"
-#include "GaudiKernel/ToolHandle.h"
 #include "LArElecCalib/ILArHVScaleCorr.h"
 #include "StoreGate/ReadCondHandleKey.h"  
 
diff --git a/Calorimeter/CaloConditions/src/CaloLocalHadCoeff.cxx b/Calorimeter/CaloConditions/src/CaloLocalHadCoeff.cxx
index 50628d5d05cfbc61fc006df828b46bd33282b144..b843adfd9f86d2cadb89655e1946c02f7913d75e 100644
--- a/Calorimeter/CaloConditions/src/CaloLocalHadCoeff.cxx
+++ b/Calorimeter/CaloConditions/src/CaloLocalHadCoeff.cxx
@@ -6,7 +6,6 @@
  * @file CaloConditions/src/CaloLocalHadCoeff.cxx
  * @brief Hold binned correction data for local hadronic calibration procedure
  */
-//#include "CaloConditions/CaloLocalHadCoeff.h"
 #include "CaloConditions/CaloLocalHadCoeff.h"
 #include "CaloConditions/CaloLocalHadDefs.h"
 #include <algorithm>
diff --git a/Calorimeter/CaloLocalHadCalib/src/CaloHadDMCoeffData.cxx b/Calorimeter/CaloLocalHadCalib/src/CaloHadDMCoeffData.cxx
index 8ad5d46f65bf6b5c0d3ae5db9017ef288058902c..a44cadc960f20c0085d8c648be11bf0c5ee3d6bd 100644
--- a/Calorimeter/CaloLocalHadCalib/src/CaloHadDMCoeffData.cxx
+++ b/Calorimeter/CaloLocalHadCalib/src/CaloHadDMCoeffData.cxx
@@ -15,7 +15,6 @@
 //      Gennady Pospelov
 //
 //-----------------------------------------------------------------------
-#include "CaloLocalHadCalib/CaloHadDMCoeffData.h"
 #include <cmath>
 #include <fstream>
 #include <iostream>
diff --git a/Calorimeter/CaloRec/share/t3333.C b/Calorimeter/CaloRec/share/t3333.C
index d6d32ae1e79c354b18ba4d1ae4bc0b19b488a33e..71d8de52c7875473dd894e1010e6d70e2e2060a6 100644
--- a/Calorimeter/CaloRec/share/t3333.C
+++ b/Calorimeter/CaloRec/share/t3333.C
@@ -8,8 +8,6 @@
 #define t3333_cxx
 #include "t3333.h"
 #include <TH2.h>
-#include <TStyle.h>
-#include <TCanvas.h>
 
 #include <TROOT.h>
 #include <TTree.h>
diff --git a/Calorimeter/CaloRec/src/CaloCellContainerCheckerTool.cxx b/Calorimeter/CaloRec/src/CaloCellContainerCheckerTool.cxx
index 7cac96a6b851fbdca9ffbed323ae5e2c68e78bd5..adbe561f33aa2029cc7613dee7da939a1d942c5c 100644
--- a/Calorimeter/CaloRec/src/CaloCellContainerCheckerTool.cxx
+++ b/Calorimeter/CaloRec/src/CaloCellContainerCheckerTool.cxx
@@ -20,7 +20,6 @@ PURPOSE:  check integrity of CaloCellContainer find and iterators
 #include "CaloEvent/CaloConstCellContainer.h"
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
-#include "CaloIdentifier/CaloCell_ID.h"
 
 #include "CLHEP/Units/SystemOfUnits.h"
 
diff --git a/Calorimeter/CaloRec/src/CaloClusterCopier.cxx b/Calorimeter/CaloRec/src/CaloClusterCopier.cxx
index 2462c7fb1536feabc7e88de049d945d5ee402ac1..8ca37a305972477faac138815a66ecd55f9f728a 100644
--- a/Calorimeter/CaloRec/src/CaloClusterCopier.cxx
+++ b/Calorimeter/CaloRec/src/CaloClusterCopier.cxx
@@ -13,8 +13,6 @@ CREATED:  Sep 2005
 
 ********************************************************************/
 
-//#include "CaloUtils/CaloClusterStoreHelper.h"
-
 #include "CaloClusterCopier.h"
 #include "xAODCaloEvent/CaloClusterContainer.h"
 #include "xAODCaloEvent/CaloCluster.h"
diff --git a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
index 7562746299ecae26811f66625518a56f2f3a9158..94c8cac1d50147dbabcdb22a0fab2a6171b1263f 100755
--- a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
+++ b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
@@ -25,7 +25,6 @@
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 #include "AthAllocators/ArenaPoolSTLAllocator.h"
-//#include "CxxUtils/unordered_set.h"
 #include "CLHEP/Geometry/Point3D.h"
 #include "CLHEP/Geometry/Vector3D.h"
 #include "CxxUtils/prefetch.h"
@@ -37,8 +36,6 @@
 #include <iterator>
 #include <limits>
 #include <sstream>
-//#include "fastjet/PseudoJet.hh"
-//#include <fastjet/PseudoJet.hh>
 
 
 
diff --git a/Calorimeter/CaloTools/CaloTools/CaloMBAverageTool.h b/Calorimeter/CaloTools/CaloTools/CaloMBAverageTool.h
index 13364d7a8e19c7ab7b38b104364ac312de1bf5c6..4c34a65f56e1fed374072d0127434cc033f92237 100644
--- a/Calorimeter/CaloTools/CaloTools/CaloMBAverageTool.h
+++ b/Calorimeter/CaloTools/CaloTools/CaloMBAverageTool.h
@@ -27,7 +27,6 @@ class CaloDetDescrElement;
 #include "StoreGate/DataHandle.h"
 #include "CaloInterface/ICaloMBAverageTool.h"
 #include "AthenaKernel/IOVSvcDefs.h"
-#include "GaudiKernel/ToolHandle.h"
 
 #include "CxxUtils/checker_macros.h"
 
diff --git a/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx b/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx
index 07b6d15f7f09887ea201f1dd83c7b48c51e45c6b..77180f903dcd2b0439811df7ec4dd550811f34b4 100644
--- a/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx
+++ b/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx
@@ -14,8 +14,6 @@
 
 #include "StoreGate/StoreGateSvc.h"
 
-#include "CaloIdentifier/CaloCell_ID.h"
-
 #include "CaloGeoHelpers/CaloPhiRange.h"
 
 #include "CaloEvent/CaloCell.h"
diff --git a/Calorimeter/CaloUtils/test/CaloVertexedCell_test.cxx b/Calorimeter/CaloUtils/test/CaloVertexedCell_test.cxx
index fe7174d60291f009312263707946ce2fd43001c8..8c1dbf88194067b7c0df0c3aa2d22d8b4ddc1cb0 100644
--- a/Calorimeter/CaloUtils/test/CaloVertexedCell_test.cxx
+++ b/Calorimeter/CaloUtils/test/CaloVertexedCell_test.cxx
@@ -19,7 +19,6 @@
 #include "CaloDetDescr/CaloDetDescriptor.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"
 #include "CaloDetDescr/CaloDetectorElements.h"
-#include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloIdentifier/CaloCell_Base_ID.h"
 #include "StoreGate/StoreGateSvc.h"
diff --git a/Calorimeter/CaloUtils/test/CaloVertexedCluster_test.cxx b/Calorimeter/CaloUtils/test/CaloVertexedCluster_test.cxx
index cc55456fc761582eb15020979338c076fc3b8f7d..be42d716b719a3196bff9767582e5b336b35be0a 100644
--- a/Calorimeter/CaloUtils/test/CaloVertexedCluster_test.cxx
+++ b/Calorimeter/CaloUtils/test/CaloVertexedCluster_test.cxx
@@ -16,7 +16,6 @@
 #include "CaloUtils/CaloVertexedTopoCluster.h"
 #include "CaloEvent/CaloTester.h"
 #include "xAODCaloEvent/CaloCluster.h"
-#include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloDetDescr/CaloDetDescriptor.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"
 #include "CaloDetDescr/CaloDetectorElements.h"