diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/CMakeLists.txt b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/CMakeLists.txt
index f953620a6584bffebe157a15b021c02a99d1547d..973b600752a68ea1f7a49c65c24ed46de5417d85 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/CMakeLists.txt
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/CMakeLists.txt
@@ -5,23 +5,12 @@
 # Declare the package name:
 atlas_subdir( DerivationFrameworkTau )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Event/xAOD/xAODTracking
-                          GaudiKernel
-                          PhysicsAnalysis/DerivationFramework/DerivationFrameworkInterfaces
-                          PRIVATE
-                          Event/xAOD/xAODTau
-                          PhysicsAnalysis/JpsiUpsilonTools
-                          PhysicsAnalysis/TauID/TauAnalysisTools )
-
 # Component(s) in the package:
 atlas_add_library( DerivationFrameworkTauLib
                    src/*.cxx
                    PUBLIC_HEADERS DerivationFrameworkTau
-                   LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel JpsiUpsilonToolsLib
-                   PRIVATE_LINK_LIBRARIES xAODTau )
+                   LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel JpsiUpsilonToolsLib TauAnalysisToolsLib DerivationFrameworkInterfaces
+                   PRIVATE_LINK_LIBRARIES xAODTau)
 
 atlas_add_component( DerivationFrameworkTau
                      src/components/*.cxx
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/CMakeLists.txt b/PhysicsAnalysis/TauID/TauAnalysisTools/CMakeLists.txt
index 22d7e154915e46021c7d6902cc624408029812df..311ef8ac5b348694cac7c93f9a5550a4b0c067aa 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/CMakeLists.txt
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/CMakeLists.txt
@@ -6,55 +6,29 @@
 # Declare the package name:
 atlas_subdir( TauAnalysisTools )
 
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( XAOD_STANDALONE )
-   set( extra_deps Control/xAODRootAccess )
-else()
-   set( extra_deps GaudiKernel
-      PhysicsAnalysis/POOLRootAccess
-      Control/AthenaBaseComps
-      Control/AthAnalysisBaseComps )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODEgamma
-   Event/xAOD/xAODMuon
-   Event/xAOD/xAODJet
-   Event/xAOD/xAODTau
-   Event/xAOD/xAODTracking
-   Event/xAOD/xAODTruth
-   Generators/TruthUtils
-   PhysicsAnalysis/AnalysisCommon/PATCore
-   PhysicsAnalysis/AnalysisCommon/PATInterfaces
-   PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
-   PhysicsAnalysis/MCTruthClassifier
-   Reconstruction/tauRecTools
-   PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
-   PRIVATE
-   Control/AthLinks
-   Event/xAOD/xAODCore
-   Event/xAOD/xAODEventInfo
-   Event/xAOD/xAODMetaData
-   Tools/PathResolver
-   PhysicsAnalysis/AnalysisCommon/PileupReweighting
-   ${extra_deps} )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO )
 
 # Libraries in the package:
-atlas_add_library( TauAnalysisToolsLib
-   TauAnalysisTools/*.h Root/*.cxx
-	PUBLIC_HEADERS TauAnalysisTools
-   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma xAODMuon xAODJet
-   xAODTau xAODTracking xAODTruth TruthUtils PATCoreLib PATInterfaces
-   ElectronPhotonSelectorToolsLib tauRecToolsLib MCTruthClassifierLib
-   PRIVATE_LINK_LIBRARIES AthLinks xAODEventInfo xAODMetaData PathResolver )
+if( XAOD_STANDALONE )
+   atlas_add_library( TauAnalysisToolsLib
+      TauAnalysisTools/*.h Root/*.cxx
+	  PUBLIC_HEADERS TauAnalysisTools
+      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+      LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma xAODMuon xAODJet
+      xAODTau xAODTracking xAODTruth TruthUtils PATCoreLib PATInterfaces
+      tauRecToolsLib MCTruthClassifierLib
+      PRIVATE_LINK_LIBRARIES AthLinks xAODEventInfo xAODMetaData PathResolver )
+else()
+   atlas_add_library( TauAnalysisToolsLib
+      TauAnalysisTools/*.h Root/*.cxx
+	  PUBLIC_HEADERS TauAnalysisTools
+      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+      LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma xAODMuon xAODJet
+      xAODTau xAODTracking xAODTruth TruthUtils PATCoreLib PATInterfaces
+      ElectronPhotonSelectorToolsLib tauRecToolsLib MCTruthClassifierLib
+      PRIVATE_LINK_LIBRARIES AthLinks xAODEventInfo xAODMetaData PathResolver )
+endif()
 
 if( NOT XAOD_STANDALONE )
    atlas_add_component( TauAnalysisTools
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauOverlappingElectronLLHDecorator.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauOverlappingElectronLLHDecorator.cxx
index fd00eb65aef92663d79a68146b68ff5dba031542..791c86e8a10a6b5acad74c470ff8e9242ef5c8ba 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauOverlappingElectronLLHDecorator.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauOverlappingElectronLLHDecorator.cxx
@@ -1,3 +1,5 @@
+#ifndef XAOD_STANDALONE
+
 /*
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
@@ -211,3 +213,5 @@ StatusCode TauOverlappingElectronLLHDecorator::beginEvent()
 }
 
 //______________________________________________________________________________
+
+#endif
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauOverlappingElectronLLHDecorator.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauOverlappingElectronLLHDecorator.h
index b4d330cb30e2b09dabead3533a74a8e20b7b7f86..586e7b31b2f01aa655cac64c190d760adb7352dc 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauOverlappingElectronLLHDecorator.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauOverlappingElectronLLHDecorator.h
@@ -1,3 +1,5 @@
+#ifndef XAOD_STANDALONE
+
 // Dear emacs, this is -*- c++ -*-
 
 /*
@@ -87,3 +89,5 @@ private:
 } // namespace TauAnalysisTools
 
 #endif // TAUANALYSISTOOLS_TAUOVERLAPPINGELECTRONLLHDECORATOR_H
+
+#endif
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/util/TauAnalysisToolsExample.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/util/TauAnalysisToolsExample.cxx
index 085313f798dc771c3b2cc5f4b85767b3748214f7..9dcb4fd03f12696d59330a4a852161df6ddbb842 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/util/TauAnalysisToolsExample.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/util/TauAnalysisToolsExample.cxx
@@ -227,10 +227,11 @@ int main( int argc, char* argv[] )
   // ===========================================================================
   // TauOverlappingElectronLLHDecorator
   // ===========================================================================
+#ifndef XAOD_STANDALONE
   TauAnalysisTools::TauOverlappingElectronLLHDecorator TOELLHDecorator( "TauOverlappingElectronLLHDecorator");
   TOELLHDecorator.msg().setLevel( MSG::INFO );
   CHECK(TOELLHDecorator.initialize());
-
+#endif
   // Loop over the events:
   for( Long64_t iEntry = 0; iEntry < iEntries; ++iEntry )
   {
diff --git a/Projects/AnalysisBase/package_filters.txt b/Projects/AnalysisBase/package_filters.txt
index 24425facbbeeb3051bfe6cb2524b9fb840fcf7dd..1c80a58732b42b0ddfb87621aa79060288e5a8dc 100644
--- a/Projects/AnalysisBase/package_filters.txt
+++ b/Projects/AnalysisBase/package_filters.txt
@@ -94,7 +94,7 @@
 + PhysicsAnalysis/MuonID/MuonIDAnalysis/.*
 + PhysicsAnalysis/MuonID/MuonSelectorTools
 + PhysicsAnalysis/TauID/DiTauMassTools
-#+ PhysicsAnalysis/TauID/TauAnalysisTools
++ PhysicsAnalysis/TauID/TauAnalysisTools
 + PhysicsAnalysis/TrackingID/.*
 + Reconstruction/EventShapes/EventShapeInterface
 #+ Reconstruction/Jet/BoostedJetTaggers