diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h b/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
deleted file mode 100644
index a45a5acd86debe30d8d47fe5ab08c1708a877ab6..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_MessageCheck_h
-#define FILE_AsgTools_MessageCheck_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/MessageCheck.h>
-
-#endif
diff --git a/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx b/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
index 9ff58a0e8b3a2ff85e833aacec2c400b11d442a1..1687aae831eec9c369575bba743805c1f07f43e6 100644
--- a/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
@@ -22,7 +22,7 @@
 #include <regex>
 #else
 #include <GaudiKernel/AlgTool.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <GaudiKernel/IToolSvc.h>
 #include <GaudiKernel/IJobOptionsSvc.h>
 #endif
diff --git a/DataQuality/GoodRunsLists/Root/GRLSelectorAlg.cxx b/DataQuality/GoodRunsLists/Root/GRLSelectorAlg.cxx
index 635ba1dda33a143357fa658399b69b4718fa2291..35bc5c42a5593066ef77a45965da9b780271f302 100644
--- a/DataQuality/GoodRunsLists/Root/GRLSelectorAlg.cxx
+++ b/DataQuality/GoodRunsLists/Root/GRLSelectorAlg.cxx
@@ -5,7 +5,7 @@
 // GoodRunsLists includes
 #include <GoodRunsLists/GRLSelectorAlg.h>
 #include <AnaAlgorithm/FilterReporter.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include "xAODEventInfo/EventInfo.h"
 
 GRLSelectorAlg::GRLSelectorAlg( const std::string& name, ISvcLocator* pSvcLocator ) : AnaAlgorithm( name, pSvcLocator )
diff --git a/Event/EventBookkeeperTools/util/dump-cbk.cxx b/Event/EventBookkeeperTools/util/dump-cbk.cxx
index 37b02876dbec34b0d9534094c08b7e8a7a135eb4..45036386ec4c962616af7dd0140b1764ada323f5 100644
--- a/Event/EventBookkeeperTools/util/dump-cbk.cxx
+++ b/Event/EventBookkeeperTools/util/dump-cbk.cxx
@@ -12,7 +12,7 @@
 #include <xAODRootAccess/tools/TFileAccessTracer.h>
 
 // ASG
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTools/ToolHandle.h>
 #include <AsgTools/AsgMetadataTool.h>
 #include <AthAnalysisBaseComps/AthAnalysisHelper.h>
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/util/TrackVertexAssoValidator.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/util/TrackVertexAssoValidator.cxx
index b7e7ebf7557d7e81bf5dc1640e01974c00844bac..2ce4b611ac9b329d0c453449ddcc90c5f7af8060 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/util/TrackVertexAssoValidator.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/util/TrackVertexAssoValidator.cxx
@@ -22,7 +22,7 @@
 #   include "xAODRootAccess/tools/ReturnCheck.h"
 #endif
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 
 // EDM include(s):
 #include "xAODTracking/TrackParticle.h"
diff --git a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListLoaderAlg.cxx b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListLoaderAlg.cxx
index 068697fa1fb374f1216c17e5d169b00576b85d35..6fb2cc9e74091aa2b61c9f5edebaf22ad26066b0 100644
--- a/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListLoaderAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/Root/SysListLoaderAlg.cxx
@@ -13,7 +13,7 @@
 
 #include <AsgAnalysisAlgorithms/SysListLoaderAlg.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <PATInterfaces/MakeSystematicsVector.h>
 #include <PATInterfaces/SystematicRegistry.h>
 
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx
index 5eaa8d02501ee2db70daf6547c73d242fb604201..094f7e262b8a61cb550a77dc654a42515ae8ba88 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityEventHelper.cxx
@@ -11,7 +11,7 @@
 
 #include <SelectionHelpers/OutOfValidityEventHelper.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTools/StatusCode.h>
 #include <PATInterfaces/CorrectionCode.h>
 
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx
index 3069eb56eb09b4f6699369da3b29ef55f6a0de98..a7ef6f31fbaada8deb9e0cea9a9f2525589cfe75 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/OutOfValidityHelper.cxx
@@ -11,7 +11,7 @@
 
 #include <SelectionHelpers/OutOfValidityHelper.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTools/StatusCode.h>
 #include <PATInterfaces/CorrectionCode.h>
 
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx
index 80a95355b81966379d46615809db102d2ab4b282..51e2d03b776e6749ada80d858a6597a8d13eb018 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionReadHandle.cxx
@@ -11,7 +11,7 @@
 
 #include <SelectionHelpers/SelectionReadHandle.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTools/StatusCode.h>
 
 //
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionHelpers.h b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionHelpers.h
index 076dd2fcb7697a2117c1206e48bf15c5d42cd123..579ad0ec0013a5750f87de1d36bdbf0b2ce63ccb 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionHelpers.h
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionHelpers.h
@@ -8,7 +8,7 @@
 #ifndef SELECTION_HELPERS__SELECTION_HELPERS_H
 #define SELECTION_HELPERS__SELECTION_HELPERS_H
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <cstdint>
 
 namespace asg
