diff --git a/DataQuality/GoodRunsLists/CMakeLists.txt b/DataQuality/GoodRunsLists/CMakeLists.txt
index 94a69aea4a7c632aaae233a324a9b92dfcc86d05..975b96805233ea33ba6981c8c94a7c6d5bc0fd6e 100644
--- a/DataQuality/GoodRunsLists/CMakeLists.txt
+++ b/DataQuality/GoodRunsLists/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 754313 2016-06-12 10:28:19Z will $
+# $Id: CMakeLists.txt 777875 2016-10-11 17:17:13Z krasznaa $
 ################################################################################
 # Package: GoodRunsLists
 ################################################################################
@@ -12,6 +12,7 @@ if( XAOD_STANDALONE )
       PUBLIC
       Control/AthToolSupport/AsgTools
       Event/xAOD/xAODEventInfo
+      PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
       PRIVATE
       Tools/PathResolver )
 else()
@@ -21,6 +22,7 @@ else()
       Control/AthenaBaseComps
       Control/AthenaKernel
       Event/xAOD/xAODEventInfo
+      PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
       GaudiKernel
       PRIVATE
       Control/StoreGate
@@ -47,7 +49,7 @@ atlas_add_library( GoodRunsListsLib
    PUBLIC_HEADERS GoodRunsLists
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
    PRIVATE_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEventInfo
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEventInfo AsgAnalysisInterfaces
    PRIVATE_LINK_LIBRARIES ${LIBXML2_LIBRARIES} PathResolver )
 
 if( NOT XAOD_STANDALONE )
diff --git a/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListSelectionTool.h b/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListSelectionTool.h
index 4feb41b3b18ea97432664622f33fddecaf5f4954..a732e8bec0a677c03b4715b8223d6690e889ad7e 100644
--- a/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListSelectionTool.h
+++ b/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListSelectionTool.h
@@ -15,7 +15,7 @@
 #include "AsgTools/AsgTool.h"
 
 // Local include(s):
-#include "GoodRunsLists/IGoodRunsListSelectionTool.h"
+#include "AsgAnalysisInterfaces/IGoodRunsListSelectionTool.h"
 #include "GoodRunsLists/TGRLCollection.h"
 
 /// Tool implementing the GRL selection
diff --git a/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListsDict.h b/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListsDict.h
index 9c1d8896962d034b5dbdc948b178a85a5b7c8b70..cd881202c9dc6957f74ec7895568a864c71d1418 100644
--- a/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListsDict.h
+++ b/DataQuality/GoodRunsLists/GoodRunsLists/GoodRunsListsDict.h
@@ -8,10 +8,13 @@
 
 #include "GoodRunsLists/GoodRunsListSelectionTool.h"
 
+/* removed for now ... maybe move to AsgAnalysisInterfaces if need a dictionary for specific ToolHandle
 #include "AsgTools/ToolHandle.h"
 
+
 struct dummyStruct {
   ToolHandle<IGoodRunsListSelectionTool> dummy1;
 };
+*/
 
 #endif
