diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/PATCore/CMakeLists.txt
index ea12f75d089d608bdb37455c8fa4691ccd043a3d..6ee44014a08750a43dfaeeb24e2428ffd55c7abf 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/CMakeLists.txt
@@ -23,11 +23,17 @@ atlas_depends_on_subdirs(
 find_package( ROOT COMPONENTS Core )
 
 # Component(s) in the package:
+atlas_add_library( PATCoreAcceptLib
+   Root/accept/*.cxx
+   PUBLIC_HEADERS PATCore
+   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+   LINK_LIBRARIES ${ROOT_LIBRARIES} )
+
 atlas_add_library( PATCoreLib
-   PATCore/*.h Root/*.cxx
+   Root/*.cxx
    PUBLIC_HEADERS PATCore
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AsgTools ${extra_libs} )
+   LINK_LIBRARIES ${ROOT_LIBRARIES} PATCoreAcceptLib AthContainers AsgTools ${extra_libs} )
 
 atlas_add_dictionary( PATCoreDict
    PATCore/PATCoreDict.h
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/Root/AcceptData.cxx b/PhysicsAnalysis/AnalysisCommon/PATCore/Root/accept/AcceptData.cxx
similarity index 100%
rename from PhysicsAnalysis/AnalysisCommon/PATCore/Root/AcceptData.cxx
rename to PhysicsAnalysis/AnalysisCommon/PATCore/Root/accept/AcceptData.cxx
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/Root/AcceptInfo.cxx b/PhysicsAnalysis/AnalysisCommon/PATCore/Root/accept/AcceptInfo.cxx
similarity index 100%
rename from PhysicsAnalysis/AnalysisCommon/PATCore/Root/AcceptInfo.cxx
rename to PhysicsAnalysis/AnalysisCommon/PATCore/Root/accept/AcceptInfo.cxx
diff --git a/PhysicsAnalysis/RingerSelectorTools/CMakeLists.txt b/PhysicsAnalysis/RingerSelectorTools/CMakeLists.txt
index f7d8411db70d24f85f2dcfa0186afcc0026b9cc6..7800944552b150b75cd24c420a99cd6e04e7cbf4 100644
--- a/PhysicsAnalysis/RingerSelectorTools/CMakeLists.txt
+++ b/PhysicsAnalysis/RingerSelectorTools/CMakeLists.txt
@@ -17,23 +17,6 @@ else()
   set( extra_dep Control/AthContainers Tracking/TrkEvent/TrkTrackSummary GaudiKernel )
 endif()
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthToolSupport/AsgTools
-                          Control/CxxUtils
-                          Event/xAOD/xAODCaloRings
-                          Event/xAOD/xAODEgamma
-                          Event/xAOD/xAODTracking
-                          Event/xAOD/xAODEventInfo
-                          PhysicsAnalysis/AnalysisCommon/PATCore
-                          PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
-                          PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces
-                          ${extra_pub_dep}
-                          PRIVATE
-                          Event/xAOD/xAODBase
-                          Tools/PathResolver
-                          ${extra_dep} )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( ROOT COMPONENTS Core Gpad Tree MathCore Hist RIO pthread )
@@ -42,7 +25,7 @@ atlas_add_library( RingerSelectorToolsEnumsLib
                    Root/enums/*.cxx
                    PUBLIC_HEADERS RingerSelectorTools
                    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} PATCoreLib )
+                   LINK_LIBRARIES ${ROOT_LIBRARIES} PATCoreAcceptLib )
 
 atlas_add_library( RingerSelectorToolsLib
                    Root/*.cxx