diff --git a/Commission/CommissionRec/src/ComTimeRec.cxx b/Commission/CommissionRec/src/ComTimeRec.cxx
index 7d3d63ee31233d69251c61982775b9e214dfce42..fc82bd90879075e676d51e684f1824aad8a659b1 100755
--- a/Commission/CommissionRec/src/ComTimeRec.cxx
+++ b/Commission/CommissionRec/src/ComTimeRec.cxx
@@ -10,13 +10,9 @@
 
 #include "CommissionEvent/ComTime.h"
 
-// #include "TrackRecord/TimedTrackRecordCollection.h"
-// #include "TrackRecord/TimedTrackRecord.h"
 #include "TrackRecord/TrackRecordCollection.h"
 #include "TrackRecord/TrackRecord.h"
 
-#include "CLHEP/Units/SystemOfUnits.h"
-
 #include <algorithm>
 
 //----------------------------------------------------------------
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx b/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx
index e1cb4ef40a8f433a920292f61426a0c1408594c6..33de1a7d6d237c53fad0e0772193b9d7277915dd 100644
--- a/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx
@@ -10,10 +10,6 @@
  * Based on GeoAccessVolumeAction.
  */
 
-
-#include "GeoModelUtilities/GeoVisitVolumes.h"
-
-
 #include "GeoModelUtilities/GeoVisitVolumes.h"
 #include "GeoModelKernel/GeoNameTag.h"
 #include "GeoModelKernel/GeoSerialDenominator.h"
diff --git a/DetectorDescription/GeoModelXml/src/MakeElement.cxx b/DetectorDescription/GeoModelXml/src/MakeElement.cxx
index c12e1fe38f720eeb06f93548e217314e841d12a6..e37ceffd21495532bdda03e7b925a1ecc73e99c6 100644
--- a/DetectorDescription/GeoModelXml/src/MakeElement.cxx
+++ b/DetectorDescription/GeoModelXml/src/MakeElement.cxx
@@ -6,7 +6,6 @@
 #include <xercesc/dom/DOM.hpp>
 #include "GeoModelKernel/RCBase.h"
 #include "GeoModelKernel/Units.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoElement.h"
 #include "GeoModelXml/translate.h"
 #include "GeoModelXml/GmxUtil.h"
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocReco.h b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocReco.h
index b12b42b015ba521bc16722c125547c2020677857..6729f8efdadebb347c5c22bb46d9c0a1f2674d63 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocReco.h
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocReco.h
@@ -12,7 +12,6 @@
 #include <vector>
 #include <fstream>
 
-//#include "GaudiKernel/Algorithm.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ObjectVector.h"
@@ -31,12 +30,6 @@
 #include "AthenaPoolUtilities/AthenaAttributeList.h"
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
 
-//#include "AFP_RawEv/AFP_RawData.h"
-//#include "AFP_RawEv/AFP_RawDataContainer.h"
-//#include "AFP_RawEv/AFP_RawDataCollection.h"
-//#include "AFP_RawEv/AFP_SIDDigitCollection.h"
-//#include "AFP_RawEv/AFP_TDDigitCollection.h"
-
 #include "AFP_Geometry/AFP_constants.h"
 #include "AFP_Geometry/AFP_Geometry.h"
 #include "AFP_Geometry/AFP_ConfigParams.h"
@@ -45,8 +38,6 @@
 #include "AFP_DigiEv/AFP_SiDigiCollection.h"
 #include "AFP_LocRecoEv/AFP_SIDLocRecoEvCollection.h"
 
-//#include "AFP_LocRecoEv/AFP_SIDLocRecoEvCollection.h"
-
 #include "AFP_LocReco/AFP_UserObjects.h"
 #include "AFP_LocReco/AFP_SIDBasicKalman.h"
 
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
index d3274fe48e8870757c40cfaee9fe2969f8436013..ad5c86de060c9c22648cbf5109bb3e0e58e945df 100644
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
+++ b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
@@ -14,13 +14,6 @@
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ServiceHandle.h"
 
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "GeneratorObjects/McEventCollection.h"
-
-
-
-
 // FrameWork includes
 #include "GaudiKernel/ITHistSvc.h"
 #include "Gaudi/Property.h"