diff --git a/DataQuality/GoodRunsLists/GoodRunsLists/IGoodRunsListSelectionTool.h b/DataQuality/GoodRunsLists/GoodRunsLists/IGoodRunsListSelectionTool.h
index 52b81aba0d2f47e90a4a2a68d1624a596bf830c9..0d633051e4285de5b2cf7db6e08d79490fe78d03 100644
--- a/DataQuality/GoodRunsLists/GoodRunsLists/IGoodRunsListSelectionTool.h
+++ b/DataQuality/GoodRunsLists/GoodRunsLists/IGoodRunsListSelectionTool.h
@@ -1,67 +1,10 @@
-// Dear emacs, this is -*- c++ -*-
-
 /*
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
-#ifndef GoodRunsLists_IGoodRunsListSelectionTool_H
-#define GoodRunsLists_IGoodRunsListSelectionTool_H
-
-// System include(s):
-#include <vector>
-#include <string>
-
-// Framework include(s):
-#include "AsgTools/IAsgTool.h"
-
-// EDM include(s):
-#include "xAODEventInfo/EventInfo.h"
-
-// Forward declaration(s):
-namespace Root {
-   class TGRLCollection;
-}
-
-/// Interface to the dual-use GRL tool
-///
-/// This interface should be used inside an analysis to make use of the
-/// GRL tool.
-///
-/// $Revision$
-/// $Date$
-///
-class IGoodRunsListSelectionTool : virtual public asg::IAsgTool {
-
-   ASG_TOOL_INTERFACE( IGoodRunsListSelectionTool )
-
-public:
-   /// Check if the current event passes the selection
-   virtual bool passRunLB( const std::vector< std::string >& grlnameVec =
-                              std::vector< std::string >(),
-                           const std::vector< std::string >& brlnameVec =
-                              std::vector< std::string >() ) const = 0;
-
-   /// Check if the event specified passes the selection
-   virtual bool passRunLB( const xAOD::EventInfo& event,
-                           const std::vector< std::string >& grlnameVec =
-                              std::vector< std::string >(),
-                           const std::vector< std::string >& brlnameVec =
-                              std::vector< std::string >() ) const = 0;
-
-   /// Check if the event specified passes the selection
-   virtual bool passRunLB( int runNumber, int lumiBlockNr,
-                           const std::vector< std::string >& grlnameVec =
-                              std::vector< std::string >(),
-                           const std::vector< std::string >& brlnameVec =
-                              std::vector< std::string >() ) const = 0;
 
-   /// Get the good runs list used by the tool
-   virtual const Root::TGRLCollection& getGRLCollection() const = 0;
 
-   /// Get the bad runs list used by the tool
-   virtual const Root::TGRLCollection& getBRLCollection() const = 0;
 
-}; // class IGoodRunsListSelectionTool
+#warning Please use AsgAnalysisInterfaces/IGoodRunsListSelectionTool.h
 
-#endif // GoodRunsLists_IGoodRunsListSelectionTool_H
+#include "AsgAnalysisInterfaces/IGoodRunsListSelectionTool.h"
diff --git a/DataQuality/GoodRunsLists/GoodRunsLists/selection.xml b/DataQuality/GoodRunsLists/GoodRunsLists/selection.xml
index 0f95c225fbc53e24a363a337d481ca23cf782b2f..5ed3d8b5608eb77117a301d2cf5538b3e0ff6063 100644
--- a/DataQuality/GoodRunsLists/GoodRunsLists/selection.xml
+++ b/DataQuality/GoodRunsLists/GoodRunsLists/selection.xml
@@ -2,8 +2,6 @@
 
   <!-- GoodRunsListSelectionTool -->
   <class name="GoodRunsListSelectionTool" />
-  <class name="ToolHandle<IGoodRunsListSelectionTool>" />
-  <class name="IGoodRunsListSelectionTool" />
   
 
   <exclusion>
diff --git a/DataQuality/GoodRunsLists/cmt/Makefile.RootCore b/DataQuality/GoodRunsLists/cmt/Makefile.RootCore
index 69136cbe1107a00037683e3ce8c34ecc7665024f..87251dcb88a7aaeb46451e8a6caa55e94f10faa1 100644
--- a/DataQuality/GoodRunsLists/cmt/Makefile.RootCore
+++ b/DataQuality/GoodRunsLists/cmt/Makefile.RootCore
@@ -1,9 +1,8 @@
 # Author: Max Baak (mbaak@cern.ch)
-# GoodRunsLists root stand-alone makefile
 
 PACKAGE          = GoodRunsLists
 PACKAGE_PRELOAD  = Tree TreePlayer XMLParser XMLIO
-PACKAGE_TRYDEP   = AsgTools xAODEventInfo PathResolver
+PACKAGE_TRYDEP   = AsgTools xAODEventInfo PathResolver AsgAnalysisInterfaces
 PACKAGE_CXXFLAGS = -I/usr/include/libxml2
 PACKAGE_BINFLAGS = -lxml2
 PACKAGE_PEDANTIC = 1
diff --git a/DataQuality/GoodRunsLists/cmt/requirements b/DataQuality/GoodRunsLists/cmt/requirements
index b076b38e83c4b377f7e295a6e3ca3c52730e0fde..3057bd3974fcc7a419c90992eaf94cbf455c549f 100644
--- a/DataQuality/GoodRunsLists/cmt/requirements
+++ b/DataQuality/GoodRunsLists/cmt/requirements
@@ -12,6 +12,8 @@ use  GaudiInterface             GaudiInterface-*                External
 use  xAODEventInfo               xAODEventInfo-*                 Event/xAOD
 use  AsgTools                   AsgTools-*                      Control/AthToolSupport
 
+use AsgAnalysisInterfaces      AsgAnalysisInterfaces-*          PhysicsAnalysis/Interfaces
+
 private
 use  DetectorStatus             DetectorStatus-*                DetectorDescription/DetDescrCond
 use  EventInfo                  EventInfo-*                     Event
diff --git a/DataQuality/GoodRunsLists/src/GRLSelectorAlg.h b/DataQuality/GoodRunsLists/src/GRLSelectorAlg.h
index 9a9e0fe16ea6064531b0635608dc711adfc1390f..0ef736fde7507bc0e237813bfae2ac4849e20209 100644
--- a/DataQuality/GoodRunsLists/src/GRLSelectorAlg.h
+++ b/DataQuality/GoodRunsLists/src/GRLSelectorAlg.h
@@ -8,7 +8,7 @@
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h" //included under assumption you'll want to use some tools! Remove if you don't!
 
-#include "GoodRunsLists/IGoodRunsListSelectionTool.h"
+#include "AsgAnalysisInterfaces/IGoodRunsListSelectionTool.h"
 
 ///Author: will buttinger
 ///To use this alg in your joboptions: