diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
index 9d6958eb67f5b0c0b5cb6baed242bb09ded6d989..899ada0f48216fdd9efaca34f1132d4e078e1d9b 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
@@ -12,8 +12,6 @@
 // EventUtils includes
 #include "ParticleSelectionAlg.h"
 
-// STL includes
-
 // FrameWork includes
 #include "Gaudi/Property.h"
 #include "DerivationFrameworkInterfaces/IAugmentationTool.h"
@@ -57,7 +55,6 @@
 #include "xAODCutFlow/CutBookkeeperContainer.h"
 #include "xAODCutFlow/CutBookkeeperAuxContainer.h"
 
-
 ///////////////////////////////////////////////////////////////////
 // Public methods:
 ///////////////////////////////////////////////////////////////////
@@ -229,7 +226,7 @@ StatusCode ParticleSelectionAlg::start()
   // Now, register one CutBookkeeper per cut that will be applied.
   // For each of the registered tools, get the TAccept and ask it for all known cuts.
   for ( std::size_t toolIdx=0; toolIdx < m_selTools.size(); ++toolIdx ){
-    const ToolHandle<IAsgSelectionTool>& tool = m_selTools[toolIdx];
+    const TooHandle<IAsgSelectionTool>& tool = m_selTools[toolIdx];
     // Fill the index bookkeeping at what index in the CutBookkeeperContainer
     // the CutBookkeepers for this tool start.
     m_selToolIdxOffset.push_back( cutBKCont->size() );
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h
index 55ba90ca3b16d984bd63307fd1866b3beb11f3f5..b5acec334ad0d0411af3f8dfa35c0d532674a2d5 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h
@@ -11,10 +11,6 @@
 #ifndef EVENTUTILS_PARTICLESELECTIONALG_H
 #define EVENTUTILS_PARTICLESELECTIONALG_H 1
 
-// STL includes
-#include <string>
-#include <vector>
-
 // FrameWork includes
 #include "GaudiKernel/ToolHandle.h"
 // #include "GaudiKernel/ServiceHandle.h"
@@ -24,6 +20,10 @@
 //#include "TrigDecisionTool/TrigDecisionTool.h"
 #include "PATCore/IAsgSelectionTool.h"
 
+// STL includes
+#include <string>
+#include <vector>
+
 // // Forward declarations
 // namespace Trig{
 //   class TrigDecisionTool;
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
index 9f76e24362c7e8b261d69250d8c4419043d7ed1b..f5ad85275d7fda499fa4e9ee13f2a4490c6a552c 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
@@ -12,15 +12,11 @@
 // EventUtils includes
 #include "ParticleSortingAlg.h"
 
-// STL includes
-
 // FrameWork includes
 #include "Gaudi/Property.h"
 #include "GaudiKernel/IJobOptionsSvc.h"
 #include "DerivationFrameworkInterfaces/IAugmentationTool.h"
 
-
-
 ///////////////////////////////////////////////////////////////////
 // Public methods:
 ///////////////////////////////////////////////////////////////////
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
index 5edbd3c45d2f409fec0326008490cd06723326b5..763f04c952cab1305f4467bf3595943579326178 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
@@ -11,24 +11,20 @@
 #ifndef EVENTUTILS_PARTICLESORTINGALG_H
 #define EVENTUTILS_PARTICLESORTINGALG_H 1
 
-// STL includes
-#include <string>
-
 // FrameWork includes
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 
+// STL includes
+#include <string>
 
-// forward declarations
+// Forward declarations
 class IJobOptionsSvc;
 namespace DerivationFramework {
   class IAugmentationTool;
 }
 
-
-
-
 class ParticleSortingAlg
   : public ::AthAlgorithm
 {
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.cxx
index f6be2697dd23924c225807a888117ba2638c3e00..fa1702c32ef1b749fcedcc0445d47c68d67cfc4e 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.cxx
@@ -9,16 +9,9 @@
 // Author: Karsten Koeneke <karsten.koeneke@cern.ch>
 ///////////////////////////////////////////////////////////////////
 
-
 // EventUtils includes
 #include "ParticleSortingTool.h"
 
-// STL includes
-#include <vector>
-#include <string>
-
-// FrameWork includes
-
 // EDM includes
 #include "xAODBase/IParticle.h"
 #include "xAODBase/IParticleContainer.h"
@@ -36,7 +29,9 @@
 #include "xAODCaloEvent/CaloClusterContainer.h"
 #include "AthContainers/ConstDataVector.h"
 
-
+// STL includes
+#include <vector>
+#include <string>
 
 // Constructors
 ////////////////
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.h
index 96c68cd5b6c1c2c4044348eb4740632db46c960b..4fb4ebe5b345d28335dd73bb73e217ec0698e4c2 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.h
@@ -11,10 +11,6 @@
 #ifndef EVENTUTILS_PARTICLESORTINGTOOL_H
 #define EVENTUTILS_PARTICLESORTINGTOOL_H 1
 
-// STL includes
-#include <vector>
-#include <string>
-
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "DerivationFrameworkInterfaces/IAugmentationTool.h"
@@ -25,7 +21,9 @@
 #include "xAODBase/IParticleContainer.h"
 #include "AthContainers/ConstDataVector.h"
 
-
+// STL includes
+#include <vector>
+#include <string>
 
 class ParticleSortingTool
   : virtual public ::DerivationFramework::IAugmentationTool,