diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiTrackMaker.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiTrackMaker.h
old mode 100755
new mode 100644
index 75978abe4b8686e5b6ecb8bd351189c533289c51..6fdd69de257c656160160bb87c12b7b94d46cffe
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiTrackMaker.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiTrackMaker.h
@@ -15,13 +15,16 @@
 #ifndef ISiTrackMaker_H
 #define ISiTrackMaker_H
 
-#include <list>
-#include "GaudiKernel/AlgTool.h"
+#include "GeoPrimitives/GeoPrimitives.h"
+
 #include "TrkParameters/TrackParameters.h"
 #include "TrkSpacePoint/SpacePoint.h"
-#include "GeoPrimitives/GeoPrimitives.h"
 #include "TrkTrack/Track.h"
 
+#include "GaudiKernel/AlgTool.h"
+
+#include <list>
+
 class MsgStream;
 
 namespace InDetDD {
@@ -41,13 +44,8 @@ namespace InDet {
       
     public:
 
-      ///////////////////////////////////////////////////////////////////
-      // Standard tool methods
-      ///////////////////////////////////////////////////////////////////
-
-      static const InterfaceID& interfaceID();
-      virtual StatusCode initialize ()=0;
-      virtual StatusCode finalize   ()=0;
+      // InterfaceID
+      DeclareInterfaceID(ISiTrackMaker, 1, 0);
 
       ///////////////////////////////////////////////////////////////////
       // Main methods for track-finding
@@ -84,11 +82,6 @@ namespace InDet {
   // Inline methods
   ///////////////////////////////////////////////////////////////////
 
-  inline const InterfaceID& ISiTrackMaker::interfaceID()
-    {
-      return IID_ISiTrackMaker;
-    }
-
   ///////////////////////////////////////////////////////////////////
   // Overload of << operator MsgStream
   ///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.h b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.h
index de514e65d592fdf2e5621d3317020de59a16d29f..c2586fb87cf453dc8d855c8e46ce3fe9c62a5fce 100644
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.h
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.h
@@ -50,7 +50,7 @@ namespace InDet{
   */
 
   class SiTrackMaker_xk : 
-    virtual public ISiTrackMaker, public AthAlgTool
+    public extends<AthAlgTool, ISiTrackMaker>
     {
 
       ///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
index acf393b5cf773cfc33542a0563edd122a571d0d2..24117519b6b82b48d6426fdad61a7fe6437a4b16 100644
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
@@ -26,9 +26,8 @@
 
 InDet::SiTrackMaker_xk::SiTrackMaker_xk
 (const std::string& t,const std::string& n,const IInterface* p)
-  : AthAlgTool(t,n,p)
+  : base_class(t, n, p)
 {
-  declareInterface<ISiTrackMaker>(this);
 }
 
 ///////////////////////////////////////////////////////////////////