diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgComponent.icc b/Control/AthToolSupport/AsgTools/AsgTools/AsgComponent.icc
index cc3f11022101af51a7c5ba76c9a23982a72a56c9..77cda10fb7ca7a5c9a67501d8772d2a1abd1dbe9 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 677f7145e82295ed54c8a1fd88eb49c17e415f38..0000000000000000000000000000000000000000
--- 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 a3b3397bbd884b629098d5c84505103a2273a5d0..7dc22e302c4cf6c3290be79ba1b1fcb2e3fb483d 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 c8f62399b85a327253ed5c818e82ffde8e65f34c..86c3b9b7e5e8ccee85dd63f12bf4193cec7abc81 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 d3c2ecb7743795111968eef1b2b09428a45d6407..3c926e8d439ecdb895a747549ac6afcb928adbf2 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 094f7e262b8a61cb550a77dc654a42515ae8ba88..cc240e15ba9991f5ca9d07406fc3f7f57741464c 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 a7ef6f31fbaada8deb9e0cea9a9f2525589cfe75..805032cd80bca88b0aaecda13923a420c0cf68f3 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 51e2d03b776e6749ada80d858a6597a8d13eb018..060281362576337099247b963a1eccfc2ec7552e 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 159109a217c57310e2b27b39add39b1d0cf6a77c..3e1bc1dff0e60908c4666a1748e6fe603b489cea 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 8240db430772482a50491ac78353cc220dc4838c..29d8179f726cf438061520e18b3901e011bb11c3 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 48bcb799f3923fa0ea88c39f9acf9b03f6d9ac89..c0acdbff906f0a8acca417ae087e6bcaa1f7f0ca 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 dc9e28744a695f48de3a825131c9149df944cfa5..86f59f5aed4ff25d4db05a4ca9c1daeaa7c88dc0 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 8b4676d0c3686d1657a10195a70c5b3a14c527c2..8ab1d17b0dcd70f043ccd9ba4f270238410ebfc2 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 890514a262ff131a56593aba156fcb5a0b561d3e..83b92609c7c74a87e05720d1483686b26f5f526f 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 b29235d471231c7bd3914a5484924b6a359bcf67..2105c76bfb6914713133caf5f52e89d795c0a655 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 38c9cc6da44a4e18163542e7dc711e8a25fb1530..c60c200183e5941c3c6fa3c618f1d9209a16dec4 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 10d782ab9a784332c1068f8964102e3e7cbed4c5..47ee245888bff28bc85b68778e1027e7bba0ead6 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 528a2d35999a2361bdd4e3a218804b52a64bb5b5..8e50845014325a6b3dd3fc90d288b3dba189cec2 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 f6f90279f83bf96179c5f504840361612a099156..94e0f318787d406d44de3d2563bb43fa621cc4c7 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 1c8e46b6863e6af4e8db66a28426b07718a9ed2e..43deeada99363e95fc42d1ca9e29c038c9d1905f 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 48e796f860082f22043d375e8f9a8f747a47f083..1d1b231102b1359f41d28c3fb3cd07df0e40197b 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 c476764c38d359337c2f0ede7a130fca13940905..f5fa5621d922df5594563960613221ef01efcc6a 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 0f65ca5cb118bbd900e10b027c2c7502739a8e1e..ca1f30aa8c2bc81b1884ce64bd68864c9c63b9b9 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 ad2326640be4c38f0364b82f886cfed350957cd4..7ebcaf77b94687ea6a5b06c0228a4e06e24ca65d 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 b794680c99c856fbe43c66cfba8dc2860752e4dc..d539774682cc6ba422790e4048ff1f261dbb6370 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 91a5eafb77b55cdba959bddca0b8059486582d10..984596c1ea002d0ac21b5617e9b97caa29f68168 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 b9051ca92c6cc6c8be1ac965fe072439ccc00637..cfb91757649b037e7a600cbfe7d1fbc3d9b41d1f 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 33cf2ade5e151d31faae7623116fb94a3e75a71d..6d5a721ca7a125a01937183656e6ad497cef7824 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 9afb0b6bd672699e030e833ff8329728e78e3dce..0df351060d7322078fd03c2c995b64255c4ceed3 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 4540f4f17197bb1ce35308289370fca2d87bdca0..7bb0fae28f433a3079fd3b67acbe78a4da8445b1 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 5543001b1b47bf060dd30cc7b1693f42002399bc..97d813735de27533c5957fde26d4c059380fe3d7 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 0131805b9781dc2baa92efeed850a1e08ac2f7aa..f8a03eb14289bb19b6010e078785a7c1e3b4d2a7 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 8e8f0cd5ad4be96e0f0bd4b03b73e539bef69b66..a0110a2c15f174872ecaaa9c7f7a0a9877b01932 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 05dc33a68142dc436dc50b5e885ed2b02d07459b..959526833ab01d7c757d02342944e031b311a63a 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 fc45f1c2489de70bd4c006ed89af2e1ba3168f27..f11446c397e52aba7760885d6ba51c32199fcbe4 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 4dd0903939323f6af33c1b9a021564e88f06fe99..84b9f18eac77278c67dc91da8a00cafa43d8210e 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 fdf0ca111238da1ec1060a3d5210fe73dce11618..cc63113ee2aa77dce99498064b64749309f5e83a 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 8d1ce94bc48e3e7286590184e510c73fa85f71c3..6c7c6236c79da932af4e8286cc38954e86f34c15 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 1bc0d47cd520a66f125580f846d7a15481514a98..da39c2e27b3862b5d1fb9d853703a74e7c633260 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 0fd9b4129252144982e124c1d831496c004dc7b4..08453573b75a0c47bae3dcd1ef3f0b63b65486ee 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"