diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessaging.h b/Control/AthToolSupport/AsgTools/AsgTools/AsgMessaging.h
deleted file mode 100644
index cf6f1a5d6708d9dfbe43151ddec9edabbcc6db04..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessaging.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_AsgMessaging_h
-#define FILE_AsgTools_AsgMessaging_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/AsgMessaging.h>
-#include <AsgTools/IAsgTool.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessagingForward.h b/Control/AthToolSupport/AsgTools/AsgTools/AsgMessagingForward.h
deleted file mode 100644
index 9cbd12a981e13aa5bdcc85f486ce499462bd0c95..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessagingForward.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_AsgMessagingForward_h
-#define FILE_AsgTools_AsgMessagingForward_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/AsgMessagingForward.h>
-
-#endif
diff --git a/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h b/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h
index 7dc22e302c4cf6c3290be79ba1b1fcb2e3fb483d..531b06679ecdaba08e308537c8d5f90fdf895913 100644
--- a/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h
+++ b/InnerDetector/InDetRecTools/InDetSecVtxTrackSelectionTool/Root/InDetSecVtxTrackAccessor.h
@@ -10,7 +10,7 @@
 #define INDETSECVTXTRACKSELECTIONTOOL_INDETTRACKACCESSOR_H
 
 #include "AsgMessaging/StatusCode.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include "xAODTracking/TrackingPrimitives.h"
 #include "xAODTracking/TrackParticle.h"
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.cxx
index 30f3751afefa87ebc3455db20081898d360cd0c4..bac83c331e9aa9e202278ad42b44f06cba6df7d1 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.cxx
@@ -10,6 +10,7 @@
 #include "InDetTrackAccessor.h"
 #include "InDetTrackSelectionTool/InDetTrackSelectionTool.h"
 
+#include "AsgTools/IAsgTool.h"
 #include "xAODTracking/TrackParticle.h"
 #include "xAODTracking/Vertex.h"
 #ifndef XAOD_ANALYSIS
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h
index 86c3b9b7e5e8ccee85dd63f12bf4193cec7abc81..f7891ef01b044c40af86917c6bda1db1d2d1236b 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackAccessor.h
@@ -11,7 +11,8 @@
 #define INDETTRACKSELECTIONTOOL_INDETTRACKACCESSOR_H
 
 #include "AsgMessaging/StatusCode.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgTools/IAsgTool.h"
 #include "xAODTracking/TrackingPrimitives.h"
 #include "xAODTracking/TrackParticle.h"
 #include "xAODTracking/Vertex.h"
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/AsgxAODNTupleMakerAlg.h b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/AsgxAODNTupleMakerAlg.h
index 50df447893fa03b765a021bac14a4d08ee35fba9..64a4f28a794b1e6f672bd0bf44dcbbac32eaca80 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/AsgxAODNTupleMakerAlg.h
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/AsgxAODNTupleMakerAlg.h
@@ -13,7 +13,7 @@
 #include <list>
 
 // Framework include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "AnaAlgorithm/AnaAlgorithm.h"
 #include "SystematicsHandles/SysListHandle.h"
 
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/TreeFillerAlg.h b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/TreeFillerAlg.h
index d845bedb3bf74b782b01b4e77b790ade1ddf70b6..366a5d6ac13f8320b0abb83fdd0f117791bf5cdb 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/TreeFillerAlg.h
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/AsgAnalysisAlgorithms/TreeFillerAlg.h
@@ -13,7 +13,7 @@
 #include <list>
 
 // Framework include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "AnaAlgorithm/AnaAlgorithm.h"
 #include "SystematicsHandles/SysListHandle.h"
 
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.h
index 7f7e5f62705e922410d366cb6ead68fe31ecf60b..eff0a36901e6602ffecb29e1b5353ff2afea8fc5 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.h
@@ -9,7 +9,7 @@
 #define SYSTEMATICS_HANDLES__SYS_COPY_HANDLE_H
 
 #include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
 #include <PATInterfaces/SystematicSet.h>
 #include <SystematicsHandles/ISysHandleBase.h>
 #include <string>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.h
index 5c736c3aaf41a9b2b2f690b12a0d018aede58a77..df90f77764a198ffdb5fd54eccd9c4bbef3987d2 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.h
@@ -9,7 +9,7 @@
 #define SYSTEMATICS_HANDLES__SYS_DECORATION_HANDLE_H
 
 #include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
 #include <AthContainers/AuxElement.h>
 #include <PATInterfaces/SystematicSet.h>
 #include <SystematicsHandles/ISysHandleBase.h>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h
