diff --git a/LArCalorimeter/LArCafJobs/LArCafJobs/LArNoiseBursts.h b/LArCalorimeter/LArCafJobs/LArCafJobs/LArNoiseBursts.h
index d8c568a7f6dd092552a298bc280fa7571b9b82dd..471f149605cba1d45490e8d779ab121c64c22990 100644
--- a/LArCalorimeter/LArCafJobs/LArCafJobs/LArNoiseBursts.h
+++ b/LArCalorimeter/LArCafJobs/LArCafJobs/LArNoiseBursts.h
@@ -19,9 +19,6 @@
 //LAr services:
 #include "Identifier/Range.h" 
 #include "Identifier/IdentifierHash.h"
-//#include "Identifier/HWIdentifier.h"
-//#include "LArElecCalib/ILArPedestal.h"
-//#include "LArRecConditions/ILArBadChannelMasker.h"
 #include "LArRecConditions/LArBadChannelCont.h"
 #include "CaloInterface/ICaloNoiseTool.h"
 #include "CaloInterface/ICalorimeterNoiseTool.h"
@@ -38,10 +35,6 @@
 // Electrons
 #include "egammaEvent/ElectronContainer.h"
 
-//CBNT_UTILS
-//#include "CBNT_Utils/CBNT_AthenaAwareBase.h"
-//#include "AthenaBaseComps/AthAlgorithm.h"
-
 //STL:
 #include <string>
 #include <bitset>
diff --git a/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx b/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx
index 7005f0edd9c926975513104815c4bb9fed24813d..da5a16fac1e50e8b18d334069b324d19bf554b14 100755
--- a/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx
+++ b/LArCalorimeter/LArCafJobs/src/LArShapeDumper.cxx
@@ -30,7 +30,6 @@
 #include "LArCafJobs/CellInfo.h"
 #include "LArCafJobs/RunData.h"
 #include "LArCafJobs/EventData.h"
-#include "LArRawEvent/LArOFIterResultsContainer.h"
 #include "TrigT1Result/RoIBResult.h"
 #include "TrigSteeringEvent/TrigRoiDescriptor.h"
 #include "TFile.h"
@@ -43,9 +42,7 @@
 #include "TrigConfHLTData/HLTSequence.h"
 #include "TrigConfHLTData/HLTSequenceList.h"
 
-// #include "LArCafJobs/DataContainer.h"
 // #include "LArCafJobs/HistoryContainer.h"
-// #include "LArCafJobs/CellInfo.h"
 // #include "LArCafJobs/TreeAccessor.h"
 
 
diff --git a/LArCalorimeter/LArCalibTools/LArCalibTools/LArParamsProperties.h b/LArCalorimeter/LArCalibTools/LArCalibTools/LArParamsProperties.h
index 9a58c4a1f6399e537673f187fdb5d2bf51e13211..8c7dab81937f1d76e49c15bef947554d1db1bfd9 100644
--- a/LArCalorimeter/LArCalibTools/LArCalibTools/LArParamsProperties.h
+++ b/LArCalorimeter/LArCalibTools/LArCalibTools/LArParamsProperties.h
@@ -28,7 +28,6 @@
 #include "LArRawConditions/LArCableLengthComplete.h"
 #include "LArRawConditions/LArCableAttenuationComplete.h"
 #include "LArRawConditions/LArOFCBinComplete.h"