diff --git a/PhysicsAnalysis/Algorithms/SelectionHelpers/test/gt_ISelectionAccessor.cxx b/PhysicsAnalysis/Algorithms/SelectionHelpers/test/gt_ISelectionAccessor.cxx
index 58b44391d3888f147cfae218c8ef6f5590f0e7b1..38b2b7c78a89ba53d4e3531485ad8f365ffa81f6 100644
--- a/PhysicsAnalysis/Algorithms/SelectionHelpers/test/gt_ISelectionAccessor.cxx
+++ b/PhysicsAnalysis/Algorithms/SelectionHelpers/test/gt_ISelectionAccessor.cxx
@@ -15,7 +15,7 @@
 #include <SelectionHelpers/SelectionAccessorBits.h>
 #include <SelectionHelpers/SelectionAccessorList.h>
 #include <SelectionHelpers/SelectionAccessorNull.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTesting/UnitTest.h>
 #include <xAODJet/Jet.h>
 #include <gtest/gtest.h>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx b/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx
index ccd200164bc7c0d63bc160d19b8689f570932a72..159109a217c57310e2b27b39add39b1d0cf6a77c 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/Root/SysListHandle.cxx
@@ -11,7 +11,7 @@
 
 #include <SystematicsHandles/SysListHandle.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTools/StatusCode.h>
 #include <PATInterfaces/SystematicSet.h>
 #include <SystematicsHandles/ISysHandleBase.h>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h
index c2eb45959410e9c270828132d1dc2da2ae38582f..8240db430772482a50491ac78353cc220dc4838c 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/CopyHelpers.h
@@ -9,7 +9,7 @@
 #define SYSTEMATICS_HANDLES__COPY_HELPERS_H
 
 #include <AnaAlgorithm/AnaAlgorithm.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTools/StatusCode.h>
 #include <xAODBase/IParticleContainer.h>
 #include <xAODBase/IParticleHelpers.h>
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.icc
index e41dd1c55ca1af023168ac5525cfddab231d3101..5abbda5cc25494343442188c8042cce9e7144587 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysCopyHandle.icc
@@ -9,7 +9,7 @@
 // includes
 //
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <SystematicsHandles/CopyHelpers.h>
 #include <SystematicsHandles/Helpers.h>
 
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc
index 13a59deed6ecdfac643b907c3b40cab0634437d8..48bcb799f3923fa0ea88c39f9acf9b03f6d9ac89 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysDecorationHandle.icc
@@ -9,7 +9,7 @@
 // includes
 //
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTools/StatusCode.h>
 #include <SystematicsHandles/Helpers.h>
 
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc
index 690580cc971379baad805984ccf345cc1a4970e9..dc9e28744a695f48de3a825131c9149df944cfa5 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandle.icc
@@ -9,7 +9,7 @@
 // includes
 //
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTools/StatusCode.h>
 #include <SystematicsHandles/Helpers.h>
 
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc
index 89cbde7909719e76e745ac27a27947b89d8d36fd..8b4676d0c3686d1657a10195a70c5b3a14c527c2 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysReadHandleArray.icc
@@ -9,7 +9,7 @@
 // includes
 //
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTools/StatusCode.h>
 #include <SystematicsHandles/Helpers.h>
 
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.icc b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.icc
index 74ba4964619dbf002cbfda78d76cc5ce04f47a74..8371a02aefba9790554282d964c540e71f144fd1 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.icc
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/SystematicsHandles/SysWriteHandle.icc
@@ -9,7 +9,7 @@
 // includes
 //
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <SystematicsHandles/Helpers.h>
 
 //