index 53ec9d7a325a7c329637ad0b715b528836274d7a..37e1a352225dc7642b529f0b04565090d5ad4b8e 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysListHandle.h
@@ -9,7 +9,7 @@
 #define SYSTEMATICS_HANDLES__SYS_LIST_HANDLE_H
 
 #include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
 #include <PATInterfaces/SystematicSet.h>
 #include <SystematicsHandles/SysListType.h>
 #include <functional>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.h
index ae7c304c77fea2f4a96e6b83e282b833a198a1e1..6ed8323bac197f842035fff054d123e6e6e60d25 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.h
@@ -9,7 +9,7 @@
 #define SYSTEMATICS_HANDLES__SYS_READ_HANDLE_H
 
 #include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
 #include <PATInterfaces/SystematicSet.h>
 #include <SystematicsHandles/ISysHandleBase.h>
 #include <string>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.h
index 614541e0cf96dd3da47b3a790266be34487c7985..2d6c23ac32cbccf91d12dd9e567c813a0b9cefc6 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.h
@@ -9,7 +9,7 @@
 #define SYSTEMATICS_HANDLES__SYS_READ_HANDLE_ARRAY_H
 
 #include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
 #include <PATInterfaces/SystematicSet.h>
 #include <SystematicsHandles/ISysHandleBase.h>
 #include <boost/functional/hash.hpp>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.h
index 81d7a20202b29a3f51388592f83c0efd301e94df..ce28b3dc8ca2feaaada23174cd9a12ac30d62055 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.h
@@ -9,7 +9,7 @@
 #define SYSTEMATICS_HANDLES__SYS_WRITE_HANDLE_H
 
 #include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/AsgMessagingForward.h>
+#include <AsgMessaging/AsgMessagingForward.h>
 #include <PATInterfaces/SystematicSet.h>
 #include <SystematicsHandles/ISysHandleBase.h>
 #include <memory>
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h
index e174c3254514163cb7a45359ba5ca6ed8dec148b..447c0c31892d14a80f94b2c947f5cca76b588914 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/MuJetGhostDRMatcher.h
@@ -9,7 +9,7 @@
 #include <memory>
 
 // Infrastructure includes
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 // Local includes
 #include "AssociationUtils/IObjectAssociator.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h
index f3bad7e5d13a27ffd1e660cbf9cce2b2f2b08ee4..a97b6c6cf66024c59d48290a1d701b64cd37ba51 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/AssociationUtils/ToolBox.h
@@ -6,7 +6,7 @@
 #define ASSOCIATIONUTILS_TOOLBOX_H
 
 // Framework includes
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "AsgTools/AnaToolHandle.h"
 
 // Local includes
