diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h
index 348e3ad828166cbf5699ae832088770082b6ac67..d7f0fa08279d5b5ec6dd15de54edb3be687e21ea 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h
@@ -9,11 +9,11 @@
 #ifndef TRKPARAMETERSBASE_PARAMETERS_T_H
 #define TRKPARAMETERSBASE_PARAMETERS_T_H
 
-#include "TrkParametersBase/ParametersBase.h"
 #include "EventPrimitives/EventPrimitives.h"
 #include "GeoPrimitives/GeoPrimitives.h"
 #include "TrkEventPrimitives/SurfaceUniquePtrT.h"
-
+#include "TrkParametersBase/ParametersBase.h"
+#include "TrkSurfaces/Surface.h"
 /*
  * Needed for persistency
  * friends
@@ -50,6 +50,13 @@ template<int DIM, class T, class S>
 class ParametersT : public ParametersBase<DIM, T>
 {
 public:
+  static_assert(
+    (S::staticType == Surface::Cone || S::staticType == Surface::Cylinder ||
+     S::staticType == Surface::Disc || S::staticType == Surface::Perigee ||
+     S::staticType == Surface::Plane || S::staticType == Surface::Line),
+    "The surface type must be one of Cone, Cylinder, Disc, Perigee, Plane, "
+    "Line");
+
   /**
    * default constructor ONLY for POOL
    */
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc
index cc6c53d923b105cb60628693d11647438049d769..c8c9e0778a515fa84164523f882e9d0462208d3c 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc
@@ -11,7 +11,6 @@
 #include <utility>
 // Trk
 #include "TrkEventPrimitives/ParamDefs.h"
-#include "TrkSurfaces/Surface.h"
 
 namespace Trk {