diff --git a/PhysicsAnalysis/Algorithms/SystematicsHandles/test/ut_CopyHelpers.cxx b/PhysicsAnalysis/Algorithms/SystematicsHandles/test/ut_CopyHelpers.cxx
index 284efb0108095bb2731cbf369f43e537db8b942f..7e42bd38f44b6d274cfb7f319456ec0d76b8b005 100644
--- a/PhysicsAnalysis/Algorithms/SystematicsHandles/test/ut_CopyHelpers.cxx
+++ b/PhysicsAnalysis/Algorithms/SystematicsHandles/test/ut_CopyHelpers.cxx
@@ -12,7 +12,7 @@
 #include "xAODRootAccess/TStore.h"
 #include "xAODRootAccess/Init.h"
 #include "AsgTools/MsgStream.h"
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
 #include "AsgTools/SgTEvent.h"
 
 // EDM include(s):
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx
index f34dfe50ef808903b58dac14cebe18e56dc4f9c7..b6bb4f6acebf95b216b045e52b61d325236a614d 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_AnaToolHandle_test.cxx
@@ -6,7 +6,7 @@
  */
 
 #include "AsgTesting/UnitTest.h"
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
 #include "gtest/gtest.h"
 #ifdef ROOTCORE
 #include "xAODRootAccess/Init.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx
index 0b6305b170e09855f971df2cb233ef8385aeb13b..763e0c0efbe44ec217a530d1df95175afb51538e 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_OverlapRemovalInit_test.cxx
@@ -12,7 +12,7 @@
 
 // Infrastructure
 #include "AsgTools/UnitTest.h"
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
 #include "gtest/gtest.h"
 #ifdef ROOTCORE
 #include "xAODRootAccess/Init.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx
index ccb6afcb888794881f53254e27e84ee8a210f31f..1145bef13c1251ae24cadd89af305993758dcbd5 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/test/gt_toolbox_test.cxx
@@ -7,7 +7,7 @@
 
 // Infrastructure
 #include "AsgTools/UnitTest.h"
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
 #include "gtest/gtest.h"
 #ifdef ROOTCORE
 #include "xAODRootAccess/Init.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h
