diff --git a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/Surface.h b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/Surface.h
index 9d0bfc4c8f50119f7c218f60667e25ff8e67fac9..e7fb5be7fc50a37590237962276f38eee6515f79 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/Surface.h
+++ b/Tracking/TrkDetDescr/TrkSurfaces/TrkSurfaces/Surface.h
@@ -16,10 +16,10 @@
 #include "TrkEventPrimitives/LocalParameters.h"
 #include "TrkEventPrimitives/ParamDefs.h"
 #include "TrkEventPrimitives/PropDirection.h"
+#include "TrkEventPrimitives/SurfaceUniquePtrT.h"
 #include "TrkParametersBase/Charged.h"
 #include "TrkParametersBase/Neutral.h"
 #include "TrkParametersBase/ParametersBase.h"
-#include "TrkParametersBase/SurfaceUniquePtrT.h"
 #include "TrkSurfaces/BoundaryCheck.h"
 #include "TrkSurfaces/DistanceSolution.h"
 // Amg
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/SurfaceUniquePtrT.h b/Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/SurfaceUniquePtrT.h
similarity index 79%
rename from Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/SurfaceUniquePtrT.h
rename to Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/SurfaceUniquePtrT.h
index bf72b97f5c5e11fb7bc88ecb7d71dcf755c98f13..6d6cca610f9820eae328a7886535a75b1a98d9d9 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/SurfaceUniquePtrT.h
+++ b/Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/SurfaceUniquePtrT.h
@@ -13,13 +13,11 @@
  */
 
 
-#ifndef TRKPARAMETERSBASE_SURFACEUNIQUEPTRT_H
-#define TRKPARAMETERSBASE_SURFACEUNIQUEPTRT_H
-
+#ifndef TRKEVENTPRIMITIVES_SURFACEUNIQUEPTRT_H
+#define TRKEVENTPRIMITIVES_SURFACEUNIQUEPTRT_H
 
 namespace Trk {
 
-
 template <class S>
 class SurfaceDeleter
 {
@@ -29,12 +27,9 @@ public:
   }
 };
 
-
 template <class S>
 using SurfaceUniquePtrT = std::unique_ptr<S, SurfaceDeleter<S> >;
 
-
 } // namespace Trk
 
-
-#endif // not TRKPARAMETERSBASE_SURFACEUNIQUEPTRT_H
+#endif 
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
index 718216f5848dc4ba5387ec42981de17b7ef1511a..4c725f27ef6e9757124ce69bdb948ef8f9392632 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
@@ -9,17 +9,14 @@
 #ifndef TRKPARAMETERSBASE_CURVILINEARPARAMETERS_T_H
 #define TRKPARAMETERSBASE_CURVILINEARPARAMETERS_T_H
 
-// STL
-#include <memory>
+#include "TrkParametersBase/ParametersBase.h"
 
-// Amg
 #include "EventPrimitives/EventPrimitives.h"
 #include "GeoPrimitives/GeoPrimitives.h"
-// Tracking includes
 #include "TrkEventPrimitives/CurvilinearUVT.h"
-#include "TrkParametersBase/ParametersBase.h"
-#include "TrkParametersBase/SurfaceUniquePtrT.h"
+#include "TrkEventPrimitives/SurfaceUniquePtrT.h"
 
+#include <memory>
 class MsgStream;
 
 namespace Trk {
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h
index 422614b040054b247ba6560be39b8b81da400e5d..348e3ad828166cbf5699ae832088770082b6ac67 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h
@@ -9,12 +9,10 @@
 #ifndef TRKPARAMETERSBASE_PARAMETERS_T_H
 #define TRKPARAMETERSBASE_PARAMETERS_T_H
 
-// Trk includes
 #include "TrkParametersBase/ParametersBase.h"
-// Amg
 #include "EventPrimitives/EventPrimitives.h"
 #include "GeoPrimitives/GeoPrimitives.h"
-#include "TrkParametersBase/SurfaceUniquePtrT.h"
+#include "TrkEventPrimitives/SurfaceUniquePtrT.h"
 
 /*
  * Needed for persistency