diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/CMakeLists.txt b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/CMakeLists.txt
index 5b1a30c24a325228b608c9946021780648bfa1b8..e3fd3a4fa661064e0a98ccec3281d00a754a071e 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/CMakeLists.txt
@@ -1,28 +1,10 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 atlas_subdir( TrigMuonMonitoringMT )
 
-atlas_depends_on_subdirs(  PUBLIC
-			   Control/AthenaBaseComps
-			   Control/AthenaMonitoring
-			   GaudiKernel
-			   Trigger/TrigAnalysis/TrigDecisionTool
-			   PRIVATE
-			   Event/xAOD/xAODMuon
-			   Event/xAOD/xAODTrigMuon
-			   Event/FourMomUtils
-			   Trigger/TrigSteer/DecisionHandling
-			   Tracking/TrkExtrapolation/TrkExInterfaces
-			   Tracking/TrkEvent/TrkParameter
-			   Tracking/TrkVertexFitter/TrkVKalVrtFitter
-			   )
-
-
 atlas_add_component( TrigMuonMonitoringMT
-		     src/*.cxx
-		     src/components/*.cxx
-		     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-		     LINK_LIBRARIES AthenaBaseComps AthenaMonitoringLib GaudiKernel xAODMuon xAODTrigMuon TrigDecisionToolLib FourMomUtils DecisionHandlingLib TrkParameters TrkVKalVrtFitterLib
-		     )
-
+                     src/*.cxx
+                     src/components/*.cxx
+                     LINK_LIBRARIES AthenaBaseComps AthenaMonitoringLib FourMomUtils GaudiKernel StoreGateLib TrigDecisionToolLib TrkExInterfaces TrkParameters xAODMuon xAODTracking xAODTrigMuon xAODTrigger )
 
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
index 8471246d71280964288357de4aecb259278be4fd..b945a9573b4ee949fa69b1ff598e695b775acaae 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
@@ -15,7 +15,6 @@
 #include "TrkExInterfaces/IExtrapolator.h"
 #include "FourMomUtils/xAODP4Helpers.h"
 #include "GaudiKernel/SystemOfUnits.h"
-#include "TRandom1.h"
 #include <string>
 #include <memory>
 #include <tuple>