From b82dd38e6557acb3ce93e30bac6dd13e30c75e6b Mon Sep 17 00:00:00 2001
From: Nils Krumnack <krumnack@iastate.edu>
Date: Fri, 2 Oct 2020 11:47:07 -0500
Subject: [PATCH] remove AsgTools/StatusCode.h

That has been superseded by AsgMessaging/StatusCode.h.
---
 .../AsgTools/AsgTools/AsgComponent.icc           |  2 +-
 .../AsgTools/AsgTools/StatusCode.h               | 16 ----------------
 .../Root/InDetSecVtxTrackAccessor.h              |  2 +-
 .../Root/InDetTrackAccessor.h                    |  2 +-
 .../SelectionHelpers/Root/ISelectionAccessor.cxx |  2 +-
 .../Root/OutOfValidityEventHelper.cxx            |  2 +-
 .../Root/OutOfValidityHelper.cxx                 |  2 +-
 .../Root/SelectionReadHandle.cxx                 |  2 +-
 .../SystematicsHandles/Root/SysListHandle.cxx    |  2 +-
 .../SystematicsHandles/CopyHelpers.h             |  2 +-
 .../SystematicsHandles/SysDecorationHandle.icc   |  2 +-
 .../SystematicsHandles/SysReadHandle.icc         |  2 +-
 .../SystematicsHandles/SysReadHandleArray.icc    |  2 +-
 .../AssociationUtils/OverlapLinkHelper.h         |  2 +-
 .../AssociationUtils/OverlapRemovalInit.h        |  2 +-
 .../AnaAlgorithm/AnaAlgorithm/ITreeWorker.h      |  2 +-
 .../D3PDTools/EventLoop/EventLoop/Module.h       |  2 +-
 .../D3PDTools/EventLoop/Root/BaseManager.cxx     |  2 +-
 .../D3PDTools/EventLoop/Root/CondorDriver.cxx    |  2 +-
 .../D3PDTools/EventLoop/Root/DriverManager.cxx   |  2 +-
 .../D3PDTools/EventLoop/Root/GEDriver.cxx        |  2 +-
 .../EventLoop/Root/KubernetesDriver.cxx          |  2 +-
 .../D3PDTools/EventLoop/Root/LLDriver.cxx        |  2 +-
 .../D3PDTools/EventLoop/Root/LSFDriver.cxx       |  2 +-
 .../D3PDTools/EventLoop/Root/LocalDriver.cxx     |  2 +-
 .../EventLoop/Root/OutputStreamData.cxx          |  2 +-
 .../D3PDTools/EventLoop/Root/RetrieveManager.cxx |  2 +-
 .../D3PDTools/EventLoop/Root/SlurmDriver.cxx     |  2 +-
 .../D3PDTools/EventLoop/Root/SoGEDriver.cxx      |  2 +-
 .../D3PDTools/EventLoop/Root/SubmitManager.cxx   |  2 +-
 .../D3PDTools/EventLoop/Root/TorqueDriver.cxx    |  2 +-
 .../EventLoopAlgs/test/gt_DuplicateChecker.cxx   |  2 +-
 .../EventLoopTest/test/gt_UnitTestAlgXAOD.cxx    |  2 +-
 .../util/CreateDummyEl.h                         |  2 +-
 .../MET/METUtilities/METUtilities/CutsMETMaker.h |  2 +-
 .../MET/METUtilities/METUtilities/METHelpers.h   |  2 +-
 .../tauRecTools/tauRecTools/BDTHelper.h          |  2 +-
 .../TrigDecisionTool/IDecisionUnpacker.h         |  2 +-
 .../TrigDecisionTool/TrigDecisionToolCore.h      |  2 +-
 .../TrigConfxAOD/tools/prepareTriggerMenu.h      |  2 +-
 40 files changed, 39 insertions(+), 55 deletions(-)
 delete mode 100644 Control/AthToolSupport/AsgTools/AsgTools/StatusCode.h

diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgComponent.icc b/Control/AthToolSupport/AsgTools/AsgTools/AsgComponent.icc
index cc3f1102210..77cda10fb7c 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgComponent.icc
+++ b/Control/AthToolSupport/AsgTools/AsgTools/AsgComponent.icc
@@ -9,7 +9,7 @@
 #define ASGTOOLS_ASGCOMPONENT_ICC
 
 #include <AsgTools/PropertyMgr.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <AsgTools/TProperty.h>
 #include <utility>
 
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/StatusCode.h b/Control/AthToolSupport/AsgTools/AsgTools/StatusCode.h
deleted file mode 100644
index 677f7145e82..00000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/StatusCode.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_StatusCode_h
-#define FILE_AsgTools_StatusCode_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2.  once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
-
-#include <AsgMessaging/StatusCode.h>
-
-#endif
diff --git a/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h b/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h
index a3b3397bbd8..7dc22e302c4 100644
--- a/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h
+++ b/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h
@@ -9,7 +9,7 @@
 #ifndef INDETSECVTXTRACKSELECTIONTOOL_INDETTRACKACCESSOR_H
 #define INDETSECVTXTRACKSELECTIONTOOL_INDETTRACKACCESSOR_H
 
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 #include "AsgTools/AsgMessaging.h"
 
 #include "xAODTracking/TrackingPrimitives.h"
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h
index c8f62399b85..86c3b9b7e5e 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h
@@ -10,7 +10,7 @@
 #ifndef INDETTRACKSELECTIONTOOL_INDETTRACKACCESSOR_H
 #define INDETTRACKSELECTIONTOOL_INDETTRACKACCESSOR_H
 
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 #include "AsgTools/AsgMessaging.h"
 #include "xAODTracking/TrackingPrimitives.h"
 #include "xAODTracking/TrackParticle.h"
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/ISelectionAccessor.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/ISelectionAccessor.cxx
index d3c2ecb7743..3c926e8d439 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/ISelectionAccessor.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/ISelectionAccessor.cxx
@@ -11,7 +11,7 @@
 
 #include <SelectionHelpers/ISelectionAccessor.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <SelectionHelpers/SelectionAccessorBits.h>
 #include <SelectionHelpers/SelectionAccessorChar.h>
 #include <SelectionHelpers/SelectionAccessorInvert.h>
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx
index 094f7e262b8..cc240e15ba9 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx
@@ -12,7 +12,7 @@
 #include <SelectionHelpers/OutOfValidityEventHelper.h>
 
 #include <AsgMessaging/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <PATInterfaces/CorrectionCode.h>
 
 //
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx
index a7ef6f31fba..805032cd80b 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx
@@ -12,7 +12,7 @@
 #include <SelectionHelpers/OutOfValidityHelper.h>
 
 #include <AsgMessaging/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <PATInterfaces/CorrectionCode.h>
 
 //
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx
index 51e2d03b776..06028136257 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx
@@ -12,7 +12,7 @@
 #include <SelectionHelpers/SelectionReadHandle.h>
 
 #include <AsgMessaging/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 
 //
 // method implementations
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx b/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx
index 159109a217c..3e1bc1dff0e 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx
@@ -12,7 +12,7 @@
 #include <SystematicsHandles/SysListHandle.h>
 
 #include <AsgMessaging/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <PATInterfaces/SystematicSet.h>
 #include <SystematicsHandles/ISysHandleBase.h>
 #include <regex>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h
index 8240db43077..29d8179f726 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h
@@ -10,7 +10,7 @@
 
 #include <AnaAlgorithm/AnaAlgorithm.h>
 #include <AsgMessaging/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <xAODBase/IParticleContainer.h>
 #include <xAODBase/IParticleHelpers.h>
 #include <xAODCore/ShallowCopy.h>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc
index 48bcb799f39..c0acdbff906 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc
@@ -10,7 +10,7 @@
 //
 
 #include <AsgMessaging/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <SystematicsHandles/Helpers.h>
 
 #include <regex>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc
index dc9e28744a6..86f59f5aed4 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc
@@ -10,7 +10,7 @@
 //
 
 #include <AsgMessaging/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <SystematicsHandles/Helpers.h>
 
 //
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc
index 8b4676d0c36..8ab1d17b0dc 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc
@@ -10,7 +10,7 @@
 //
 
 #include <AsgMessaging/MessageCheck.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <SystematicsHandles/Helpers.h>
 
 //
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h
index 890514a262f..83b92609c7c 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapLinkHelper.h
@@ -6,7 +6,7 @@
 #define ASSOCIATIONUTILS_OVERLAPLINKHELPER_H
 
 // Framework includes
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 
 // EDM includes
 #include "xAODBase/IParticleContainer.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h
index b29235d4712..2105c76bfb6 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/OverlapRemovalInit.h
@@ -14,7 +14,7 @@
 #include <string>
 
 // ASG includes
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 
 // Local includes
 #include "AssociationUtils/ToolBox.h"
