diff --git a/Reconstruction/egamma/egammaValidation/src/ClusterHistograms.h b/Reconstruction/egamma/egammaValidation/src/ClusterHistograms.h
index 643e25b6107adfb84b2781a77457cec2f18f97e1..ccfd903f28659f8b97799219d42828bd731a10d0 100644
--- a/Reconstruction/egamma/egammaValidation/src/ClusterHistograms.h
+++ b/Reconstruction/egamma/egammaValidation/src/ClusterHistograms.h
@@ -7,8 +7,6 @@
 
 #include <utility>
 
-#include <utility>
-
 #include "GaudiKernel/ITHistSvc.h"
 #include "xAODEgamma/Egamma.h"
 #include "xAODEgamma/EgammaxAODHelpers.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx b/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
index 62c370e1e0d37fab3feca5f6c78ed32ffba580a8..f59b2ad2a2ab048930239b9cb961401782d622bd 100644
--- a/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
@@ -8,7 +8,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "Gaudi/Property.h"
-#include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ITHistSvc.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "AsgTools/AnaToolHandle.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
index c2d4c52b235072c55d4883c3091505f5acb7d282..3cd504034d2e8a3f7cb039fd6d51e5615543c869 100644
--- a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
+++ b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
@@ -27,7 +27,6 @@
 #include "GaudiKernel/ToolHandle.h"
 #include "Gaudi/Property.h"
 #include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ITHistSvc.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "AsgTools/AnaToolHandle.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx b/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx
index a4a584733bf6e0064b68c34a8c97cca8766ef7eb..7c58b8155b85d7e7aa3917ba2fccd7aef9f22cb6 100644
--- a/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx
@@ -7,7 +7,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "Gaudi/Property.h"
-#include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ITHistSvc.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "AsgTools/AnaToolHandle.h"
@@ -18,10 +17,10 @@ namespace egammaMonitoring {
     histoMap["pT"]   = new TH1D(Form("%s_%s",m_name.c_str(),"pT")  , ";p_{T} [GeV]; Track p_{T} Events",  40,            0,         200);
     histoMap["eta"]  = new TH1D(Form("%s_%s",m_name.c_str(),"eta") , ";#eta; Track #eta Events"        ,  40,           -3,           3);
     histoMap["phi"]  = new TH1D(Form("%s_%s",m_name.c_str(),"phi") , ";#phi; Track #phi Events"        ,  20, -TMath::Pi(), TMath::Pi());
-    
+
     histoMap["pT_15GeV"]   = new TH1D(Form("%s_%s",m_name.c_str(),"pT_15GeV")  , ";p_{T} [GeV]; Track p_{T} Events",  40,            0,         200);
     histoMap["eta_15GeV"]  = new TH1D(Form("%s_%s",m_name.c_str(),"eta_15GeV") , ";#eta; Track #eta Events"        ,  40,           -3,           3);
-    histoMap["phi_15GeV"]  = new TH1D(Form("%s_%s",m_name.c_str(),"phi_15GeV") , ";#phi; Track #phi Events"        ,  20, -TMath::Pi(), TMath::Pi());  
+    histoMap["phi_15GeV"]  = new TH1D(Form("%s_%s",m_name.c_str(),"phi_15GeV") , ";#phi; Track #phi Events"        ,  20, -TMath::Pi(), TMath::Pi());
 
     ATH_CHECK(m_rootHistSvc->regHist(m_folder+"pT", histoMap["pT"]));
     ATH_CHECK(m_rootHistSvc->regHist(m_folder+"eta", histoMap["eta"]));
@@ -32,9 +31,9 @@ namespace egammaMonitoring {
     ATH_CHECK(m_rootHistSvc->regHist(m_folder+"phi_15GeV", histoMap["phi_15GeV"]));
     return StatusCode::SUCCESS;
   }
-  
+
   void ParticleHistograms::fill(const xAOD::IParticle& egamma) {
-    
+
     if((egamma.pt())/1000. > 0) histoMap["pT"]->Fill((egamma.pt())/1000.);
     histoMap["eta"]->Fill(egamma.eta());
     histoMap["phi"]->Fill(egamma.phi());
@@ -46,5 +45,5 @@ namespace egammaMonitoring {
     }
 
   }
-  
+
 }
diff --git a/Reconstruction/egamma/egammaValidation/src/ShowerShapesHistograms.h b/Reconstruction/egamma/egammaValidation/src/ShowerShapesHistograms.h
index 7a2efcf7f07025b0eb53a0437cf8b13eb2b77bb1..6a97b6b79d1e0f3e60b9279b0808dba1fe07408b 100644
--- a/Reconstruction/egamma/egammaValidation/src/ShowerShapesHistograms.h
+++ b/Reconstruction/egamma/egammaValidation/src/ShowerShapesHistograms.h
@@ -6,9 +6,6 @@
 #define EGAMMAVALIDATION_SHOWERSHAPESHISTOGRAMS_H
 
 #include <utility>
-
-#include <utility>
-
 #include "GaudiKernel/ITHistSvc.h"
 #include "xAODEgamma/Egamma.h"
 #include "xAODEgamma/EgammaxAODHelpers.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx b/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx
index f8b214c78e72091213ed65577c321aab9a0071da..a4df3003adb1360c31d334df89f1360bc6d1d784 100644
--- a/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx
@@ -6,7 +6,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "Gaudi/Property.h"
-#include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ITHistSvc.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "AsgTools/AnaToolHandle.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/widthestimators.h b/Reconstruction/egamma/egammaValidation/src/widthestimators.h
index 0a3a66af4e19894641bf524f3e2129ca6ee10530..eb256f0a7f51db66379c415d7cb3d6e96968c933 100644
--- a/Reconstruction/egamma/egammaValidation/src/widthestimators.h
+++ b/Reconstruction/egamma/egammaValidation/src/widthestimators.h
@@ -6,9 +6,6 @@
  * 
  * Example:
  * 
- *     #include <iostream>
- *     #include "widthestimators.h"
- * 
  *     using widthestimators;
  * 
  *     int main()
@@ -104,4 +101,4 @@ namespace widthestimators
         double s90(const T &histo) { return smallest_interval(histo, 0.90); }
 
     } // namespace binned
-}     // namespace widthestimators
\ No newline at end of file
+}     // namespace widthestimators