diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 1f90106ae..52f71e363 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -435,7 +435,6 @@ list (APPEND PUBLIC_HEADER_FILES
   ebos/eclproblem.hh
   ebos/eclproblem_properties.hh
   ebos/eclsolutioncontainers.hh
-  ebos/ecltimesteppingparams.hh
   ebos/eclthresholdpressure.hh
   ebos/ecltracermodel.hh
   ebos/ecltransmissibility.hh
@@ -536,6 +535,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp
   opm/simulators/timestepping/AdaptiveTimeStepping.hpp
   opm/simulators/timestepping/ConvergenceReport.hpp
+  opm/simulators/timestepping/EclTimeSteppingParams.hpp
   opm/simulators/timestepping/TimeStepControl.hpp
   opm/simulators/timestepping/TimeStepControlInterface.hpp
   opm/simulators/timestepping/SimulatorTimer.hpp
diff --git a/ebos/ebos.hh b/ebos/ebos.hh
index 7845ba32a..bc6cf5f80 100644
--- a/ebos/ebos.hh
+++ b/ebos/ebos.hh
@@ -29,12 +29,12 @@
 #define EBOS_HH
 
 #include <ebos/eclproblem.hh>
-#include <ebos/ecltimesteppingparams.hh>
 
 #include <opm/models/utils/start.hh>
 
 #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
 #include <opm/simulators/linalg/ISTLSolver.hpp>
+#include <opm/simulators/timestepping/EclTimeSteppingParams.hpp>
 #include <opm/simulators/wells/BlackoilWellModel.hpp>
 
 namespace Opm {
diff --git a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
index 4d9adc332..bf6d0ed5e 100644
--- a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
+++ b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
@@ -10,8 +10,6 @@
 #include <dune/istl/ilu.hh>
 #endif
 
-#include <ebos/ecltimesteppingparams.hh>
-
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
@@ -30,6 +28,7 @@
 #include <opm/models/utils/propertysystem.hh>
 
 #include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp>
+#include <opm/simulators/timestepping/EclTimeSteppingParams.hpp>
 #include <opm/simulators/timestepping/SimulatorReport.hpp>
 #include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/simulators/timestepping/TimeStepControl.hpp>
diff --git a/ebos/ecltimesteppingparams.hh b/opm/simulators/timestepping/EclTimeSteppingParams.hpp
similarity index 96%
rename from ebos/ecltimesteppingparams.hh
rename to opm/simulators/timestepping/EclTimeSteppingParams.hpp
index 93f2b3244..36389c8b5 100644
--- a/ebos/ecltimesteppingparams.hh
+++ b/opm/simulators/timestepping/EclTimeSteppingParams.hpp
@@ -20,10 +20,10 @@
   module for the precise wording of the license and the list of
   copyright holders.
 */
-#ifndef ECL_TIMESTEPPING_PARAMS_HH
-#define ECL_TIMESTEPPING_PARAMS_HH
+#ifndef OPM_ECL_TIMESTEPPING_PARAMS_HPP
+#define OPM_ECL_TIMESTEPPING_PARAMS_HPP
 
-#include "opm/models/utils/basicproperties.hh"
+#include <opm/models/utils/basicproperties.hh>
 #include <opm/models/utils/propertysystem.hh>
 
 namespace Opm::Properties {
@@ -133,4 +133,4 @@ void registerEclTimeSteppingParameters()
 
 } // namespace Opm
 
-#endif // ECL_TIME_STEPPING_PARAMS_HH
+#endif // OPM_ECL_TIME_STEPPING_PARAMS_HPP