diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
index beef2f0ce1ed92277af42a2f7744d9b65c029421..4a2d1835a5b5c37bd41f1ba2d1afe3dcdd01edb9 100755
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
@@ -1,25 +1,26 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef IInDetTestBLayerTool_H
 #define IInDetTestBLayerTool_H
-#include "GaudiKernel/EventContext.h"
 #include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/ThreadLocalContext.h"
+#include "GaudiKernel/ThreadLocalContext.h" //for Gaudi::Hive::currentContext()
 #include "TrkParameters/TrackParameters.h"
-#include "TrkEventPrimitives/ResidualPull.h"
 #include <vector>
-#include <string>
 
 namespace Trk {
-class Track;
-class IResidualPullCalculator;
+  class Track;
+  class IResidualPullCalculator;
+  class ResidualPull;
 }
+
 namespace InDet {
 class TrackStateOnBLayerInfo;
 }
 
+class EventContext;
+
 namespace InDet {
 
 
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h b/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h
index 2924eb9357dd44ab1edc8735f23de04e4e4b1323..3cb1da4f566af8a550c7398561f459ebc3b39aaa 100644
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h
@@ -8,25 +8,24 @@
 #include "InDetRecToolInterfaces/IInDetTestBLayerTool.h"
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ThreadLocalContext.h" //for Gaudi::Hive::currentContext()
 #include "TrkParameters/TrackParameters.h"
-#include "TrkEventPrimitives/ResidualPull.h"
 #include "TrkExInterfaces/IExtrapolator.h"
 #include "TrkToolInterfaces/IResidualPullCalculator.h"
-
-#include "InDetTestBLayer/TrackStateOnBLayerInfo.h"
 #include "InDetConditionsSummaryService/IInDetConditionsTool.h"
 #include <vector>
 #include <string>
+#include <memory>
 
 namespace Trk {
-class Track;
+  class Track;
+  class ResidualPull;
 }
-namespace Rec { class TrackParticle; }
+
 class AtlasDetectorID;
-class Identifier;
 class PixelID;
-
+class TrackStateOnBLayerInfo;
+class EventContext;
 
 namespace InDet {
 
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
index 871f24d9eeb59894faae744d1646871788be8be9..583477a96cf3074676cd6293e6203be8f9d8014a 100644
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
@@ -1,40 +1,31 @@
 /*
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
+#include "InDetTestBLayer/InDetTestBLayerTool.h"
 
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "AthenaBaseComps/AthService.h"
-
+#include "TrkEventPrimitives/ResidualPull.h"
 #include "InDetReadoutGeometry/SiDetectorElement.h"
 #include "PixelReadoutGeometry/PixelModuleDesign.h"
-#include "InDetTestBLayer/InDetTestBLayerTool.h"
+#include "InDetTestBLayer/TrackStateOnBLayerInfo.h"
+#include "TrkEventPrimitives/ResidualPull.h"
 #include "TrkTrack/Track.h"
-#include "TrkParameters/TrackParameters.h"
 #include "Particle/TrackParticle.h"
 #include "TrkMeasurementBase/MeasurementBase.h"
-
 #include "TrkSurfaces/CylinderSurface.h"
-
 #include "TrkGeometry/Layer.h"
-
 #include "Identifier/Identifier.h"
 #include "InDetIdentifier/PixelID.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "IdDictDetDescr/IdDictManager.h"
-
-
-#include <iostream>
-#include <sstream>
+#include "GaudiKernel/EventContext.h"
 
 using Amg::Transform3D;
 // don't want to include TrackSummary in the header
 // therefore anonymous "static" definition in the implementation file
-//namespace {
-  static const Trk::SummaryType s_layerSummaryTypeExpectHit[2] {
-    Trk::expectInnermostPixelLayerHit,
-    Trk::expectNextToInnermostPixelLayerHit
-  };
-//}
+static const Trk::SummaryType s_layerSummaryTypeExpectHit[2] {
+  Trk::expectInnermostPixelLayerHit,
+  Trk::expectNextToInnermostPixelLayerHit
+};
 
 
 namespace InDet {
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/PerigeeBLPredictionFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/PerigeeBLPredictionFillerTool.cxx
index 1e7172b2637c49a47b523eb23556f99742cafd84..80a67a86219e6cd87f50a17de62c3ac633d433f5 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/PerigeeBLPredictionFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/PerigeeBLPredictionFillerTool.cxx
@@ -12,7 +12,7 @@
 
 #include "PerigeeBLPredictionFillerTool.h"
 #include "InDetTestBLayer/InDetTestBLayerTool.h"
-//#include "TrkParameters/Perigee.h"
+#include "InDetTestBLayer/TrackStateOnBLayerInfo.h"
 #include "AthenaKernel/errorcheck.h"
 #include "InDetReadoutGeometry/SiDetectorElement.h"
 #include "InDetIdentifier/PixelID.h"