-#include "LArRawConditions/LArPhysCaliTdiffComplete.h"
 
 namespace LArParamsProperties {
 
diff --git a/LArCalorimeter/LArCalibTools/LArCalibTools/LArPulseShape.h b/LArCalorimeter/LArCalibTools/LArCalibTools/LArPulseShape.h
index f1aae4f4547092e4548a456b61bf9cbc4427b0e1..79ac746efa088ec111373463b16f0ec64486bd28 100644
--- a/LArCalorimeter/LArCalibTools/LArCalibTools/LArPulseShape.h
+++ b/LArCalorimeter/LArCalibTools/LArCalibTools/LArPulseShape.h
@@ -22,7 +22,6 @@
 #include "LArRawEvent/LArDigitContainer.h"
 #include "LArCabling/LArOnOffIdMapping.h"
 #include "LArRecConditions/LArBadChannelCont.h"
-#include "LumiBlockData/LuminosityCondData.h"
 #include "LArElecCalib/ILArPedestal.h"
 #include "StoreGate/ReadCondHandleKey.h"
 
diff --git a/LArCalorimeter/LArCalibTools/src/LArPulseShape.cxx b/LArCalorimeter/LArCalibTools/src/LArPulseShape.cxx
index 11a3631a0738f0d1d9fd7c75cff57867847f2c5f..c45f29b2cd34f6249994bf4853e4d3c920897724 100644
--- a/LArCalorimeter/LArCalibTools/src/LArPulseShape.cxx
+++ b/LArCalorimeter/LArCalibTools/src/LArPulseShape.cxx
@@ -16,7 +16,6 @@
 #include "TKey.h"
 #include "TTree.h"
 #include "TSystem.h"
-#include "TSystem.h"
 
 LArPulseShape::LArPulseShape(const std::string& name, ISvcLocator* pSvcLocator): 
   AthAlgorithm(name, pSvcLocator), m_initialized(false),  m_calo_id(0),  
diff --git a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArOFCAlg.h b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArOFCAlg.h
index ba6c9a93e11252da9bc344db3da472e44bab38f6..3173a587a7416c085d5d328b6318ed86531e12c2 100644
--- a/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArOFCAlg.h
+++ b/LArCalorimeter/LArCalibUtils/LArCalibUtils/LArOFCAlg.h
@@ -37,8 +37,6 @@ class LArOnlineID_Base;
 class CaloDetDescrManager_Base; 
 class LArDSPConfig;
 
-#include "GaudiKernel/ToolHandle.h"
-
 class LArOFCAlg:public AthAlgorithm {
  
 public:
diff --git a/LArCalorimeter/LArCalibUtils/src/LArOFCAlg.cxx b/LArCalorimeter/LArCalibUtils/src/LArOFCAlg.cxx
index fe1bf11077a5e23a35398a32eea8d1bddf7a2f13..71ebbacc6552acf6c52ac054c2f4ea6de37687c9 100644
--- a/LArCalorimeter/LArCalibUtils/src/LArOFCAlg.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArOFCAlg.cxx
@@ -9,7 +9,6 @@
 #include "LArCalibUtils/LArOFCAlg.h"
 
 #include "LArRawConditions/LArWaveHelper.h"
-#include "LArRawConditions/LArOFCComplete.h"
 #include "LArRawConditions/LArShapeComplete.h"
 #include "LArRawConditions/LArOFCComplete.h"
 #include "LArRawConditions/LArOFCBinComplete.h"
diff --git a/LArCalorimeter/LArCalibUtils/src/LArPhysWaveHECTool.cxx b/LArCalorimeter/LArCalibUtils/src/LArPhysWaveHECTool.cxx
index f29e139409f6a1dfc04ef0c9bf87a8377e9e07fa..d907e616110c10796e2f422711d2d4b6876a1218 100755
--- a/LArCalorimeter/LArCalibUtils/src/LArPhysWaveHECTool.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArPhysWaveHECTool.cxx
@@ -4,7 +4,6 @@
 
 #include "LArCalibUtils/LArPhysWaveHECTool.h" 
 
-#include "gsl/gsl_integration.h"
 #include <gsl/gsl_integration.h>
 #include <gsl/gsl_errno.h>
 
diff --git a/LArCalorimeter/LArCalibUtils/src/LArPhysWavePredictor.cxx b/LArCalorimeter/LArCalibUtils/src/LArPhysWavePredictor.cxx
index be2f460e8db04f871a829152ce7fdce549b2f542..7365b689b1794602e9aaa166e5d93a9a52982bab 100644
--- a/LArCalorimeter/LArCalibUtils/src/LArPhysWavePredictor.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArPhysWavePredictor.cxx
@@ -34,8 +34,6 @@
 #include "LArCalibUtils/LArPhysWaveTool.h"     // added by FT
 #include "LArCalibUtils/LArPhysWaveHECTool.h"  // added by FT
 
-#include "LArCalibUtils/LArPhysWaveTool.h"
-
 #include <stdio.h>
 #include <iostream>
 #include <fstream>
diff --git a/LArCalorimeter/LArCalibUtils/src/LArRampFCalCorr.cxx b/LArCalorimeter/LArCalibUtils/src/LArRampFCalCorr.cxx
index 635c9e0077398b0f464de759b54b5272addbfe92..99538a10fbe4f24bf0d66e64705764f536d5389c 100755
--- a/LArCalorimeter/LArCalibUtils/src/LArRampFCalCorr.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArRampFCalCorr.cxx
@@ -27,8 +27,6 @@
 #include <cmath>
 using std::pow;
 
-#include <cmath>
-
 LArRampFCalCorr::LArRampFCalCorr(const std::string& name,ISvcLocator* pSvcLocator)
   :AthAlgorithm(name, pSvcLocator),
    m_onlineHelper(0)
diff --git a/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx b/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx
index 5662980119defc86eb75144e8748e62fe13e8c75..67839ad1d330f7936f07a73b2bebd755f27e85e8 100644
--- a/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArNoisyROTool.cxx
@@ -14,7 +14,6 @@
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "LArIdentifier/LArOnlineID.h" 
 #include "LArCabling/LArOnOffIdMapping.h"
-#include "LArRecEvent/LArNoisyROSummary.h"
 #include "StoreGate/ReadCondHandle.h"
 
 LArNoisyROTool::LArNoisyROTool( const std::string& type, 
diff --git a/LArCalorimeter/LArCondUtils/src/LArFecLvTempDcsTool.h b/LArCalorimeter/LArCondUtils/src/LArFecLvTempDcsTool.h
index 6d920f821e15a7b6184ff8dcdab07935cffe4f08..cf73f555d93011f1adf5dbe7fc41623764bb7f82 100755
--- a/LArCalorimeter/LArCondUtils/src/LArFecLvTempDcsTool.h
+++ b/LArCalorimeter/LArCondUtils/src/LArFecLvTempDcsTool.h
@@ -23,7 +23,6 @@
 #include "StoreGate/DataHandle.h" 
 #include "Identifier/Identifier.h" 
 #include "AthenaPoolUtilities/AthenaAttributeList.h"
-#include "StoreGate/DataHandle.h" 
 
 #include <string>
 
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx
index ec51253979a9c0d5613b10d9817b499fadca52f3..d6457911456c23a8f2fcd9c7556ca5960f4a06c7 100755
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx
@@ -23,7 +23,6 @@
 #include "CaloDetDescr/CaloDetDescriptor.h"
 #include "CaloDetDescr/ICaloRecoMaterialTool.h"
 #include "CaloDetDescr/ICaloRecoSimpleGeomTool.h"
-#include "CaloDetDescr/CaloDetDescriptor.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"
 #include "CaloGeoHelpers/CaloPhiRange.h"
 #include <cmath>
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/CryostatCalibrationMixedCalculator.cc b/LArCalorimeter/LArG4/LArG4EC/src/CryostatCalibrationMixedCalculator.cc
index 3f5a3ef46c8cd8a06c3bedc367c604d18b943935..0de45dc3597b610c80fe992adac1a02db4dd1f17 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/CryostatCalibrationMixedCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/CryostatCalibrationMixedCalculator.cc
@@ -26,7 +26,6 @@
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/Bootstrap.h"
 #include "StoreGate/StoreGateSvc.h"
-#include "globals.hh"
 
 #include "G4Step.hh"
 #include "G4StepPoint.hh"
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/EMECSupportCalibrationCalculator.cc b/LArCalorimeter/LArG4/LArG4EC/src/EMECSupportCalibrationCalculator.cc
index aa8220f0418930bbc956343d9445c88c2ea4584d..9834c5c8594925953a881e1559801a24b55b7e08 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/EMECSupportCalibrationCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/EMECSupportCalibrationCalculator.cc
@@ -27,7 +27,6 @@
 #include "GaudiKernel/Bootstrap.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/Units.h"
-#include "globals.hh"
 
 #include "G4Step.hh"
 #include "G4StepPoint.hh"
diff --git a/LArCalorimeter/LArG4/LArG4FastSimulation/src/EndcapFastSimDedicatedSD.cxx b/LArCalorimeter/LArG4/LArG4FastSimulation/src/EndcapFastSimDedicatedSD.cxx
index f8d45b3582280a68bebcd8127cabdb94d2a581d3..c6803c0e2bab5d6964fa92485e3ec4f86a8c3045 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimulation/src/EndcapFastSimDedicatedSD.cxx
+++ b/LArCalorimeter/LArG4/LArG4FastSimulation/src/EndcapFastSimDedicatedSD.cxx
@@ -8,7 +8,6 @@
 #include "LArReadoutGeometry/EMECDetectorManager.h"
 #include "LArReadoutGeometry/EMECDetectorRegion.h"
 #include "LArG4Code/EnergySpot.h"
-#include "LArSimEvent/LArHitContainer.h"
 #include "GeoSpecialShapes/LArWheelCalculator.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "CLHEP/Geometry/Point3D.h"
diff --git a/LArCalorimeter/LArG4/LArG4FastSimulation/src/FCALFastSimDedicatedSD.cxx b/LArCalorimeter/LArG4/LArG4FastSimulation/src/FCALFastSimDedicatedSD.cxx
index 8bf38caf18f002fbb7dca94b497d0a1b4cc0e374..0eabcc57a88f1495743e475048f07ccd669608b7 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimulation/src/FCALFastSimDedicatedSD.cxx
+++ b/LArCalorimeter/LArG4/LArG4FastSimulation/src/FCALFastSimDedicatedSD.cxx
@@ -8,7 +8,6 @@
 #include "LArReadoutGeometry/FCALDetectorManager.h"
 #include "LArReadoutGeometry/FCALModule.h"
 #include "LArG4Code/EnergySpot.h"
-#include "LArSimEvent/LArHitContainer.h"
 #include "GeoModelKernel/GeoTubs.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "CLHEP/Geometry/Transform3D.h"
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.cc
index e043bfb8cfb9de8e5bc122b3f294652c765bec3a..f71e68cd9677fca0e211b8d09638f64b4e3eef58 100644
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.cc
@@ -13,7 +13,6 @@
 #include "G4VPhysicalVolume.hh"
 #include "G4SDManager.hh"
 #include "G4TrackStatus.hh"
-#include "G4StepPoint.hh"
 
 #include "boost/io/ios_state.hpp"
 #include <iomanip>
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx
index 4d82b7f0bf0b3c264a14153991a52f246db2b021..9a40b0eb08bf7ead9545a6d01268c16c2c29d67d 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx
@@ -7,7 +7,6 @@
 // 04-Jan-2002 WGS: Revised to create cryostat mother volume, and to
 // place all endcap components (EMEC, HEC, FCAL) within this volume.
 
-#include "LArGeoEndcap/EndcapCryostatConstruction.h"
 #include "LArGeoEndcap/EndcapCryostatConstruction.h"
 #include "LArGeoEndcap/EndcapPresamplerConstruction.h"
 #include "EndcapDMConstruction.h"
@@ -56,7 +55,6 @@
 
 
 #include "GeoModelInterfaces/IGeoModelSvc.h"
-#include "GeoModelUtilities/GeoDBUtils.h"
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerConstruction.cxx
index 20efcce207efab2f85998bf6b20b443a1249650b..feda70f550554b2957ffe0220a9a59fd7f4d34c7 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerConstruction.cxx
@@ -13,7 +13,6 @@
 #include "GeoModelKernel/GeoNameTag.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/FrontBeamConstructionH62002.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/FrontBeamConstructionH62002.cxx
index 8208804a06736914088f57d0d11e8dc53385f67f..34d476abfe33027ed6cb38828176abc06da0f6a5 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/FrontBeamConstructionH62002.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/FrontBeamConstructionH62002.cxx
@@ -22,7 +22,6 @@
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
-#include "GeoModelKernel/GeoSerialDenominator.h"
 #include "GeoModelKernel/GeoDefinitions.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/TableConstructionH62002.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/TableConstructionH62002.cxx
index 36e89b222a1e02ebca7f3802862b4cc2df6602c6..a7ab6158c8ad6db622b0d4ffdf494297377e6ecd 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/TableConstructionH62002.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/TableConstructionH62002.cxx
@@ -22,7 +22,6 @@
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
-#include "GeoModelKernel/GeoSerialDenominator.h"
 #include "GeoModelKernel/GeoDefinitions.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ExcluderConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ExcluderConstructionH62004.cxx
index 6e87ce6855a39df68877c61ed3a2a13e64a0ac78..6423df2fad3d10420b9faf6e54dde83441eeea6e 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ExcluderConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ExcluderConstructionH62004.cxx
@@ -12,7 +12,6 @@
 #include "GeoModelKernel/GeoTubs.h"
 #include "GeoModelKernel/GeoLogVol.h"
 #include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeIntersection.h"
 #include "GeoModelKernel/GeoShapeSubtraction.h"
 #include "GeoModelKernel/GeoNameTag.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FCALConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FCALConstructionH62004.cxx
index 066462edba78593681179ea83ab297875a66dd4a..ebbf687e9a4334832e66a735b8895b2f9d0a8f9e 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FCALConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FCALConstructionH62004.cxx
@@ -63,7 +63,6 @@
 #include <stdexcept>
 
 #include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/Bootstrap.h" 
 
 //===================constructor
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MiddleBeamConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MiddleBeamConstructionH62004.cxx
index c972caa449c6ebc2956f13e8c09c485162864a3c..0014e1032f9691e0706a6dd9c2da816719c975a4 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MiddleBeamConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MiddleBeamConstructionH62004.cxx
@@ -17,7 +17,6 @@
 #include "GeoModelKernel/GeoTube.h"  
 #include "GeoModelKernel/GeoNameTag.h"  
 #include "GeoModelKernel/GeoTransform.h"  
-#include "GeoModelKernel/GeoSerialDenominator.h"  
 #include "GeoModelKernel/GeoSerialIdentifier.h"
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"  
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.cxx
index 178fb693b08a84ed41a17ca1af55a068c0fcc9d6..dd61de61389fa6d20b5efbdfa111049566ed8ccc 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.cxx
@@ -20,7 +20,6 @@
 #include "GeoModelKernel/GeoCons.h"
 #include "GeoModelKernel/GeoLogVol.h"
 #include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeIntersection.h"
 #include "GeoModelKernel/GeoShapeSubtraction.h"
 #include "GeoModelKernel/GeoNameTag.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MovableTableConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MovableTableConstructionH62004.cxx
index c7c64cadeee3c1147e3e66da75284b7989787ae8..e0ebffe3bbe686881ed2ae7122e3824bf2aff636 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MovableTableConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MovableTableConstructionH62004.cxx
@@ -18,7 +18,6 @@
 #include "GeoModelKernel/GeoTube.h"  
 #include "GeoModelKernel/GeoNameTag.h"  
 #include "GeoModelKernel/GeoTransform.h"  
-#include "GeoModelKernel/GeoSerialDenominator.h"  
 #include "GeoModelKernel/GeoSerialIdentifier.h"
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"  
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004SteppingAction.cc b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004SteppingAction.cc
index a8d13dd93ab3115de174b4d339eaff3f8be241d6..1e6114b2db197d86ff80d6f5ad1a578db8828262 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004SteppingAction.cc
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004SteppingAction.cc
@@ -17,7 +17,6 @@
 #include "LArG4SD/LArG4SD.h"
 #include "LArG4Code/LArG4Identifier.h"
 #include "G4Track.hh"
-#include "G4StepPoint.hh"
 #include "G4TouchableHistory.hh"
 #include "G4TransportationManager.hh"
 #include "G4VPhysicalVolume.hh"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.cxx
index 4f583c3d1a88a6a3d7fc20781f04f35794c31edf..fde9d204d9505e8ae7c3c6e0793ad663aefa72b5 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.cxx
@@ -13,7 +13,6 @@
 #include "GeoModelKernel/GeoCons.h"
 #include "GeoModelKernel/GeoLogVol.h"
 #include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeIntersection.h"
 #include "GeoModelKernel/GeoShapeSubtraction.h"
 #include "GeoModelKernel/GeoNameTag.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/BPCConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/BPCConstruction.cxx
index 47b9c16c98908747e4e4ae97e4dbedb5a05e190e..b119bac86f564bdd31be740b025566dfcc13eca7 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/BPCConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/BPCConstruction.cxx
@@ -23,10 +23,8 @@
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
-#include "GeoModelKernel/GeoSerialDenominator.h"
 #include "GeoModelKernel/GeoDefinitions.h"
 #include "GeoModelKernel/Units.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/H6CryostatConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/H6CryostatConstruction.cxx
index 6b3b210c43e59aeafb59dcd8b1bf800f665bc2fe..caf65d8c7b7b65a5e9ea34457155b603766e59d9 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/H6CryostatConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/H6CryostatConstruction.cxx
@@ -23,7 +23,6 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/MWPCConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/MWPCConstruction.cxx
index 53f04814e7533c8eb5722b45c0bc9dfe13bc1ce7..ffe55d17d448d8417676500fc1d27cd647236d21 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/MWPCConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/MWPCConstruction.cxx
@@ -26,9 +26,7 @@
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
-#include "GeoModelKernel/GeoSerialDenominator.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/WallsConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/WallsConstruction.cxx
index c05eff61fb7b9ad4c195a99706c8ac709f412f4a..77ccc0eb9cf457f144fe00a2c442f21c4abbb088 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/WallsConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/WallsConstruction.cxx
@@ -21,9 +21,7 @@
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
-#include "GeoModelKernel/GeoSerialDenominator.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/CryostatConstructionTBEC.cxx b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/CryostatConstructionTBEC.cxx
index 303628b82f321f01768e6ca464b929f9ce7fe35c..1cdc7fd50a03415850a83ecb56f9aa0accb7aeb6 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/CryostatConstructionTBEC.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/CryostatConstructionTBEC.cxx
@@ -23,7 +23,6 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorConstructionTBEC.cxx b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorConstructionTBEC.cxx
index 997ec1276aa9b88faf88a2286902880136b25251..ec19e9de59765b796e79628a7885492c40893e75 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorConstructionTBEC.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorConstructionTBEC.cxx
@@ -22,7 +22,6 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelUtilities/StoredPhysVol.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorFactoryTBEC.cxx b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorFactoryTBEC.cxx
index 3000815bdbca4d0ff34c13dba14d974113a70c33..073ac8b943e79c26a4f6afe794bd8b001b5f4318 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorFactoryTBEC.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorFactoryTBEC.cxx
@@ -24,7 +24,6 @@
 #include "GaudiKernel/Bootstrap.h"
 #include "GeoModelUtilities/StoredPhysVol.h"
 
-#include "LArReadoutGeometry/EMECDetectorManager.h"
 #include "LArReadoutGeometry/EMECDetectorManager.h"
 #include "LArReadoutGeometry/EMECDetectorRegion.h"
 #include "LArReadoutGeometry/EMECDetDescr.h"
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/LArHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/LArHVManager.cxx
index 94e3a9afec476074de7a3acf3d9d75c752940972..9a129001b46bb9c795cd773bd5fe0b82110a4f5b 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/LArHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/LArHVManager.cxx
@@ -8,7 +8,6 @@
 #include "LArHV/FCALHVManager.h"
 #include "LArHV/EMBPresamplerHVManager.h"
 #include "LArHV/EMECPresamplerHVManager.h"
-#include "LArHV/LArHVManager.h"
 
 LArHVManager::LArHVManager()
   : m_embHV()
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorRegion.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorRegion.cxx
index ca45e94ccb2c1fc06ecf86355214150723ac3dfc..107494cb4b804b4a7c6b38d04619889c7565cd5f 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorRegion.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorRegion.cxx
@@ -5,7 +5,6 @@
 #include "GeoModelKernel/GeoVFullPhysVol.h"
 
 #include "LArReadoutGeometry/EMECDetectorRegion.h"
-#include "GeoModelKernel/GeoVFullPhysVol.h"
 #include "GeoModelKernel/GeoPcon.h"
 #include "GeoPrimitives/CLHEPtoEigenConverter.h"
 
diff --git a/LArCalorimeter/LArRawConditions/LArRawConditions/LArRawConditionsDict1.h b/LArCalorimeter/LArRawConditions/LArRawConditions/LArRawConditionsDict1.h
index 4ef479599477ccf9b918c5bbf6bc04e25223b01d..eb92c4c141ff427d7aa323fc4b0a5720c2c268b3 100644
--- a/LArCalorimeter/LArRawConditions/LArRawConditions/LArRawConditionsDict1.h
+++ b/LArCalorimeter/LArRawConditions/LArRawConditions/LArRawConditionsDict1.h
@@ -13,7 +13,6 @@
 //=== LArAutoCorrP
 #include "LArRawConditions/LArAutoCorrMC.h"
 #include "LArRawConditions/LArAutoCorrP.h"
-#include "LArRawConditions/LArAutoCorrP.h"
 #include "LArRawConditions/LArAutoCorrP1.h"
 INSTAN_CC(LArAutoCorrP1);
 INSTAN_CS(LArAutoCorrP);
diff --git a/LArCalorimeter/LArRecEvent/LArRecEvent/LArFebEnergyCollection.h b/LArCalorimeter/LArRecEvent/LArRecEvent/LArFebEnergyCollection.h
index af487cbcb5fbc83b4b2970d022ee8c9af329866e..72409bbfcf1cd3d6bb816e713574de3394460ec6 100755
--- a/LArCalorimeter/LArRecEvent/LArRecEvent/LArFebEnergyCollection.h
+++ b/LArCalorimeter/LArRecEvent/LArRecEvent/LArFebEnergyCollection.h
@@ -18,9 +18,6 @@
 #include "AthContainers/DataVector.h"
 #include "AthenaKernel/CLASS_DEF.h"
 
-#include "LArRecEvent/LArFebEnergy.h"
-
-
 class LArFebEnergyCollection : public DataVector<LArFebEnergy> {
 
  public:
diff --git a/LArCalorimeter/LArRecUtils/src/LArFlatConditionsAlg.h b/LArCalorimeter/LArRecUtils/src/LArFlatConditionsAlg.h
index dc017b2cd7e718b64e39c1da686c95846236fac9..b710f7c1a723af7f7bb2c735e7ab4a3cc36ef68f 100644
--- a/LArCalorimeter/LArRecUtils/src/LArFlatConditionsAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArFlatConditionsAlg.h
@@ -35,13 +35,9 @@ class LArFlatConditionsAlg: public AthAlgorithm {
 
 
 
-//#include "LArCOOLConditions/LArHVScaleCorrFlat.h"
-//typedef LArFlatConditionsAlg<LArHVScaleCorrFlat> LArFlatCondAlgHVScale;
-
 #include "LArCOOLConditions/LArPedestalFlat.h"
 typedef LArFlatConditionsAlg<LArPedestalFlat> LArCondAlgPedestalFlat;
 
-
 #include "LArCOOLConditions/LArAutoCorrSC.h"
 typedef LArFlatConditionsAlg<LArAutoCorrSC> LArCondAlgAutoCorrSC;
 
@@ -72,9 +68,6 @@ typedef LArFlatConditionsAlg<LArNoiseSC> LArCondAlgNoiseSC;
 #include "LArCOOLConditions/LArOFCFlat.h"
 typedef LArFlatConditionsAlg<LArOFCFlat> LArCondAlgOFCFlat;
 
-#include "LArCOOLConditions/LArPedestalFlat.h"
-typedef LArFlatConditionsAlg<LArPedestalFlat> LArCondAlgPedestalFlat;
-
 #include "LArCOOLConditions/LArPedestalSC.h"
 typedef LArFlatConditionsAlg<LArPedestalSC> LArCondAlgPedestalSC;
 
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
index ef8deea8b39518426e947fba90f3bd26c463c4a9..c41808e350a296a4f4a248fc40a8654ce1d6477e 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
@@ -31,8 +31,6 @@
 #include "LArHV/FCALHVManager.h"
 #include "LArHV/FCALHVLine.h"
 
-#include "LArHV/LArHVManager.h"
-
 #include "LArIdentifier/LArElectrodeID.h"
 #include "LArIdentifier/LArHVLineID.h"
 #include "LArIdentifier/LArOnlineID.h"
diff --git a/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx b/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx
index ea0407b85a31b6af63f199f5dedc60608fccd5f5..7a4b5c10ff546234a5e14fa4a039617da9a998ae 100644
--- a/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx
+++ b/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx
@@ -15,7 +15,6 @@
 #include "../LArOnOffMappingAlg.h"
 #include "../LArCalibLineMappingAlg.h"
 #include "../LArFebRodMappingAlg.h"
-#include "../LArHVIdMappingAlg.h"
 #include "../LArSymConditionsAlg.h"
 #include "../LArMCSymCondAlg.h"
 #include "../LArADC2MeVCondAlg.h"
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
index 6e11e6c8c778fb435801944379383e6c11207ea4..82ec4a159ad05964cb3ec8f5eb58b08ff0223ed1 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
@@ -66,7 +66,6 @@
 #include "LArIdentifier/LArOnlineID.h"
 #include "CaloIdentifier/LArEM_ID.h"
 #include "LArIdentifier/LArOnline_SuperCellID.h"
-#include "CaloIdentifier/LArEM_ID.h"
 #include "CaloIdentifier/CaloCell_SuperCell_ID.h"
 
 #include "LArRawConditions/LArDAC2uAMC.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArConditionsTestAlg.h b/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArConditionsTestAlg.h
index 6fdec0918f490480c22b65303c2484d4d8995b63..768c35aec589a8d99f5fb8d079158e43fe36d36f 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArConditionsTestAlg.h
+++ b/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArConditionsTestAlg.h
@@ -26,11 +26,7 @@
 #include "GaudiKernel/IIncidentListener.h" 
 #include "AthenaKernel/IOVSvcDefs.h"
 
-//  #include "LArCondCnv/ExampleData.h" 
-//  #include "LArCondCnv/ExampleDataRamp.h" 
-#include "LArElecCalib/ILArRamp.h" 
 #include "StoreGate/DataHandle.h"
-//#include "AthenaKernel/IOVSvcDefs.h" 
 #include "StoreGate/ReadCondHandleKey.h"
 #include "LArCabling/LArOnOffIdMapping.h"
 #include "LArRecConditions/LArCalibLineMapping.h"
diff --git a/LArCalorimeter/LArTest/LArEventTest/src/TriggerPatternCount.cxx b/LArCalorimeter/LArTest/LArEventTest/src/TriggerPatternCount.cxx
index e287ebd8cb87a3b043c061548394598100c8e248..e4539bab510ad8c765077070933186bc5ca95689 100755
--- a/LArCalorimeter/LArTest/LArEventTest/src/TriggerPatternCount.cxx
+++ b/LArCalorimeter/LArTest/LArEventTest/src/TriggerPatternCount.cxx
@@ -55,8 +55,6 @@ StatusCode TriggerPatternCount::execute()
   return StatusCode::SUCCESS;
 }
 
-#include <stdlib.h>
-
 StatusCode TriggerPatternCount::finalize()
 {
   ATH_MSG_INFO ( "TriggerPatternCount has finished." );