@@ -48,9 +41,6 @@ ALFA_BeamTransport::ALFA_BeamTransport(const std::string& name, ISvcLocator* pSv
   :
   AthAlgorithm(name,pSvcLocator)
 {
-  //  template for property decalration
-  //declareProperty("PropertyName", m_propertyName);
-
   declareProperty("ConfDir", m_FPConfig.ConfDir="./config");
   declareProperty("UseALFA", m_FPConfig.UseALFA=true);
   declareProperty("Debug", m_WriteDebugOutput=false);
diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/ALFA_Ntuple/ALFA_Ntuple.h b/ForwardDetectors/ALFA/ALFA_Ntuple/ALFA_Ntuple/ALFA_Ntuple.h
index d6b02c64227a633516d509b53a3666eb9768697e..470cd17eff1f4d6929d8efd181fb6a9ef1160fdc 100644
--- a/ForwardDetectors/ALFA/ALFA_Ntuple/ALFA_Ntuple/ALFA_Ntuple.h
+++ b/ForwardDetectors/ALFA/ALFA_Ntuple/ALFA_Ntuple/ALFA_Ntuple.h
@@ -7,8 +7,6 @@
 
 #include "AthenaBaseComps/AthHistogramAlgorithm.h"
 
-//#include "GaudiKernel/Algorithm.h"
-//#include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "AthenaKernel/IIOVSvc.h"
@@ -16,7 +14,6 @@
 
 #include "AthenaPoolUtilities/AthenaAttributeList.h"
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
-//#include "CoralBase/Blob.h"
 
 #include <string>
 #include <iostream>
@@ -44,8 +41,6 @@
 #include "TF1.h"
 #include "TLatex.h"
 #include "TList.h"
-
-#include "TMath.h"
 #include "TMathBase.h"
 
 //for truth particles
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/ALFA_GloRec/ALFA_GloRec.h b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/ALFA_GloRec/ALFA_GloRec.h
index a05aa65651c640a322b00d682a1c9f81b31fd0a5..f29ee72470224bf6eacff89f7396988ee9134aa9 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/ALFA_GloRec/ALFA_GloRec.h
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/ALFA_GloRec/ALFA_GloRec.h
@@ -15,14 +15,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h>
-//#include "typeinfo.h"
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/Algorithm.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/Kernel.h"
-//#include "GaudiKernel/PropertyCallbackFunctor.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "EventInfo/EventInfo.h"
 #include "EventInfo/EventID.h"
@@ -61,7 +59,6 @@
 #include "TGraph.h"
 #include "TApplication.h"
 #include "TH2F.h"
-#include "TCanvas.h"
 #include "TPad.h"
 #include "TObjArray.h"
 #include "TObjString.h"
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/glorecplots.C b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/glorecplots.C
index 46cc8e6d1e2432f2616fd109bebc6cb55441435d..16473dd08af20683f3d238bdef27c6de3b794a00 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/glorecplots.C
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/glorecplots.C
@@ -17,7 +17,6 @@
 #include <cstdlib> 
 #include <stdio.h>
 #include <string>
-#include <iostream>
 #include <fstream>
 #include <ctype.h>
 
diff --git a/ForwardDetectors/FPTracker/src/Point.cxx b/ForwardDetectors/FPTracker/src/Point.cxx
index f3084da4dd868f728fe90e6553353fcb241558e5..5a277b32f2e9d950474843daedb8eefe7423500d 100644
--- a/ForwardDetectors/FPTracker/src/Point.cxx
+++ b/ForwardDetectors/FPTracker/src/Point.cxx
@@ -7,7 +7,6 @@
 #include <sstream>
 #include <cmath>
 #include <stdexcept>
-#include <sstream>
 #include <iomanip>
 namespace FPTracker{
   Point::Point():m_x(0.), m_y(0.), m_z(0.){
diff --git a/ForwardDetectors/FPTracker/src/TransversePoint.cxx b/ForwardDetectors/FPTracker/src/TransversePoint.cxx
index 64a93feb5f85da270c3734d8719f7efc4268986e..cb8cf0727837b0f93d2c4e3e37b9c2d489fd7645 100644
--- a/ForwardDetectors/FPTracker/src/TransversePoint.cxx
+++ b/ForwardDetectors/FPTracker/src/TransversePoint.cxx
@@ -7,7 +7,6 @@
 #include <cmath>
 #include <iomanip>
 #include <stdexcept>
-#include <sstream>
 namespace FPTracker{
   TransversePoint::TransversePoint():m_x(0.), m_y(0.){
   }
diff --git a/ForwardDetectors/FPTracker/src/getAlfaMagnetConfigFiles.cxx b/ForwardDetectors/FPTracker/src/getAlfaMagnetConfigFiles.cxx
index 4a8ffdb6c7a8c675ca5419cda32e63af62f9284b..f11606bfd5214535a29fa69fe9f9c478ab906e8a 100644
--- a/ForwardDetectors/FPTracker/src/getAlfaMagnetConfigFiles.cxx
+++ b/ForwardDetectors/FPTracker/src/getAlfaMagnetConfigFiles.cxx
@@ -7,7 +7,6 @@
 #include "FPTracker/SimpleLogger.h"
 #include "../src/openFile.tpl"
 #include <sstream>
-#include <sstream>
 #include <stdexcept>
 
 namespace FPTracker{
diff --git a/ForwardDetectors/FPTracker/src/getMagnetConfigFiles.cxx b/ForwardDetectors/FPTracker/src/getMagnetConfigFiles.cxx
index ea4adeb61f45039af17e9950b272be8e5f73e7f2..9d0cbafa56f68fe8022311e6330e39ca61d270b3 100644
--- a/ForwardDetectors/FPTracker/src/getMagnetConfigFiles.cxx
+++ b/ForwardDetectors/FPTracker/src/getMagnetConfigFiles.cxx
@@ -7,7 +7,6 @@
 #include "FPTracker/SimpleLogger.h"
 #include "../src/openFile.tpl"
 #include <sstream>
-#include <sstream>
 #include <iostream>
 #include <stdexcept>
 
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCTreeAnalysis.C b/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCTreeAnalysis.C
index 223f0137777e3f2a39828df6525fd6bf0d347efd..0153fc93c00edc4d6a9254d54fcbd0c735c9f193 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCTreeAnalysis.C
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCTreeAnalysis.C
@@ -8,10 +8,6 @@
 #include <algorithm>
 #include <cmath>
 
-#include <TH2.h>
-#include <TStyle.h>
-#include <TCanvas.h>
-
 #include <TH2.h>
 #include <TStyle.h>
 #include <TCanvas.h>
@@ -21,8 +17,6 @@
 #include <TLatex.h>
 #include <TPaveStats.h>
 
-#include <cmath>
-
 template <typename T> T Sqr(const T& inT) {return inT*inT;}
 
 void ZDCTreeAnalysis::InitInternal() 
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamRawDataV2.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamRawDataV2.h
index b9c63fc5f0bb64727e9e7de3b6acc36d01619df2..7794d763919fd8865ba25356bf3e1fbab60c51f5 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamRawDataV2.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamRawDataV2.h
@@ -29,8 +29,6 @@ class StatusCode;
 class ZdcDigits;
 class ZdcDigitsCollection;
 
-#include "xAODTrigL1Calo/TriggerTowerContainer.h"
-
 class ZdcByteStreamRawDataV2: public AthReentrantAlgorithm
 {
 public:
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx
index 0b2fbe8312e492cf0d6874db899bf3d944401ac5..b2a0d03ccbf7a541b126e59e7779cff05a7e8b3a 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx
@@ -22,22 +22,15 @@
 
 #include <math.h>
 
-//#include <gsl/gsl_errno.h>
-//#include <gsl/gsl_spline.h>
-
 #include "TMath.h"
-//#include "Identifier/HWIdentifier.h"
 
 #include "GaudiKernel/IInterface.h"
 #include "GaudiKernel/MsgStream.h"
 
-
-
 #include "ZdcEvent/ZdcDigits.h"
 #include "ZdcEvent/ZdcDigitsCollection.h"
 #include "ZdcRec/ZdcRecChannelTool.h"
 #include "ZdcRec/ZdcSignalSinc.h"
-//#include "ZdcIdentifier/ZdcID.h"
 #include "ZdcIdentifier/ZdcID.h"
 #include "ZdcConditions/ZdcCablingService.h"
 
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
index 4ce9f9be54448d9b170731283cad7e0f2f1db93c..7feaba6ec0ef946a8ac4fcc00cae060de5dfb20b 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
@@ -32,7 +32,6 @@
 #include "ZdcByteStream/ZdcToString.h"
 
 
-//#include "ZdcIdentifier/ZdcID.h"
 #include "ZdcIdentifier/ZdcID.h"
 #include "ZdcConditions/ZdcCablingService.h"
 
diff --git a/Tools/LWHists/src/FlexBinChunk.icc b/Tools/LWHists/src/FlexBinChunk.icc
index 1b046bfe81e829aedd5977e42346a8847ac098e8..b06694a7acbe5aa08446c7af902068949f246385 100644
--- a/Tools/LWHists/src/FlexBinChunk.icc
+++ b/Tools/LWHists/src/FlexBinChunk.icc
@@ -9,8 +9,6 @@
 #define FLEXBINCHUNK_ALLCHARSTAGE  (static_cast<uint32_t>(0x55555555))
 #define FLEXBINCHUNK_ALLSHORTSTAGE (static_cast<uint32_t>(0xAAAAAAAA))
 
-#include <cmath>
-
 template <class T> inline unsigned FlexBinChunk_stageByType() { return 0x3; }
 template <> inline unsigned FlexBinChunk_stageByType<uint8_t>() { return 0x1; }
 template <> inline unsigned FlexBinChunk_stageByType<uint16_t>() { return 0x2; }