diff --git a/src/solver/application/ScenarioBuilderOwner.cpp b/src/solver/application/ScenarioBuilderOwner.cpp
index 98903f10dc..ef6084fed5 100644
--- a/src/solver/application/ScenarioBuilderOwner.cpp
+++ b/src/solver/application/ScenarioBuilderOwner.cpp
@@ -19,11 +19,12 @@
 ** along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
 */
 
-#include "antares/application/ScenarioBuilderOwner.h"
 #include <antares/antares/fatal-error.h>
+#include <antares/application/ScenarioBuilderOwner.h>
 #include "antares/solver/simulation/apply-scenario.h"
 #include "antares/solver/simulation/timeseries-numbers.h"
 #include "antares/solver/ts-generator/generator.h"
+#include "antares/study/study.h"
 
 Antares::Solver::ScenarioBuilderOwner::ScenarioBuilderOwner(Data::Study& study):
     study_(study)
diff --git a/src/solver/application/application.cpp b/src/solver/application/application.cpp
index 3afc5c8775..7edd54a794 100644
--- a/src/solver/application/application.cpp
+++ b/src/solver/application/application.cpp
@@ -23,6 +23,7 @@
 #include <yuni/datetime/timestamp.h>
 
 #include <antares/antares/fatal-error.h>
+#include <antares/application/ScenarioBuilderOwner.h>
 #include <antares/benchmarking/timer.h>
 #include <antares/checks/checkLoadedInputData.h>
 #include <antares/exception/LoadingError.hpp>
@@ -33,7 +34,6 @@
 #include <antares/sys/policy.h>
 #include <antares/writer/writer_factory.h>
 #include "antares/antares/version.h"
-#include "antares/application/ScenarioBuilderOwner.h"
 #include "antares/config/config.h"
 #include "antares/file-tree-study-loader/FileTreeStudyLoader.h"
 #include "antares/signal-handling/public.h"
diff --git a/src/solver/application/include/antares/application/ScenarioBuilderOwner.h b/src/solver/application/include/antares/application/ScenarioBuilderOwner.h
index 2181d23c67..dd9357eee9 100644
--- a/src/solver/application/include/antares/application/ScenarioBuilderOwner.h
+++ b/src/solver/application/include/antares/application/ScenarioBuilderOwner.h
@@ -20,11 +20,9 @@
 */
 #pragma once
 
-#include "antares/study/study.h"
-
 namespace Antares::Solver
 {
-
+class Study;
 class ScenarioBuilderOwner
 {
 public:
diff --git a/src/solver/hydro/include/antares/solver/hydro/management/HydroInputsChecker.h b/src/solver/hydro/include/antares/solver/hydro/management/HydroInputsChecker.h
index 84efdb1ff0..bc2d5191cf 100644
--- a/src/solver/hydro/include/antares/solver/hydro/management/HydroInputsChecker.h
+++ b/src/solver/hydro/include/antares/solver/hydro/management/HydroInputsChecker.h
@@ -23,7 +23,7 @@
 #include "antares/date/date.h"
 #include "antares/solver/hydro/management/MinGenerationScaling.h"
 #include "antares/solver/hydro/management/PrepareInflows.h"
-
+#include "antares/study/study.h"
 namespace Antares
 {