diff --git a/Control/AthToolSupport/AsgServices/Root/ServiceStore.cxx b/Control/AthToolSupport/AsgServices/Root/ServiceStore.cxx
index fbecdd3d1f8376ad780d939ea5dc531530211afb..00d0c03f18adb1227710c66ab75f2eb507e29459 100644
--- a/Control/AthToolSupport/AsgServices/Root/ServiceStore.cxx
+++ b/Control/AthToolSupport/AsgServices/Root/ServiceStore.cxx
@@ -103,7 +103,8 @@ namespace asg
       if (myservice)
       {
         auto& myproperties = properties[service.first];
-        myproperties[""] = std::string (typeid(*myservice).name()) + "/" + service.first;
+        asg::IAsgService *myservicePtr = myservice.get(); // avoid Wpotentially-evaluated-expression from typeid
+        myproperties[""] = std::string (typeid(*myservicePtr).name()) + "/" + service.first;
         for (auto& property : dynamic_cast<const AsgService*>(myservice.get())->getPropertyMgr()->getProperties())
         {
           std::string asString;
diff --git a/Control/xAODRootAccess/test/ut_xaodrootaccess_tevent_test.cxx b/Control/xAODRootAccess/test/ut_xaodrootaccess_tevent_test.cxx
index 914055bfcbaf5b84ba9646a68efaf2e509d3461e..f6fc7d8a31d4be60c82de32aba013737bce18677 100644
--- a/Control/xAODRootAccess/test/ut_xaodrootaccess_tevent_test.cxx
+++ b/Control/xAODRootAccess/test/ut_xaodrootaccess_tevent_test.cxx
@@ -70,11 +70,11 @@ public:
 // some dummz definitions to test TEvent::keys
 namespace xAOD {
    // a test for metadata
-   class FileMetaData_v1 { int m_a, m_e; };
+   class FileMetaData_v1 { };
    typedef FileMetaData_v1 FileMetaData;
 
    // a test for event payload
-   class TrackParticle_v1 { int m_a, m_e; };
+   class TrackParticle_v1 { };
    typedef TrackParticle_v1 TrackParticle;
 }
 
diff --git a/Event/xAOD/xAODCore/test/ut_xaodcore_shallowcopy.cxx b/Event/xAOD/xAODCore/test/ut_xaodcore_shallowcopy.cxx
index 26265b61b66bed9b76cc6dafdcbd27e5e5244ab5..6fbeff979804703f2ff085ecdae358e6cbf02854 100644
--- a/Event/xAOD/xAODCore/test/ut_xaodcore_shallowcopy.cxx
+++ b/Event/xAOD/xAODCore/test/ut_xaodcore_shallowcopy.cxx
@@ -8,11 +8,18 @@
 
 // EDM include(s):
 #ifdef XAOD_STANDALONE
+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wkeyword-macro"
+#endif
 #define private public
 #define protected public
 #   include "AthLinks/DataLink.h"
 #undef protected
 #undef private
+#ifdef __clang__
+# pragma clang diagnostic pop
+#endif
 #else
 # include "AthLinks/DataLink.h"
 #endif
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
index 0c0287ec9d3a54dc41d1f1d4e8d6fa7c10683158..1171631fb574d0ac35a35dc278a973d5009f50fe 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/LocalDriver.cxx
@@ -85,7 +85,7 @@ namespace EL
           if (gSystem->MakeDirectory (basedirName.str().c_str()) != 0)
             RCU_THROW_MSG ("failed to create directory " + basedirName.str());
         }
-        auto submitSingle = [&, this] (std::size_t index) noexcept -> StatusCode
+        auto submitSingle = [&] (std::size_t index) noexcept -> StatusCode
         {
           try
           {
@@ -129,7 +129,7 @@ namespace EL
           bool abort = false;
           while (threads.size() < unsigned (numParallelProcs))
           {
-            threads.emplace_back ([&,this] () noexcept
+            threads.emplace_back ([&] () noexcept
             {
               std::unique_lock<std::mutex> lock (mutex);
               while (indexIter != data.batchJobIndices.end() && !abort)