diff --git a/PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/Root/PhotonHelpers.cxx b/PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/Root/PhotonHelpers.cxx
index b2dc23c91721b918fd9ff42a407638946aee4b9e..099e380af8bac7f4b6b04d6dd7aa3bb58049e65f 100644
--- a/PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/Root/PhotonHelpers.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/EgammaAnalysisHelpers/Root/PhotonHelpers.cxx
@@ -6,7 +6,7 @@
 #include "xAODEgamma/Photon.h"
 #include "xAODCaloEvent/CaloCluster.h"
 #include "xAODEgamma/EgammaxAODHelpers.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 // ==================================================================
 bool PhotonHelpers::passOQquality(const xAOD::Photon *ph){
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/TElectronEfficiencyCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/TElectronEfficiencyCorrectionTool.h
index d24ab74ecbc9b32f583045d737ecb6e37e376555..8fe95146257f60a0ba921df354c3bb65fe499891 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/TElectronEfficiencyCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/TElectronEfficiencyCorrectionTool.h
@@ -31,7 +31,7 @@ class TH2;
 #include "TObjArray.h"
 // Core includes
 #include "PATCore/PATCoreEnums.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 namespace Root {
 class TElectronEfficiencyCorrectionTool : public asg::AsgMessaging
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx
index 0022cd08130e7249eda5e119a8e775d1a4da8da1..48888242fb22163e1d58e2bf67e559acab77ffba 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx
@@ -16,7 +16,7 @@ http://valgrind.org/docs/manual/faq.html#faq.deflost
 #include <string>
 #include <vector>
 #include "EgammaAnalysisInterfaces/IAsgElectronEfficiencyCorrectionTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "AsgTools/AnaToolHandle.h"
 #ifdef XAOD_STANDALONE
 // xAOD include(s):
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/Messaging.h b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/Messaging.h
index 536fde840aa1aaf93b76b4beebfee8c213fd4928..a53260c4aff65582699516d43efadb62a2dbbbf9 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/Messaging.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/Messaging.h
@@ -4,7 +4,7 @@
 
 #ifndef __ELECTRONEFFICIENCYCORRECTIONMESSAGING__
 #define __ELECTRONEFFICIENCYCORRECTIONMESSAGING__
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 namespace MSGHELPERS{
     const asg::AsgMessaging& getMsgStream();
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx
index daf62201577d1e64a50b9e4ea5fc3c2cfeedfa51..ef3b700e6f97773ef9b22cdba7a4eb7cd21d5bdc 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx
@@ -27,7 +27,7 @@
 #include "xAODCore/ShallowCopy.h"
 
 //Asg includes
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "PATCore/AcceptData.h"
 #include "PATInterfaces/SystematicsUtil.h"
 
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h
index 9e3818e3435496420a255ce53b032ee44d1aa86a..9be0c21f18002ec2bea751c1d2688bcc9043ce9d 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h
@@ -16,7 +16,7 @@
 #include "EgammaAnalysisInterfaces/IEgammaCalibrationAndSmearingTool.h"
 #include "AsgTools/AsgTool.h"
 #include "AsgTools/AsgMetadataTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "PATInterfaces/ISystematicsTool.h"
 #include "PATInterfaces/SystematicSet.h"
 #include "xAODEgamma/Electron.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaFactory.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaFactory.h
index f8ff2c91bf3727180e47f7f6d3a4b9ed54cfb46b..250038eb298b0a79513eec0b8f6c5b84a9c0f186 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaFactory.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaFactory.h
@@ -15,7 +15,7 @@
 #include <array>
 #include <memory>
 
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
 #include <xAODRootAccess/TEvent.h>
 #include <xAODRootAccess/TStore.h>
 #include <xAODEgamma/Electron.h>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/GainUncertainty.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/GainUncertainty.h
index ae355993f4e129dbc4cbf09a8775d5b1217a7267..4dd53f2ec5adbe8a587a10a7304b44948efd9629 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/GainUncertainty.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/GainUncertainty.h
@@ -5,7 +5,7 @@
 #ifndef ELECTRONPHOTONFOURMOMENTUMCORRECTION_GAINUNCERTAINTYY_H
 #define ELECTRONPHOTONFOURMOMENTUMCORRECTION_GAINUNCERTAINTYY_H
 
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
 #include <PATCore/PATCoreEnums.h>
 #include <memory>
 #include <string>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/LArTemperatureCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/LArTemperatureCorrectionTool.h
index 928f8d91fb1602e7efb0cef108aa9957b709e25e..adea579b920e4ea3aa22beba42108ac357dc9dbe 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/LArTemperatureCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/LArTemperatureCorrectionTool.h
@@ -26,7 +26,7 @@
 #include <map>
 #include <memory>
 
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
 
 #include <TFile.h>
 #include <TTree.h>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/egammaEnergyCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/egammaEnergyCorrectionTool.h
index e3c6401512f16c5022bac88d4f29c8eeb2fa6183..7abd7c637fccdf897cd6dc98ecf4b2315fcfbe3e 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/egammaEnergyCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/egammaEnergyCorrectionTool.h
@@ -25,7 +25,7 @@
 
 // PAT includes
 #include "PATCore/PATCoreEnums.h"
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
 
 
 // ROOT includes
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/get_MaterialResolutionEffect.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/get_MaterialResolutionEffect.h
index e0b56da73c7fe628c619257fd15d1c83cf2827dd..9991efa21dacab3f044bfe66e0c3b9ca3ad613d2 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/get_MaterialResolutionEffect.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/get_MaterialResolutionEffect.h
@@ -8,7 +8,7 @@
 #include <math.h>
 #include <memory>
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include "TH1.h"
 #include "TH2D.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronPhotonIsEMSelectorConfigHelper.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronPhotonIsEMSelectorConfigHelper.cxx
index 21313bfdb626957b97d2503f4d14c54db88bd9b4..a0f88eb024100e42e0f771acc4ba092275f8ace9 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronPhotonIsEMSelectorConfigHelper.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronPhotonIsEMSelectorConfigHelper.cxx
@@ -4,7 +4,7 @@
 
 #include "AsgElectronPhotonIsEMSelectorConfigHelper.h"
 #include "ElectronPhotonSelectorTools/egammaPIDdefs.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "TEnv.h"
 #include <iostream>
 #include <sstream>   
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/ElectronSelectorHelpers.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/ElectronSelectorHelpers.cxx
index 50b7483a74e44f5e1b83fea39482ca57253bdc3d..133edf56e0fc37d923654300618e4a67a2fa76ce 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/ElectronSelectorHelpers.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/ElectronSelectorHelpers.cxx
@@ -6,7 +6,7 @@
 #include "xAODEgamma/Electron.h"
 #include "xAODTracking/TrackParticle.h"
 #include "xAODTracking/TrackParticleContainer.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 // ==================================================================
 std::size_t ElectronSelectorHelpers::numberOfPixelHitsAndDeadSensors(const xAOD::TrackParticle *tp){
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.h
index eeb4de30338178c1ecb46ebcbee7f46f3b7cc723..e4711ac0b7940321f2562b01c79a45105e04c3ed 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronIsEMSelector.h
@@ -21,7 +21,8 @@
 #include "PATCore/AcceptInfo.h"
 #include "PATCore/AcceptData.h"
 #include "ElectronPhotonSelectorTools/egammaPIDdefs.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
 #include <vector>
 #include <string>
 
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
index f8b4137ab614ef94e3ef5213e233ded86ca833b9..cc7a6066388d2717a7336f185973b7921672d702 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
@@ -20,7 +20,8 @@ June 2011
 #define TELECTRONLIKELIHOODTOOL_H
 
 // Include the return objects and the base class
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgTools/IAsgTool.h"
 #include "PATCore/AcceptData.h"
 #include "PATCore/AcceptInfo.h"
 //
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
index 1ee2cb9f585c75953497a4d8069a16376f3b88fb..65ab7be7afc6ba6e205a11ecf7b9dcdd482fd37d 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TForwardElectronIsEMSelector.h
@@ -20,7 +20,8 @@
 // ROOT includes
 // Include the return object and the base class
 #include "ElectronPhotonSelectorTools/egammaPIDdefs.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
 #include "PATCore/AcceptInfo.h"
 #include "PATCore/AcceptData.h"
 #include <vector>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TPhotonIsEMSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TPhotonIsEMSelector.h
index a598d76e450b50e6888f72c33f14c264b11bc568..e00cdebbf343cf562ff902f7a711b8907acc5c97 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TPhotonIsEMSelector.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TPhotonIsEMSelector.h
@@ -26,7 +26,8 @@
 #include "PATCore/AcceptInfo.h"
 #include "PATCore/AcceptData.h"
 #include "ElectronPhotonSelectorTools/egammaPIDdefs.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
 
 #include <vector>
 #include <string>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGChargeIDSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGChargeIDSelector.cxx
index ba1c723f13e55eea20c7f377374e8229716e7174..8e279eb9418b379407f696590df4b315536fb824 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGChargeIDSelector.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGChargeIDSelector.cxx
@@ -22,7 +22,7 @@
 #include "ElectronPhotonSelectorTools/AsgElectronIsEMSelector.h"
 #include "ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h"
 #include "ElectronPhotonSelectorTools/AsgElectronChargeIDSelectorTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 // Derivation include
 #include "xAODCore/tools/IOStats.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h
index e066ad1b6ad563ef1d0238342aa41d9446693509..069c8e49a048c94e73a70edb3f51a13f00380297 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrection.h
@@ -6,7 +6,7 @@
 #define ISOLATIONCORRECTION_ISOLATIONCORRECTION_H
 
 #include "AsgTools/AsgTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "TGraph.h"
 #include "TObject.h"
 #include "TF1.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h
index 97db502c9e028ac908b9b402794e4c115d9d2a6f..717d48646fc355b46b243b2e819c70a361473d2c 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/IsolationCorrections/IsolationCorrectionTool.h
@@ -7,7 +7,7 @@
 
 #include "AsgTools/AsgTool.h"
 #include "AsgTools/AsgMetadataTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "IsolationCorrections/IIsolationCorrectionTool.h"
 #include "IsolationCorrections/IsolationCorrection.h"
 
diff --git a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVACalib.h b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVACalib.h
index 12a56cc6829855903bdacba94b1f5a5c1c25fb1a..f74249559a6549ac8711f544de37a90cee0b781a 100644
--- a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVACalib.h
+++ b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVACalib.h
@@ -14,7 +14,7 @@
 #include <TString.h>
 #include <TObject.h>
 #include <TFile.h>
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 class TTreeFormula;
 class TList;
diff --git a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVATree.h b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVATree.h
index 2723ea295ea4159b1d855c6d9c3546a1e5ad56a5..feba6d672a1d67f346ccc701320ea674048a0b8f 100644
--- a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVATree.h
+++ b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/egammaMVACalibAnalysis/egammaMVATree.h
@@ -25,7 +25,7 @@
 #include <TTree.h>
 #include <TLorentzVector.h>
 
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
 
 #include "egammaMVACalib/egammaMVALayerDepth.h"
 #include "egammaMVACalib/egammaMVAFunctions.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx
index 683cbbae93d8dec11cb741fa8f7c911c10db35dd..863b786a29db591015c05aec3d7894a06617fb59 100644
--- a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx
@@ -27,7 +27,7 @@
 #include "xAODCore/AuxContainerBase.h"
 
 #include "egammaMVACalibAnalysis/egammaMVATool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 // Infrastructure include(s):
 #ifdef ROOTCORE
diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/EventCleaningTool.cxx b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/EventCleaningTool.cxx
index 5e7cdad30b0a6ed6f401643f86549bbf49a3ce08..679ad8518d90b33fb04c4cd271d5947c7b8fc41d 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/EventCleaningTool.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/EventCleaningTool.cxx
@@ -21,7 +21,7 @@ Description: Class for selecting events that pass recommended jet cleaning proce
 #include "xAODEventInfo/EventInfo.h"
 
 // xAOD/ASG includes
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 // STL includes
 #include <iostream>
diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/JetCleaningTool.cxx b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/JetCleaningTool.cxx
index b67461f54688c64a8b51282fd5716ac94bd9aa8c..1824091d138dc118a1327ca7f832fee3aaefe5ad 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/JetCleaningTool.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/Root/JetCleaningTool.cxx
@@ -16,7 +16,7 @@ Description: Class for selecting jets that pass some cleaning cuts
 #include "JetSelectorTools/Helpers.h"
 
 // xAOD/ASG includes
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 // STL includes
 #include <iostream>
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/ConfigHelper.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/ConfigHelper.h
index f62e05744d34a9f068fcde56751036451eef145a..6796dc875bc9f645515ba443986cb63f8dad89a4 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/ConfigHelper.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/ConfigHelper.h
@@ -7,7 +7,8 @@
 
 #include "JetUncertainties/UncertaintyEnum.h"
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
 
 #include "TString.h"
 class TEnv;
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/CorrelationMatrix.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/CorrelationMatrix.h
index 1d8e62e488ca495524dc07a38fbd3c71ba1fc42a..963e89bcf76a84a914e9bfac4dc90e60186d2ef4 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/CorrelationMatrix.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/CorrelationMatrix.h
@@ -5,7 +5,7 @@
 #ifndef JETUNCERTAINTIES_CORRELATIONMATRIX_H
 #define JETUNCERTAINTIES_CORRELATIONMATRIX_H
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "JetUncertainties/JetUncertaintiesTool.h"
 
 #include "xAODJet/Jet.h"
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyComponent.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyComponent.h
index cb409649b31a55f8e115a0edff06612564dba580..d2b63963b4845331ffbd63ef6ba34f81021c2369 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyComponent.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyComponent.h
@@ -12,7 +12,7 @@
 #include "xAODJet/Jet.h"
 #include "xAODEventInfo/EventInfo.h"
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include "TString.h"
 
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyGroup.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyGroup.h
index 691379a9141654b401bce7ee0c63cb15d1707970..aeaa5ea3f869001d19bcb9affe0b44bbf9fb6e3d 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyGroup.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyGroup.h
@@ -12,7 +12,7 @@
 #include "xAODJet/Jet.h"
 #include "xAODEventInfo/EventInfo.h"
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include "TString.h"
 
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyHistogram.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyHistogram.h
index 513e88073ebd2c32c40380fa59d68b61505201ce..33afa2969a190a9127f1999c729f03763bb3c720 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyHistogram.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyHistogram.h
@@ -5,7 +5,8 @@
 #ifndef JETUNCERTAINTIES_UNCERTAINTYHISTOGRAM_H
 #define JETUNCERTAINTIES_UNCERTAINTYHISTOGRAM_H
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgMessaging/StatusCode.h"
 
 #include "TString.h"
 #include "TH1.h"
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintySet.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintySet.h
index cc8b53f49e1d538f5a5cfe2936b71f0e56ccdead..172cba68143abd096aca1e548be835a2c9e357dc 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintySet.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintySet.h
@@ -11,7 +11,8 @@
 #include "xAODEventInfo/EventInfo.h"
 
 #include "PATInterfaces/SystematicSet.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
+#include "AsgTools/IAsgTool.h"
 
 #include <string>
 #include <vector>
diff --git a/Reconstruction/Jet/JetUncertainties/util/OptionHelper.h b/Reconstruction/Jet/JetUncertainties/util/OptionHelper.h
index 7f6a0c0cb2da5107eeaee69b944f22c426fd9d30..c415a417180043806acb195d0b9a5fc71abf20c7 100644
--- a/Reconstruction/Jet/JetUncertainties/util/OptionHelper.h
+++ b/Reconstruction/Jet/JetUncertainties/util/OptionHelper.h
@@ -5,7 +5,7 @@
 #ifndef JETUNCERTAINTIES_OPTIONHELPER_H
 #define JETUNCERTAINTIES_OPTIONHELPER_H
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include <vector>
 #include <utility>
 #include "TString.h"
diff --git a/Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/HelperFunctions.h b/Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/HelperFunctions.h
index 834be475c3db086271e863fa1a63eb7fb93ddef2..85edf36a9dcd758ad8c97ce5e52ce39baad3dbb1 100644
--- a/Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/HelperFunctions.h
+++ b/Reconstruction/PanTau/PanTauAlgs/PanTauAlgs/HelperFunctions.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <iostream>
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "AsgTools/ToolHandle.h"
 
 #include "xAODTau/TauJet.h"
diff --git a/Reconstruction/egamma/egammaLayerRecalibTool/egammaLayerRecalibTool/egammaLayerRecalibTool.h b/Reconstruction/egamma/egammaLayerRecalibTool/egammaLayerRecalibTool/egammaLayerRecalibTool.h
index 7ce654111324675bd2aab160cacababf4c4624f4..5f8b1338290510388fb5ed3d3a07f6689c39adb3 100644
--- a/Reconstruction/egamma/egammaLayerRecalibTool/egammaLayerRecalibTool/egammaLayerRecalibTool.h
+++ b/Reconstruction/egamma/egammaLayerRecalibTool/egammaLayerRecalibTool/egammaLayerRecalibTool.h
@@ -26,7 +26,7 @@
 #include <memory>
 
 #include "AsgTools/AsgTool.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "xAODEgamma/Egamma.h"
 #include "xAODCaloEvent/CaloCluster.h"
 #include "xAODEventInfo/EventInfo.h"
diff --git a/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h b/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h
index 900f75b92f18b277dba65537a83411f452f1ac4f..754e4858141ce3885a910a4bf1e8297532d63388 100644
--- a/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h
+++ b/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h
@@ -14,7 +14,7 @@
 #include "egammaMVALayerDepth.h"
 
 // for the ConversionHelper (deprecated?)
-#include <AsgTools/AsgMessaging.h>
+#include <AsgMessaging/AsgMessaging.h>
 
 #include "TLorentzVector.h"
 
diff --git a/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h b/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h
index cc63113ee2aa77dce99498064b64749309f5e83a..73dfa99f46666b1183e59396ec38111620efc10c 100644
--- a/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h
+++ b/Reconstruction/tauRecTools/tauRecTools/BDTHelper.h
@@ -5,7 +5,7 @@
 #ifndef TAURECTOOLS_BDTHELPER_H
 #define TAURECTOOLS_BDTHELPER_H
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "AsgMessaging/StatusCode.h"
 #include "xAODTau/TauJet.h"
 #include "MVAUtils/BDT.h"
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauJetRNN.h b/Reconstruction/tauRecTools/tauRecTools/TauJetRNN.h
index 53842ed3d0f34e7a9bf928edaaacf56ad04e07f0..6db5ee4a8cc2dae37ff19895d03244a02bad0c91 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauJetRNN.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauJetRNN.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include "xAODTau/TauJet.h"
 
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h b/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h
index 1b5b3665864c0a24705c8aa448a3030d6100acc7..f53752499a62b0af53fbe6fb975fb8a0749940b3 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauJetRNNUtils.h
@@ -7,7 +7,7 @@
 
 #include <unordered_map>
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include "xAODTau/TauJet.h"
 
diff --git a/Tools/PathResolver/PathResolver/PathResolver.h b/Tools/PathResolver/PathResolver/PathResolver.h
index 7989bcc0bb6021e004b034d4f4a23930f0d411da..dd9c3980fff053673747be05deea240070be4ecc 100644
--- a/Tools/PathResolver/PathResolver/PathResolver.h
+++ b/Tools/PathResolver/PathResolver/PathResolver.h
@@ -5,7 +5,7 @@
 #ifndef PATHRESOLVER_PATHRESOLVER_H
 #define PATHRESOLVER_PATHRESOLVER_H
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include <string>
 #include <atomic>
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossing.cxx b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossing.cxx
index a6c1d244cadcb833d435ebfc6f6762aa3a0ff43b..fef29e726b27388fe3927cb66d2677f84290a2e3 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossing.cxx
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchCrossing.cxx
@@ -8,7 +8,7 @@
 #include <iostream>
 
 // Gaudi/Athena include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 // Local include(s):
 #include "TrigBunchCrossingTool/BunchCrossing.h"
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchTrain.cxx b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchTrain.cxx
index 30efce35947cec41fb43a02714c0af666f16c966..784aa36732353990f3d5a8ef74ceed5acdf32f0f 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchTrain.cxx
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/Root/BunchTrain.cxx
@@ -9,7 +9,7 @@
 #include <iostream>
 
 // Gaudi/Athena include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 // Local include(s):
 #include "TrigBunchCrossingTool/BunchTrain.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h
index cca01aa534ee0a794d64371dc3ea7ba36519314f..6722804588566321a4c4cc300f4db7075d0754d2 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/CacheGlobalMemory.h
@@ -35,7 +35,7 @@
 
 #include "TrigDecisionTool/IDecisionUnpacker.h"
 #include "TrigDecisionTool/Logger.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include "AsgDataHandles/ReadHandleKey.h"
 
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h
index 97e8c0946e40f56feec922218335459bd059cdd1..11d0c99a25edf005b1b5865b74cd00024dbed31d 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h
@@ -19,7 +19,7 @@
 #include "TrigDecisionTool/DecisionObjectHandle.h"
 #include "TrigDecisionTool/EventPtrDef.h"
 #include "TrigDecisionEvent/TrigDecision.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include "StoreGate/ReadHandleKey.h"
 
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h
index 78558a853108bffa8ac4ca1538af62965c7dcd52..276a25d11d8ca53b8c13dea8fe7c629256d48e5a 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h
@@ -18,7 +18,7 @@
 #include "TrigDecisionTool/Logger.h"
 #include "TrigDecisionTool/DecisionObjectHandle.h"
 #include "EventInfo/EventInfo.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include "StoreGate/ReadHandleKey.h"
 
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h
index 09b72d0f6904028d9cfa661307ec2e27ff0110a8..2b8ca014591cc96a0872d82b857dc415877e60ae 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h
@@ -12,7 +12,7 @@
 #include <string>
 
 // ASG include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 // xAOD include(s):
 #include "xAODTrigger/TrigDecision.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerAthena.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerAthena.h
index bf9e0054424b2d22628d0e31b8387b8e6dc6a4e1..84880279c5c1b142eaf6703ac2f9769fe009b5b9 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerAthena.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerAthena.h
@@ -12,7 +12,7 @@
 
 #include "TrigDecisionTool/IDecisionUnpacker.h"
 #include "TrigDecisionTool/Logger.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include "AsgDataHandles/ReadHandleKey.h"
 
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerEventInfo.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerEventInfo.h
index 33eccfd95d313b3c55034de38033eed97d8d591b..eb93a78d9ac907b597a1c6a086aba8d7fefc8c4d 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerEventInfo.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerEventInfo.h
@@ -11,7 +11,7 @@
 
 
 #include "TrigDecisionTool/IDecisionUnpacker.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 #include "DecisionObjectHandleEventInfo.h"
 
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h
index 08f816388597458fd16ae2bb2a219a54e8873219..19f8a4c51da2cd910cee279a3a18536ea5dcf6bc 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h
@@ -9,7 +9,7 @@
 #define TRIGDECISIONTOOL_DECISIONUNPACKERSTANDALONE_H
 
 // ASG include(s):
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 // Trigger configuration include(s):
 #include "TrigConfHLTData/HLTChain.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h
index 9f80cf80987c71372fca7d9c550dc0dae10186ab..d293be661e2064c255d0958891d4b507cfbe82c4 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h
@@ -19,7 +19,7 @@
 #include <string>
 
 #ifdef XAOD_STANDALONE
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #endif
 #ifndef XAOD_STANDALONE
 #include "AthenaKernel/getMessageSvc.h"
diff --git a/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MinimalSumAssociation.h b/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MinimalSumAssociation.h
index 5ca655b13d0b8594018e6bfe697bf315f1a19261..2df9acf2b86d2125bcd7bc879d703168a74c7027 100644
--- a/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MinimalSumAssociation.h
+++ b/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MinimalSumAssociation.h
@@ -8,7 +8,7 @@
 #define TRIGGERMATCHINGTOOL_MINIMALSUMASSOCIATION_H
 
 #include "TriggerMatchingTool/IAssociationStrategy.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 
 class MinimalSumAssociation : public IAssociationStrategy, public asg::AsgMessaging {
diff --git a/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingImplementation.h b/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingImplementation.h
index bc46c415a6306ac54b8a7fd21a782c045168fbbd..fc68b7d60a8067ce3f51c6356fb1d26ffe762769 100644
--- a/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingImplementation.h
+++ b/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingImplementation.h
@@ -12,7 +12,7 @@
 
 #include "TriggerMatchingTool/MatchingTool.h"
 #include "TriggerMatchingTool/IAssociationStrategy.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 namespace Trig {
 
diff --git a/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TrigHolderStructure.h b/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TrigHolderStructure.h
index 7ee305780887d3791d714dc807583b30996c6d32..21a924368336b10c5a17c88fe21cca6d9db50428 100644
--- a/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TrigHolderStructure.h
+++ b/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TrigHolderStructure.h
@@ -12,7 +12,7 @@
 
 #include <boost/variant.hpp>
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "TrigNavStructure/Types.h"
 #include "TrigNavStructure/BaseHolder.h"
 #include "TrigNavStructure/TriggerElement.h"
diff --git a/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h b/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h
index f4acb15c1930e1c482fe2b1144c1380beecc4c6e..1632aba5c76613e2cf328d1185a4eee526b8d21a 100644
--- a/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h
+++ b/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h
@@ -30,7 +30,7 @@ typedef asg::SgTEvent* EventPtr;
 typedef StoreGateSvc* EventPtr;
 #endif //XAOD_STANDALONE
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 
 //forward declarations
diff --git a/Trigger/TrigEvent/TrigNavigation/TrigNavigation/FullHolderFactory.h b/Trigger/TrigEvent/TrigNavigation/TrigNavigation/FullHolderFactory.h
index e8552160379bdbe14277973d4eea50e88c4e037a..c4106400edc80859be1554f12ef48e3f122de96b 100644
--- a/Trigger/TrigEvent/TrigNavigation/TrigNavigation/FullHolderFactory.h
+++ b/Trigger/TrigEvent/TrigNavigation/TrigNavigation/FullHolderFactory.h
@@ -10,7 +10,7 @@
 #include <string>
 #include "TrigNavStructure/ITrigHolderFactory.h"
 #include "TrigNavStructure/BaseHolder.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include "GaudiKernel/ServiceHandle.h"
 
 class IConversionSvc;
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/RingerSelectorTool.h b/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/RingerSelectorTool.h
index 28dc97bff581c0c0c48b896f092bcb63179f7c36..e9b27b5cba31905774dfe7e259367bf7b5e76d5a 100644
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/RingerSelectorTool.h
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/RingerSelectorTool.h
@@ -20,7 +20,7 @@
 #include "TrigMultiVarHypo/tools/procedures/Norm1.h"
 
 #include "AthenaMonitoringKernel/MonitoredTimer.h"
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 #include <memory>
 #include <string>
 
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/common/RingerReader.h b/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/common/RingerReader.h
index a8aacc1500a7982114d26ba5579b262e8ccd1d56..d936779394e17c3befd7b37030a64f57c2af584f 100644
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/common/RingerReader.h
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/TrigMultiVarHypo/tools/common/RingerReader.h
@@ -20,7 +20,7 @@
 #include <memory>
 
 
-#include "AsgTools/AsgMessaging.h"
+#include "AsgMessaging/AsgMessaging.h"
 
 namespace Ringer{