diff --git a/Tracking/TrkEvent/TrkRIO_OnTrack/CMakeLists.txt b/Tracking/TrkEvent/TrkRIO_OnTrack/CMakeLists.txt
index 51162b17a6419c83ef659db77a3a27179d57e874..9fd71abb95850643024ad91e858f688cb4fef8c8 100644
--- a/Tracking/TrkEvent/TrkRIO_OnTrack/CMakeLists.txt
+++ b/Tracking/TrkEvent/TrkRIO_OnTrack/CMakeLists.txt
@@ -7,8 +7,7 @@ atlas_subdir( TrkRIO_OnTrack )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/CLIDSvc
-                          Control/SGTools
+                          Control/AthenaKernel
                           DetectorDescription/GeoPrimitives
                           DetectorDescription/Identifier
                           Event/EventPrimitives
@@ -26,6 +25,6 @@ atlas_add_library( TrkRIO_OnTrack
                    src/*.cxx
                    PUBLIC_HEADERS TrkRIO_OnTrack
                    INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${EIGEN_LIBRARIES} SGTools GeoPrimitives Identifier EventPrimitives TrkEventPrimitives TrkMeasurementBase
+                   LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives Identifier EventPrimitives TrkEventPrimitives TrkMeasurementBase
                    PRIVATE_LINK_LIBRARIES GaudiKernel TrkPrepRawData )
 
diff --git a/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/RIO_OnTrackMap.h b/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/RIO_OnTrackMap.h
index dd1ec1f4e8c95c033146e566c72c684d1ddcb086..8eeae92bc7967f2987ca008d28071bfd9c8c00f6 100755
--- a/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/RIO_OnTrackMap.h
+++ b/Tracking/TrkEvent/TrkRIO_OnTrack/TrkRIO_OnTrack/RIO_OnTrackMap.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -9,7 +9,7 @@
 #ifndef TRKRIO_ONTRACK_RIO_ONTRACKMAPS_H
 #define TRKRIO_ONTRACK_RIO_ONTRACKMAPS_H 
 
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
 #include <map>