diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt
index 14f094f0a7f4aa99ba6d5e878b0ede91aa668b0e..dbadc55323ce2cd7b692144d5e294c7334bf9af7 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt
@@ -9,9 +9,7 @@ atlas_subdir( MuonD3PDMaker )
 atlas_depends_on_subdirs( PRIVATE
                           Control/AthenaBaseComps
                           Control/AthenaKernel
-                          Control/CxxUtils
                           Control/AthContainers
-                          Control/SGTools
                           Control/StoreGate
                           DetectorDescription/AtlasDetDescr
                           Event/EventInfo
@@ -59,7 +57,7 @@ atlas_add_component( MuonD3PDMaker
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils AthContainers SGTools StoreGateLib SGtests AtlasDetDescr EventInfo EventKernel FourMomUtils xAODMuon xAODTracking xAODTruth GaudiKernel MuonCalibITools MuonIdHelpersLib MuonPattern MuonPrepRawData MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSimEvent AnalysisTriggerEvent D3PDMakerUtils TriggerD3PDMakerLib MCTruthClassifierLib McParticleEvent muonEvent TrkGeometry TrkEventPrimitives TrkPrepRawData TrkSegment TrkTrackSummary TrkTruthData TrkExInterfaces TrkToolInterfaces TrigObjectMatchingLib TrigInDetEvent TrigMuonEvent )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel AthContainers StoreGateLib SGtests AtlasDetDescr EventInfo EventKernel FourMomUtils xAODMuon xAODTracking xAODTruth GaudiKernel MuonCalibITools MuonIdHelpersLib MuonPattern MuonPrepRawData MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSimEvent AnalysisTriggerEvent D3PDMakerUtils TriggerD3PDMakerLib MCTruthClassifierLib McParticleEvent muonEvent TrkGeometry TrkEventPrimitives TrkPrepRawData TrkSegment TrkTrackSummary TrkTruthData TrkExInterfaces TrkToolInterfaces TrigObjectMatchingLib TrigInDetEvent TrigMuonEvent )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/ispellwords b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/ispellwords
index e0911aa139b46d10498b60ecbb45773705373c55..9d13622a60dd01fcb7b9e08177c22f1b945fa244 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/ispellwords
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/ispellwords
@@ -282,7 +282,6 @@ IncidentService
 AlgTool
 originalTrack
 TileTimingFillerTool
-SGTools
 elif
 TrackExtrapolatorToCalo
 AuditEndRun
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonPatternCombinationMissedHitFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonPatternCombinationMissedHitFillerTool.cxx
index 37ba3caf4148d1421cca8907f2b2dfb57108b29d..6e21fd146b3502cfde65785ac14f5214fe04adba 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonPatternCombinationMissedHitFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonPatternCombinationMissedHitFillerTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //////////////////////////////////////////////////////
@@ -20,7 +20,6 @@
 #include "MuonPrepRawData/MuonPrepDataContainer.h"
 #include "MuonPrepRawData/MuonPrepDataCollection.h"
 #include "MuonPattern/MuonPatternChamberIntersect.h"
-#include "CxxUtils/make_unique.h"
 
 
 using namespace std;
@@ -153,7 +152,7 @@ namespace D3PD {
       chambers.push_back(chIntersect);
     }
     //build the pattern combination
-    auto pattern = CxxUtils::make_unique<Muon::MuonPatternCombination>
+    auto pattern = std::make_unique<Muon::MuonPatternCombination>
       (new Trk::Perigee(patpos,patdir,1,patpos), chambers);
     pattern->setTrackRoadType(3);
 
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/muonInheritance.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/muonInheritance.cxx
index cafc4bd8980208175349f9b5a9a3ff17d836e22b..a80b83d762bf58051da3d3255d5a7b1ce15541c5 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/muonInheritance.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/muonInheritance.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -17,7 +17,7 @@
 #include "TrigMuonEvent/CombinedMuonFeature.h"
 #include "AnalysisTriggerEvent/Muon_ROI.h"
 #include "EventKernel/INavigable4Momentum.h"
-#include "SGTools/BaseInfo.h"
+#include "AthenaKernel/BaseInfo.h"
 
 SG_ADD_BASE (TrigMuonEF,          SG_VIRTUAL(INavigable4Momentum));
 SG_ADD_BASE (CombinedMuonFeature, SG_VIRTUAL(INavigable4Momentum));