index e33960d1a1493abe6a69012768894106669be9b6..e55718a966461ecd31f6b3043c7df87f6d54b524 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h
@@ -9,7 +9,7 @@
 #define PAT_INTERFACES__MESSAGE_CHECK_H
 
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 
 namespace CP
 {
diff --git a/PhysicsAnalysis/AnalysisCommon/PMGTools/test/MyPMGApp.cxx b/PhysicsAnalysis/AnalysisCommon/PMGTools/test/MyPMGApp.cxx
index 7398015984b708c78e708ffe948ed2c8bd41cbf9..5a6eef69ed4a549ce040756a6ef6ae239da2bbb9 100644
--- a/PhysicsAnalysis/AnalysisCommon/PMGTools/test/MyPMGApp.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PMGTools/test/MyPMGApp.cxx
@@ -10,7 +10,7 @@
 
 // EDM includes
 #include "AsgTools/AnaToolHandle.h"
-#include "AsgTools/MessageCheck.h"  // for messaging
+#include "AsgMessaging/MessageCheck.h"  // for messaging
 #include "POOLRootAccess/TEvent.h"  // event looping
 #include "xAODJet/JetContainer.h"   // for jet studies
 #include "GaudiKernel/ToolHandle.h" // for better working with tools
diff --git a/PhysicsAnalysis/AnalysisCommon/PMGTools/test/ut_PMGTruthWeightTool_test.cxx b/PhysicsAnalysis/AnalysisCommon/PMGTools/test/ut_PMGTruthWeightTool_test.cxx
index a4bfec7a5ca437e7596170ea065b1ed51408de9e..7cf8129077802d0ed22d79c60ebda83a1ba5ee81 100644
--- a/PhysicsAnalysis/AnalysisCommon/PMGTools/test/ut_PMGTruthWeightTool_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PMGTools/test/ut_PMGTruthWeightTool_test.cxx
@@ -8,7 +8,7 @@
 /// @author: James Robinson
 
 // EDM include(s):
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
 #include "AsgTools/AnaToolHandle.h"
 
 // Project dependent include(s)
diff --git a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h
index 670fc9aff2cbf014a12af69e9e95d569b7435e03..84cc10421356fe87a9ff613ce1c05c8163af2b8b 100644
--- a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h
+++ b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/AnaAlgorithm.h
@@ -20,7 +20,7 @@
 #include <vector>
 #else
 #include <AthenaBaseComps/AthHistogramAlgorithm.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <StoreGate/StoreGateSvc.h>
 #include <GaudiKernel/IIncidentListener.h>
 #include <GaudiKernel/ServiceHandle.h>
diff --git a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/MessageCheck.h b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/MessageCheck.h
index 42f4197683e97c0681fadec8e8ba2b47ea5919cb..dee0b97469377aa822ac2347be26b5ab6535aba2 100644
--- a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/MessageCheck.h
+++ b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/AnaAlgorithm/MessageCheck.h
@@ -11,7 +11,7 @@
 
 #include <AnaAlgorithm/Global.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 
 namespace EL
 {
diff --git a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/Root/AnaAlgorithm.cxx b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/Root/AnaAlgorithm.cxx
index f8dbe6068fd9d24ea6bdb6554dae50f8f163c70c..c58ead977a41f3a0f92830e82c62b303ccc873ed 100644
--- a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/Root/AnaAlgorithm.cxx
+++ b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/Root/AnaAlgorithm.cxx
@@ -12,7 +12,7 @@
 
 #include <AnaAlgorithm/AnaAlgorithm.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <RootCoreUtils/Assert.h>
 #include <TH1.h>
 #include <TH2.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/MessageCheck.h b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/MessageCheck.h
index 81c2639d850aa5814b99b1d64b83f5d29672c8bd..ecdb8f11ffdca35644db7577796f2a70a02636f8 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/MessageCheck.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/EventLoop/MessageCheck.h
@@ -11,7 +11,7 @@
 
 #include <EventLoop/Global.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 
 namespace EL
 {
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx
index 6b3700c8c517cea5ae72e9f1736e4c569b8e100d..830ff568d3af979f12be471fc06b8ad088232407 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx
@@ -26,7 +26,7 @@
 #include <xAODCore/tools/ReadStats.h>
 #include <xAODCore/tools/PerfStats.h>
 #include <xAODCore/tools/IOStats.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <TList.h>
 
 //
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx
index fabb1f416eed973c8328070db26df8f3c1cd905a..296934b6cae7aae2b5b948aed3d49525303d08af 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/VomsProxySvc.cxx
@@ -17,7 +17,7 @@
 
 #include <EventLoop/VomsProxySvc.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <RootCoreUtils/Assert.h>
 #include <RootCoreUtils/ThrowMsg.h>
 #include <SampleHandler/GridTools.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/util/eventloop_batch_worker.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/util/eventloop_batch_worker.cxx
index 316a881e5bf753ef4f6783d90aa7869a2d139681..1e4975ce17a360bd6327409eb75b6a65f1a791ac 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/util/eventloop_batch_worker.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/util/eventloop_batch_worker.cxx
@@ -4,7 +4,7 @@
 
 #include <EventLoop/Worker.h>
 #include <xAODRootAccess/Init.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 
 int main (int argc, char **argv)
 {
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_grid_merge.cxx b/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_grid_merge.cxx
index b61e4a0bcc843290b4b0def1ae92c950ca4268b5..0ca9a18270560ecc2a425b80211e8223a32d0e82 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_grid_merge.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_grid_merge.cxx
@@ -5,7 +5,7 @@
 #include <EventLoop/OutputStream.h>
 #include <RootCoreUtils/ThrowMsg.h>
 #include <xAODRootAccess/Init.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <TList.h>
 #include <TSystem.h>
 #include <TFile.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_run_grid_job.cxx b/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_run_grid_job.cxx
index ee2595835c2962d880ac9531da3a723312fe05a6..cbfa8d05110ba2b1b7ed5232c66494379cdc8458 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_run_grid_job.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/util/eventloop_run_grid_job.cxx
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <string>
 #include <xAODRootAccess/Init.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 
 int main (int argc, char **argv)
 {
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlgXAOD.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlgXAOD.cxx
index 4c6018d9db020810183a976271b2fcd49029b02b..380f21f8b54454e07c99fde0136767111c781bd0 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlgXAOD.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestAlgXAOD.cxx
@@ -16,7 +16,7 @@
 #include <EventLoop/Worker.h>
 #include <RootCoreUtils/Assert.h>
 #include <RootCoreUtils/ThrowMsg.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <TFile.h>
 #include <TH1.h>
 #include <TTree.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx
index c2aad48ce445db989537c4a7ccdf9d53a78daa0d..683a7c7a404e47d4adab227526401fb3ece82737 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx
@@ -11,7 +11,7 @@
 
 #include <EventLoopTest/UnitTestFixture.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <EventLoop/Driver.h>
 #include <AnaAlgorithm/AnaAlgorithmConfig.h>
 #include <EventLoopTest/UnitTestAlg1.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_Algorithm.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_Algorithm.cxx
index ec25264b1b0f6977b2fcafdbba2d1480ab13fd0a..f72c332ac4ad8782093466ef70437ebb8ea6f3c4 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_Algorithm.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_Algorithm.cxx
@@ -11,7 +11,7 @@
 //
 
 #include <AsgTools/AnaToolHandle.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgMessaging/IMessagePrinter.h>
 #include <AsgTools/MessagePrinterOverlay.h>
 #include <AsgTesting/UnitTest.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_AnaAlgorithm.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_AnaAlgorithm.cxx
index 8fb58d5ff965f04ec510d301961dd59ce466ee1d..ba2bd4da18904ee2ba66ccaedb3badbd6d3de224 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_AnaAlgorithm.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_AnaAlgorithm.cxx
@@ -16,7 +16,7 @@
 #include <AnaAlgorithm/AlgorithmWorkerData.h>
 #include <EventLoopTest/UnitTestAlg5.h>
 #include <AsgTools/ToolHandle.h>
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTesting/UnitTest.h>
 #include <cmath>
 #include <gtest/gtest.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_DirectDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_DirectDriver.cxx
index 505a3db852c523051b8c84075eab9e2fa76d22d7..7475862cd8185395355a9fe5ca7d56aa63deea5c 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_DirectDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_DirectDriver.cxx
@@ -9,7 +9,7 @@
 // includes
 //
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <EventLoop/DirectDriver.h>
 #include <EventLoopTest/UnitTestConfig.h>
 #include <EventLoopTest/UnitTestFixture.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LSFDriver_EOS.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LSFDriver_EOS.cxx
index 3b1cbfed930ad115a07c541541b1a0ea21d7dd89..973e6ee43bbf867be462dabea62b04e4e962655e 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LSFDriver_EOS.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LSFDriver_EOS.cxx
@@ -9,7 +9,7 @@
 // includes
 //
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <EventLoop/Job.h>
 #include <EventLoop/LSFDriver.h>
 #include <EventLoopTest/UnitTestConfig.h>
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LocalDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LocalDriver.cxx
index 0abd349b2141ff53f0691e09984bce820f3e8085..b931f11e673fee82742375cfa96033ed1df76524 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LocalDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/test/gt_LocalDriver.cxx
@@ -9,7 +9,7 @@
 // includes
 //
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <EventLoop/LocalDriver.h>
 #include <EventLoopTest/UnitTestConfig.h>
 #include <EventLoopTest/UnitTestFixture.h>
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
index 921541a9e737388ba331855be98cd6fd3b394bf9..fa87a2a107006996c2e0c3478b0b1eb93adca897 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/GridTools.cxx
@@ -11,7 +11,7 @@
 
 #include <SampleHandler/GridTools.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <RootCoreUtils/Assert.h>
 #include <RootCoreUtils/ShellExec.h>
 #include <RootCoreUtils/StringUtil.h>
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h
index 3d21460c5369bda9543fb0a6746505a2dd0564bc..61fd10549b6bc1047cb6e6a6ca208ff4c9cb2aa6 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/GridTools.h
@@ -7,7 +7,7 @@
 
 #include <SampleHandler/Global.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MessageCheck.h b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MessageCheck.h
index d82c4cecca975b9efc64b66fc94356e42166243e..b9e2e17995037184e943eb4b0ed9d40671ba41d8 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MessageCheck.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/SampleHandler/MessageCheck.h
@@ -11,7 +11,7 @@
 
 #include <SampleHandler/Global.h>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 
 namespace SH
 {
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/EGIdentification_mem_check.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/EGIdentification_mem_check.cxx
index 1913574a2aca3026f256d9b4abc16ecb8b57da6e..755f04a978ca276ec978e772b20b2687d09e7f35 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/EGIdentification_mem_check.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/EGIdentification_mem_check.cxx
@@ -16,7 +16,7 @@ http://valgrind.org/docs/manual/faq.html#faq.deflost
 #include "EgammaAnalysisInterfaces/IAsgElectronIsEMSelector.h"
 #include "EgammaAnalysisInterfaces/IAsgElectronLikelihoodTool.h"
 #include "AsgTools/AnaToolHandle.h"
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
 
 int main(){
   using namespace asg::msgUserCode;
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx
index 05461c362b7fdf27b6349efff7f7e440b4ae2b0c..d2dfb3a385c27d6b80344c1e4d47b1009f153366 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx
@@ -25,7 +25,7 @@
 #include "EgammaAnalysisInterfaces/IAsgElectronLikelihoodTool.h"
 #include "ElectronPhotonSelectorTools/egammaPIDdefs.h"
 //
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
 #include "AsgTools/MsgStream.h"
 // Derivation include
 #include "xAODCore/tools/IOStats.h"
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/test/ut_MuonSelectorToolsTester_data.cxx b/PhysicsAnalysis/MuonID/MuonSelectorTools/test/ut_MuonSelectorToolsTester_data.cxx
index 512e4958664ca192730fa26a1378b8c1f2a8f131..76bf009555467cfbf9f5502914a3f7234eb55cf3 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/test/ut_MuonSelectorToolsTester_data.cxx
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/test/ut_MuonSelectorToolsTester_data.cxx
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <cstdlib>
 
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 
 int main()
 {
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx
index adfe484461b5894946b6d84cdff565d520d09997..576cfbf840cc49fc0cafa8192dab5e46600cb865 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauAnalysisTools_test.cxx
@@ -13,7 +13,7 @@
 #include "POOLRootAccess/TEvent.h" //event looping
 #include "GaudiKernel/ToolHandle.h" //for better working with tools
 
-#include "AsgTools/MessageCheck.h" //messaging
+#include "AsgMessaging/MessageCheck.h" //messaging
 using namespace asg::msgUserCode;  //messaging
 
 //ROOT includes
diff --git a/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx b/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx
index 9f5b17169784b648fd367c8e144c83e27ef249da..9dee8c4636c7e5c025ea53b01d366694e046116a 100644
--- a/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx
+++ b/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx
@@ -25,7 +25,7 @@
 #include "xAODRootAccess/Init.h"
 #include "xAODRootAccess/TEvent.h"
 #include "xAODRootAccess/TStore.h"
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #else
 #include "POOLRootAccess/TEvent.h"
 #include "StoreGate/StoreGateSvc.h"
diff --git a/Reconstruction/Jet/JetRecTools/JetRecTools/JetInputElRemovalTool.h b/Reconstruction/Jet/JetRecTools/JetRecTools/JetInputElRemovalTool.h
index effd9033b0c5c042d97688f55074fd266e984117..7599ed05a6649c341c5cb6e7af50ed4ee63b6e29 100644
--- a/Reconstruction/Jet/JetRecTools/JetRecTools/JetInputElRemovalTool.h
+++ b/Reconstruction/Jet/JetRecTools/JetRecTools/JetInputElRemovalTool.h
@@ -12,7 +12,7 @@
 
 
 #include "AsgTools/AsgTool.h"
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 #include <AsgTools/MsgStream.h>
 #include <AsgTools/MsgStreamMacros.h>
 
diff --git a/Reconstruction/Jet/JetReclustering/Root/JetReclusteringAlgo.cxx b/Reconstruction/Jet/JetReclustering/Root/JetReclusteringAlgo.cxx
index 24e73d996bdfa88cf23ff84ea519b7345099f72d..62622b1c2eaf6c1ed09485f289b975ec2ac7f4ca 100644
--- a/Reconstruction/Jet/JetReclustering/Root/JetReclusteringAlgo.cxx
+++ b/Reconstruction/Jet/JetReclustering/Root/JetReclusteringAlgo.cxx
@@ -17,7 +17,7 @@
 #include <EventLoop/OutputStream.h>
 
 // ANA_CHECK macro
-#include <AsgTools/MessageCheck.h>
+#include <AsgMessaging/MessageCheck.h>
 
 // this is needed to distribute the algorithm to the workers
 ClassImp(JetReclusteringAlgo)
diff --git a/Reconstruction/MET/METUtilities/METUtilities/METHelpers.h b/Reconstruction/MET/METUtilities/METUtilities/METHelpers.h
index 64aef9653c2de8b4941789a3ba5ad2a40940a73b..4dd0903939323f6af33c1b9a021564e88f06fe99 100644
--- a/Reconstruction/MET/METUtilities/METUtilities/METHelpers.h
+++ b/Reconstruction/MET/METUtilities/METUtilities/METHelpers.h
@@ -13,7 +13,7 @@
 #define METUTILITIES_MET_METHELPERS_H 1
 
 // Framework includes
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
 #include "AsgTools/StatusCode.h"
 
 #include "xAODMuon/MuonContainer.h"
diff --git a/Reconstruction/MET/METUtilities/util/example_METMaker_METSystematicsTool.cxx b/Reconstruction/MET/METUtilities/util/example_METMaker_METSystematicsTool.cxx
index 606f7b5f4bb6413b1a404bc830fa6e4257309536..d0f753c3d7c2ad8174936becfe64ffb9acc56558 100644
--- a/Reconstruction/MET/METUtilities/util/example_METMaker_METSystematicsTool.cxx
+++ b/Reconstruction/MET/METUtilities/util/example_METMaker_METSystematicsTool.cxx
@@ -23,7 +23,7 @@ int main() {
 #endif
 
 // FrameWork includes
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
 #include "AsgTools/AnaToolHandle.h"
 
 #include "xAODMissingET/MissingETAuxContainer.h"
diff --git a/Reconstruction/MET/METUtilities/util/example_METMaker_advanced.cxx b/Reconstruction/MET/METUtilities/util/example_METMaker_advanced.cxx
index f4f4f95484354c3155e1a9bf045588f5737c639a..33e2574eb49abb839039de762ed53fc35efef930 100644
--- a/Reconstruction/MET/METUtilities/util/example_METMaker_advanced.cxx
+++ b/Reconstruction/MET/METUtilities/util/example_METMaker_advanced.cxx
@@ -22,7 +22,7 @@ int main() {
 #endif
 
 // FrameWork includes
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
 #include "AsgTools/AnaToolHandle.h"
 
 #include "xAODMissingET/MissingETAuxContainer.h"
diff --git a/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx b/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx
index 79b64d1ae9d435606181ee9bc3fc862e00bb3694..e0358891255c9ccfc4323bbd7cbc9e9bbd36e03e 100644
--- a/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx
+++ b/Reconstruction/MET/METUtilities/util/example_rebuildTrackMET.cxx
@@ -22,7 +22,7 @@ int main() {
 #endif
 
 // FrameWork includes
-#include "AsgTools/MessageCheck.h"
+#include "AsgMessaging/MessageCheck.h"
 #include "AsgTools/AnaToolHandle.h"
 
 #include "xAODMissingET/MissingETAuxContainer.h"