diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h
index bd0a60d5870159ee8d15c5d34fe92cac4cb34525..1ed12fa4e8d8a8a9cfc6a6796a9689d01b2701ab 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhysicsValidationTool.h
@@ -30,20 +30,12 @@
 // ROOT forward declarations
 class TTree;
 
-class IIncidentSvc;
-//class AtlasDetectorID;
-
 namespace ISF {
     class ISFParticle;
 }
 
 namespace iFatras 
 {
- 
-  class IParticleDecayHelper;
-  class ITrackCreator;    
-  class ISimHitCreator;    
-    
   /** @class PhysicsValidationTool 
       
       Fatras AlgTool to validate the physics content 
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/HitCreatorSilicon.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/HitCreatorSilicon.h
index fef281b8c210a1e74bff1eb0d11465e94437848c..8bad4ab69c9a198f7da499823324b0a7a72adbff 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/HitCreatorSilicon.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/HitCreatorSilicon.h
@@ -33,18 +33,6 @@ class SCT_ID;
 class IInDetConditionsTool;
 class StoreGateSvc;
 class TF1;
-namespace InDet {
-    class ClusterMakerTool;
-}
-
-namespace InDetDD  {
-    class SiDetectorElement;
-}
-
-namespace Trk {
-    class IRIO_OnTrackCreator; class LocalPosition;
-    class Surface;
-}
 
 namespace ISF {
     class ISFParticle;
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/HitCreatorTRT.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/HitCreatorTRT.h
index 60bfb9ee5cf09d513d1cf11390ca7733d6cd5ed1..480f884d89d01e0023faa49a5a14ad98095b2e7b 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/HitCreatorTRT.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/HitCreatorTRT.h
@@ -28,14 +28,9 @@
 #include "InDetSimEvent/TRTUncompressedHitCollection.h"
 
 class ITRT_StrawStatusSummarySvc;
-class ITRT_DriftFunctionTool;
 class TRT_ID;
 class StoreGateSvc;
 
-namespace Trk {    
-    class ITRT_ElectronPidTool;
-}
-
 namespace ISF {
     class ISFParticle;
 }
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/SimHitCreatorID.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/SimHitCreatorID.h
index ece6e9dbdbfe79bb72a706a4fa3472f22932cace..8145b26e140cca56acb1695136f91470596bd575 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/SimHitCreatorID.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsID/src/SimHitCreatorID.h
@@ -20,19 +20,11 @@
 // Fatras
 #include "ISF_FatrasInterfaces/ISimHitCreator.h"
 
-// Tracking includes
-#include "TrkExInterfaces/ITimedExtrapolator.h"
-
 // STL
 #include <utility>
 
 class AtlasDetectorID;
 
-namespace Trk {
-  class Track;
-}
-
-
 namespace iFatras {
   
   class IHitCreator;
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.h
index 79c4a3601da0701c82174d59a5b5f7bb7715d6b2..32d71a4330bfeea6dd6a04bd74611f4612f857e5 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.h
@@ -16,7 +16,6 @@
 #include "GaudiKernel/IIncidentListener.h"
 // ISF includes
 #include "ISF_FatrasInterfaces/ISimHitCreator.h"
-//#include "ISF_FatrasInterfaces/IHitCreator.h"
 // Tracking includes
 #include "TrkParameters/TrackParameters.h"
 #include "TrkExInterfaces/ITimedExtrapolator.h"
@@ -34,8 +33,6 @@ class MdtHitIdHelper;
 class RpcHitIdHelper;
 class CscHitIdHelper;
 class TgcHitIdHelper;
-class sTgcHitIdHelper;
-class MicromegasHitIdHelper;
 
 namespace MuonGM {
   class MuonDetectorManager;
@@ -48,8 +45,6 @@ namespace Muon {
 
 namespace Trk {
   class Layer;
-  class Track;
-  class TrackingGeometry;
 }
 
 namespace ISF {
@@ -62,8 +57,6 @@ struct sTgcSimIdToOfflineId;
 namespace iFatras 
 {
 
-   class IHitCreator;
-    
   /** @class SimHitCreatorMS 
 
       A dedicated instance for Fatras sim hit creation
@@ -131,8 +124,6 @@ namespace iFatras
       RpcHitIdHelper*                      m_rpcHitIdHelper;
       CscHitIdHelper*                      m_cscHitIdHelper;
       TgcHitIdHelper*                      m_tgcHitIdHelper;
-      //sTgcHitIdHelper*                     m_sTgcHitIdHelper;
-      //MicromegasHitIdHelper*               m_mmHitIdHelper;
       MM_SimIdToOfflineId*                 m_mmOffToSimId;
       sTgcSimIdToOfflineId*                m_stgcOffToSimId;