diff --git a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/ITreeWorker.h b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/ITreeWorker.h
index 38c9cc6da44..c60c200183e 100644
--- a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/ITreeWorker.h
+++ b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/ITreeWorker.h
@@ -14,7 +14,7 @@
 #include <string>
 
 // Framework include(s):
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 
 // Local include(s):
 #include "AnaAlgorithm/Global.h"
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Module.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Module.h
index 10d782ab9a7..47ee245888b 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Module.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/Module.h
@@ -11,7 +11,7 @@
 
 #include <EventLoop/Global.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 
 namespace EL
 {
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BaseManager.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BaseManager.cxx
index 528a2d35999..8e508450143 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BaseManager.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BaseManager.cxx
@@ -12,7 +12,7 @@
 
 #include <EventLoop/BaseManager.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/ManagerData.h>
 #include <EventLoop/ManagerOrder.h>
 #include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx
index f6f90279f83..94e0f318787 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/CondorDriver.cxx
@@ -11,7 +11,7 @@
 
 #include <EventLoop/CondorDriver.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/BatchJob.h>
 #include <EventLoop/Job.h>
 #include <EventLoop/ManagerData.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/DriverManager.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/DriverManager.cxx
index 1c8e46b6863..43deeada993 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/DriverManager.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/DriverManager.cxx
@@ -12,7 +12,7 @@
 
 #include <EventLoop/DriverManager.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/Driver.h>
 #include <EventLoop/ManagerData.h>
 #include <EventLoop/ManagerOrder.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx
index 48e796f8600..1d1b231102b 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/GEDriver.cxx
@@ -11,7 +11,7 @@
 
 #include <EventLoop/GEDriver.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/Job.h>
 #include <EventLoop/ManagerData.h>
 #include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/KubernetesDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/KubernetesDriver.cxx
index c476764c38d..f5fa5621d92 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/KubernetesDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/KubernetesDriver.cxx
@@ -14,7 +14,7 @@
 #include <fstream>
 #include <sstream>
 #include <TSystem.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/Job.h>
 #include <EventLoop/ManagerData.h>
 #include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx
index 0f65ca5cb11..ca1f30aa8c2 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LLDriver.cxx
@@ -12,7 +12,7 @@
 
 #include <EventLoop/LLDriver.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/Job.h>
 #include <EventLoop/ManagerData.h>
 #include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx
index ad2326640be..7ebcaf77b94 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LSFDriver.cxx
@@ -11,7 +11,7 @@
 
 #include <EventLoop/LSFDriver.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/Job.h>
 #include <EventLoop/ManagerData.h>
 #include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
index b794680c99c..d539774682c 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
@@ -13,7 +13,7 @@
 
 #include <sstream>
 #include <TSystem.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/Job.h>
 #include <EventLoop/ManagerData.h>
 #include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStreamData.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStreamData.cxx
index 91a5eafb77b..984596c1ea0 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStreamData.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/OutputStreamData.cxx
@@ -12,7 +12,7 @@
 
 #include <EventLoop/OutputStreamData.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <RootCoreUtils/Assert.h>
 #include <RootCoreUtils/RootUtils.h>
 #include <TH1.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/RetrieveManager.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/RetrieveManager.cxx
index b9051ca92c6..cfb91757649 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/RetrieveManager.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/RetrieveManager.cxx
@@ -12,7 +12,7 @@
 
 #include <EventLoop/RetrieveManager.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/Driver.h>
 #include <EventLoop/ManagerData.h>
 #include <EventLoop/ManagerOrder.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx
index 33cf2ade5e1..6d5a721ca7a 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SlurmDriver.cxx
@@ -11,7 +11,7 @@
 
 #include <EventLoop/SlurmDriver.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/BatchJob.h>
 #include <EventLoop/Job.h>
 #include <EventLoop/ManagerData.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx
index 9afb0b6bd67..0df351060d7 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SoGEDriver.cxx
@@ -12,7 +12,7 @@
 
 #include <EventLoop/SoGEDriver.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/Job.h>
 #include <EventLoop/ManagerData.h>
 #include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SubmitManager.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SubmitManager.cxx
index 4540f4f1719..7bb0fae28f4 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/SubmitManager.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/SubmitManager.cxx
@@ -12,7 +12,7 @@
 
 #include <EventLoop/SubmitManager.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/Driver.h>
 #include <EventLoop/Job.h>
 #include <EventLoop/ManagerData.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx
index 5543001b1b4..97d813735de 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TorqueDriver.cxx
@@ -11,7 +11,7 @@
 
 #include <EventLoop/TorqueDriver.h>
 
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <EventLoop/Job.h>
 #include <EventLoop/ManagerData.h>
 #include <EventLoop/MessageCheck.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/gt_DuplicateChecker.cxx b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/gt_DuplicateChecker.cxx
index 0131805b978..f8a03eb1428 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/gt_DuplicateChecker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/test/gt_DuplicateChecker.cxx
@@ -13,7 +13,7 @@
 #include <EventLoopAlgs/Global.h>
 #include <AsgTesting/UnitTest.h>
 #include <AthContainers/AuxStoreStandalone.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <RootCoreUtils/Assert.h>
 #include <RootCoreUtils/ShellExec.h>
 #include <SampleHandler/SampleLocal.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_UnitTestAlgXAOD.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_UnitTestAlgXAOD.cxx
index 8e8f0cd5ad4..a0110a2c15f 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_UnitTestAlgXAOD.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_UnitTestAlgXAOD.cxx
@@ -13,7 +13,7 @@
 #include <EventLoopTest/UnitTestAlgXAOD.h>
 #include <AsgTesting/UnitTest.h>
 #include <AthContainers/AuxStoreStandalone.h>
-#include <AsgTools/StatusCode.h>
+#include <AsgMessaging/StatusCode.h>
 #include <RootCoreUtils/Assert.h>
 #include <RootCoreUtils/ShellExec.h>
 #include <SampleHandler/SampleLocal.h>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/CreateDummyEl.h b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/CreateDummyEl.h
index 05dc33a6814..959526833ab 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/CreateDummyEl.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/CreateDummyEl.h
@@ -11,7 +11,7 @@
 #ifdef ROOTCORE
 #include "xAODRootAccess/TEvent.h"
 #include "xAODRootAccess/TStore.h"
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 #endif // ROOTCORE
 
 StatusCode getElectrons(const std::vector<std::pair<double,double> >& pt_eta, int runNumber,
diff --git a/Reconstruction/MET/METUtilities/METUtilities/CutsMETMaker.h b/Reconstruction/MET/METUtilities/METUtilities/CutsMETMaker.h
index fc45f1c2489..f11446c397e 100644
--- a/Reconstruction/MET/METUtilities/METUtilities/CutsMETMaker.h
+++ b/Reconstruction/MET/METUtilities/METUtilities/CutsMETMaker.h
@@ -10,7 +10,7 @@
 // Author: Russell Smith <rsmith@cern.ch>
 ///////////////////////////////////////////////////////////////////
 
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 
 #include "xAODTau/TauJet.h"
 #include "xAODEgamma/Electron.h"
diff --git a/Reconstruction/MET/METUtilities/METUtilities/METHelpers.h b/Reconstruction/MET/METUtilities/METUtilities/METHelpers.h
index 4dd09039393..84b9f18eac7 100644
--- a/Reconstruction/MET/METUtilities/METUtilities/METHelpers.h
+++ b/Reconstruction/MET/METUtilities/METUtilities/METHelpers.h
@@ -14,7 +14,7 @@
 
 // Framework includes
 #include "AsgMessaging/MessageCheck.h"
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 
 #include "xAODMuon/MuonContainer.h"
 #include "xAODJet/JetContainer.h"
diff --git a/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h b/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h
index fdf0ca11123..cc63113ee2a 100644
--- a/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h
+++ b/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h
@@ -6,7 +6,7 @@
 #define TAURECTOOLS_BDTHELPER_H
 
 #include "AsgTools/AsgMessaging.h"
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 #include "xAODTau/TauJet.h"
 #include "MVAUtils/BDT.h"
 
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/IDecisionUnpacker.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/IDecisionUnpacker.h
index 8d1ce94bc48..6c7c6236c79 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/IDecisionUnpacker.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/IDecisionUnpacker.h
@@ -8,7 +8,7 @@
 #ifndef TRIG_IDECISIONUNPACKER_H
 #define TRIG_IDECISIONUNPACKER_H
 
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 #include <map>
 #include <unordered_map>
 #include <string>
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionToolCore.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionToolCore.h
index 1bc0d47cd52..da39c2e27b3 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionToolCore.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionToolCore.h
@@ -19,7 +19,7 @@
  * @author Joerg Stelzer  <Joerg.Stelzer@cern.ch>  - DESY
  *
  ***********************************************************************************/
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 #include "TrigDecisionTool/ChainGroupFunctions.h"
 #include "TrigDecisionTool/Conditions.h"
 #include "TrigDecisionTool/ChainGroup.h"
diff --git a/Trigger/TrigConfiguration/TrigConfxAOD/TrigConfxAOD/tools/prepareTriggerMenu.h b/Trigger/TrigConfiguration/TrigConfxAOD/TrigConfxAOD/tools/prepareTriggerMenu.h
index 0fd9b412925..08453573b75 100644
--- a/Trigger/TrigConfiguration/TrigConfxAOD/TrigConfxAOD/tools/prepareTriggerMenu.h
+++ b/Trigger/TrigConfiguration/TrigConfxAOD/TrigConfxAOD/tools/prepareTriggerMenu.h
@@ -9,7 +9,7 @@
 #define TRIGCONFXAOD_TOOLS_PREPARETRIGGERMENU_H
 
 // Infrastructure include(s):
-#include "AsgTools/StatusCode.h"
+#include "AsgMessaging/StatusCode.h"
 
 // xAOD include(s):
 #include "xAODTrigger/TriggerMenu.h"
-- 
GitLab