diff --git a/applications/plugins/SceneCreator/sceneCreatorExamples/SceneCreatorBenchmarks.cpp b/applications/plugins/SceneCreator/sceneCreatorExamples/SceneCreatorBenchmarks.cpp
index d50a03e4cf4..54a2189d58f 100644
--- a/applications/plugins/SceneCreator/sceneCreatorExamples/SceneCreatorBenchmarks.cpp
+++ b/applications/plugins/SceneCreator/sceneCreatorExamples/SceneCreatorBenchmarks.cpp
@@ -21,7 +21,7 @@
 ******************************************************************************/
 
 #include <SceneCreator/SceneCreator.h>
-#include <sofa/helper/ArgumentParser.h>
+#include <sofa/gui/ArgumentParser.h>
 
 #include <sofa/gui/GUIManager.h>
 #include <SofaGui/initSofaGui.h>
@@ -108,7 +108,7 @@ int main(int argc, char** argv)
 
     bool showHelp = false;
     unsigned int idExample = 0;
-    ArgumentParser* argParser = new ArgumentParser(argc, argv);
+    auto* argParser = new sofa::gui::ArgumentParser(argc, argv);
     argParser->addArgument(
         boost::program_options::value<bool>(&showHelp)
         ->default_value(false)
diff --git a/applications/projects/runSofa/Main.cpp b/applications/projects/runSofa/Main.cpp
index 41ad34ff201..6c32f0529a8 100644
--- a/applications/projects/runSofa/Main.cpp
+++ b/applications/projects/runSofa/Main.cpp
@@ -99,11 +99,11 @@ using sofa::helper::logging::ClangMessageHandler ;
 #include <sofa/helper/logging/ExceptionMessageHandler.h>
 using sofa::helper::logging::ExceptionMessageHandler;
 
-#include <boost/program_options.hpp>
+#include <sofa/gui/ArgumentParser.h>
 
 
 
-void addGUIParameters(ArgumentParser* argumentParser)
+void addGUIParameters(sofa::gui::ArgumentParser* argumentParser)
 {
     GUIManager::RegisterParameters(argumentParser);
 }
@@ -187,7 +187,7 @@ int main(int argc, char** argv)
     gui_help += GUIManager::ListSupportedGUI('|');
     gui_help += ")";
 
-    ArgumentParser* argParser = new ArgumentParser(argc, argv);
+    sofa::gui::ArgumentParser* argParser = new sofa::gui::ArgumentParser(argc, argv);
     argParser->addArgument(
         boost::program_options::value<bool>(&showHelp)
         ->default_value(false)
diff --git a/applications/tutorials/chainHybrid/chainHybrid.cpp b/applications/tutorials/chainHybrid/chainHybrid.cpp
index 06bf3898580..eddc268283c 100644
--- a/applications/tutorials/chainHybrid/chainHybrid.cpp
+++ b/applications/tutorials/chainHybrid/chainHybrid.cpp
@@ -31,7 +31,7 @@ using sofa::defaulttype::Rigid3Types;
 using sofa::defaulttype::Rigid3Mass;
 #include <sofa/gui/GUIManager.h>
 #include <SofaGui/initSofaGui.h>
-#include <sofa/helper/ArgumentParser.h>
+#include <sofa/gui/ArgumentParser.h>
 #include <sofa/helper/system/FileRepository.h>
 #include <sofa/helper/system/PluginManager.h>
 #include <sofa/simulation/Node.h>
@@ -232,7 +232,7 @@ Node *createChainHybrid(Node *root)
 
 int main(int argc, char** argv)
 {
-    ArgumentParser argParser(argc, argv);
+    sofa::gui::ArgumentParser argParser(argc, argv);
     sofa::gui::GUIManager::RegisterParameters(&argParser);
     argParser.parse();
 
diff --git a/applications/tutorials/oneTetrahedron/oneTetrahedron.cpp b/applications/tutorials/oneTetrahedron/oneTetrahedron.cpp
index 752c8681a52..ca38157672a 100644
--- a/applications/tutorials/oneTetrahedron/oneTetrahedron.cpp
+++ b/applications/tutorials/oneTetrahedron/oneTetrahedron.cpp
@@ -30,7 +30,7 @@ using Coord3 = sofa::defaulttype::Vector3;
 using VecCoord3 = sofa::helper::vector<Coord3>;
 #include <sofa/gui/GUIManager.h>
 #include <SofaGui/initSofaGui.h>
-#include <sofa/helper/ArgumentParser.h>
+#include <sofa/gui/ArgumentParser.h>
 #include <sofa/helper/system/FileRepository.h>
 #include <sofa/simulation/Node.h>
 
@@ -74,7 +74,7 @@ using sofa::simulation::Node;
 // ---------------------------------------------------------------------
 int main(int argc, char** argv)
 {
-    ArgumentParser argParser(argc, argv);
+    sofa::gui::ArgumentParser argParser(argc, argv);
     sofa::gui::GUIManager::RegisterParameters(&argParser);
     argParser.parse();
 
diff --git a/modules/SofaGuiCommon/src/sofa/gui/BaseGUI.cpp b/modules/SofaGuiCommon/src/sofa/gui/BaseGUI.cpp
index fdfedad0f88..004ee52088f 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/BaseGUI.cpp
+++ b/modules/SofaGuiCommon/src/sofa/gui/BaseGUI.cpp
@@ -21,19 +21,21 @@
 ******************************************************************************/
 #include "BaseGUI.h"
 #include "BaseViewer.h"
-#include <sofa/core/objectmodel/ConfigurationSetting.h>
+
 #include <sofa/helper/vector.h>
 #include <sofa/helper/Utils.h>
 #include <sofa/helper/system/FileSystem.h>
 
-#include <SofaGraphComponent/SofaDefaultPathSetting.h>
-#include <SofaGraphComponent/StatsSetting.h>
+#include <sofa/core/objectmodel/ConfigurationSetting.h>
 #include <SofaBaseVisual/BackgroundSetting.h>
+#include <SofaGraphComponent/ViewerSetting.h>
+#include <SofaGraphComponent/StatsSetting.h>
+#include <SofaGraphComponent/MouseButtonSetting.h>
+#include <SofaGraphComponent/SofaDefaultPathSetting.h>
 
 #include <algorithm>
 #include <cstring>
 
-
 #include <sofa/simulation/ExportGnuplotVisitor.h>
 
 using namespace sofa::simulation;
diff --git a/modules/SofaGuiCommon/src/sofa/gui/BaseGUI.h b/modules/SofaGuiCommon/src/sofa/gui/BaseGUI.h
index 7901cae2de1..92f560daee0 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/BaseGUI.h
+++ b/modules/SofaGuiCommon/src/sofa/gui/BaseGUI.h
@@ -22,20 +22,23 @@
 #pragma once
 
 #include <sofa/gui/config.h>
+
+#include <sofa/type/RGBAColor.h>
 #include <sofa/defaulttype/Vec.h>
-#include <SofaGraphComponent/ViewerSetting.h>
-#include <SofaGraphComponent/MouseButtonSetting.h>
-#include <sofa/helper/ArgumentParser.h>
 #include <sofa/simulation/fwd.h>
-using sofa::helper::ArgumentParser;
 
-#include <list>
+namespace sofa::component::configurationsetting
+{
+    class ViewerSetting;
+    class MouseButtonSetting;
 
+} // namespace sofa::component::configurationsetting
 
 namespace sofa::gui
 {
 
 class BaseViewer;
+class ArgumentParser;
 
 class SOFA_SOFAGUICOMMON_API BaseGUI
 {
@@ -74,7 +77,7 @@ class SOFA_SOFAGUICOMMON_API BaseGUI
     virtual void setViewerConfiguration(sofa::component::configurationsetting::ViewerSetting* /*viewerConf*/) {}
     virtual void setViewerResolution(int /* width */, int /* height */) {}
     virtual void setFullScreen() {}
-    virtual void setBackgroundColor(const sofa::helper::types::RGBAColor& /*color*/) {}
+    virtual void setBackgroundColor(const sofa::type::RGBAColor& /*color*/) {}
     virtual void setBackgroundImage(const std::string& /*image*/) {}
 
     virtual BaseViewer* getViewer() {return nullptr;}
diff --git a/modules/SofaGuiCommon/src/sofa/gui/BaseViewer.cpp b/modules/SofaGuiCommon/src/sofa/gui/BaseViewer.cpp
index d2c9c39a1a7..a1a4bba6bc9 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/BaseViewer.cpp
+++ b/modules/SofaGuiCommon/src/sofa/gui/BaseViewer.cpp
@@ -26,6 +26,8 @@
 #include <sofa/helper/Factory.inl>
 #include <SofaBaseVisual/VisualStyle.h>
 #include <sofa/core/visual/DisplayFlags.h>
+#include <SofaGraphComponent/ViewerSetting.h>
+#include <SofaBaseVisual/InteractiveCamera.h>
 
 namespace sofa::gui
 {
diff --git a/modules/SofaGuiCommon/src/sofa/gui/BaseViewer.h b/modules/SofaGuiCommon/src/sofa/gui/BaseViewer.h
index d2ac6c2c897..d9ce7f3e70a 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/BaseViewer.h
+++ b/modules/SofaGuiCommon/src/sofa/gui/BaseViewer.h
@@ -20,37 +20,27 @@
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
 #pragma once
-#include "sofa/config.h"
-
 #include <sofa/gui/config.h>
 
 #include "ColourPickingVisitor.h"
 
 #include <sofa/helper/Factory.h>
-#include <sofa/core/ObjectFactory.h>
-#include <sofa/core/CollisionModel.h>
-
 #include <sofa/helper/system/FileRepository.h>
 #include <sofa/helper/system/SetDirectory.h>
-
-#include <sofa/core/objectmodel/KeypressedEvent.h>
-#include <sofa/core/objectmodel/KeyreleasedEvent.h>
-#include <sofa/core/objectmodel/MouseEvent.h>
-#include <SofaGraphComponent/ViewerSetting.h>
-
+#include <sofa/core/ObjectFactory.h>
 #include <sofa/core/visual/VisualParams.h>
-
-//instruments handling
-#include <SofaUserInteraction/Controller.h>
-#include <sofa/simulation/MechanicalVisitor.h>
-#include <sofa/simulation/UpdateMappingVisitor.h>
 #include <sofa/simulation/Node.h>
-#include <SofaBaseVisual/InteractiveCamera.h>
 
-#include <sofa/helper/io/Image.h>
+#include <SofaBaseVisual/BaseCamera.h>
 
 #include <string>
 
+namespace sofa::component::configurationsetting
+{
+    class ViewerSetting;
+
+} // namespace sofa::component::configurationsetting
+
 namespace sofa::gui
 {
 
diff --git a/modules/SofaGuiCommon/src/sofa/gui/BatchGUI.cpp b/modules/SofaGuiCommon/src/sofa/gui/BatchGUI.cpp
index 33dcd8b9f59..2b4b20c5d3e 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/BatchGUI.cpp
+++ b/modules/SofaGuiCommon/src/sofa/gui/BatchGUI.cpp
@@ -20,18 +20,21 @@
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
 #include "BatchGUI.h"
-#include <sofa/simulation/Simulation.h>
+
 #include <sofa/helper/AdvancedTimer.h>
+#include <sofa/helper/system/thread/CTime.h>
+#include <sofa/simulation/Simulation.h>
 #include <sofa/simulation/UpdateContextVisitor.h>
 #include <sofa/simulation/Node.h>
-#include <sofa/helper/system/thread/CTime.h>
-#include <fstream>
-#include <iomanip>
-#include <string>
 #include <sofa/helper/system/SetDirectory.h>
+#include <sofa/gui/ArgumentParser.h>
 
 #include <boost/program_options.hpp>
 
+#include <fstream>
+#include <string>
+#include <iomanip>
+
 namespace sofa::gui
 {
 
diff --git a/modules/SofaGuiCommon/src/sofa/gui/BatchGUI.h b/modules/SofaGuiCommon/src/sofa/gui/BatchGUI.h
index 2258c401553..3d839579813 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/BatchGUI.h
+++ b/modules/SofaGuiCommon/src/sofa/gui/BatchGUI.h
@@ -23,14 +23,14 @@
 
 #include <sofa/gui/BaseGUI.h>
 #include <sofa/simulation/fwd.h>
-#include <sofa/helper/ArgumentParser.h>
 #include <string>
-
-using sofa::helper::ArgumentParser;
+#include <sstream>
 
 namespace sofa::gui
 {
 
+class ArgumentParser;
+
 class SOFA_SOFAGUICOMMON_API BatchGUI : public BaseGUI
 {
 
diff --git a/modules/SofaGuiCommon/src/sofa/gui/ColourPickingVisitor.cpp b/modules/SofaGuiCommon/src/sofa/gui/ColourPickingVisitor.cpp
index 4be6aabe214..671aab2421a 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/ColourPickingVisitor.cpp
+++ b/modules/SofaGuiCommon/src/sofa/gui/ColourPickingVisitor.cpp
@@ -20,15 +20,18 @@
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
 #include <sofa/gui/ColourPickingVisitor.h>
+
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/simulation/Node.h>
-#include <sofa/core/visual/VisualParams.h>
+
+#include <SofaBaseCollision/SphereModel.h>
+#include <SofaMeshCollision/TriangleModel.h>
+
 #if SOFAGUICOMMON_HAVE_SOFA_GL == 1
 #include <sofa/gl/gl.h>
 #include <sofa/gl/BasicShapes.h>
 #endif // SOFAGUICOMMON_HAVE_SOFA_GL  == 1
-#include <SofaBaseCollision/SphereModel.h>
-#include <SofaMeshCollision/TriangleModel.h>
+
 namespace sofa::gui
 {
 
diff --git a/modules/SofaGuiCommon/src/sofa/gui/FilesRecentlyOpenedManager.h b/modules/SofaGuiCommon/src/sofa/gui/FilesRecentlyOpenedManager.h
index 63c1d840c88..ff27c926722 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/FilesRecentlyOpenedManager.h
+++ b/modules/SofaGuiCommon/src/sofa/gui/FilesRecentlyOpenedManager.h
@@ -20,11 +20,12 @@
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
 #pragma once
+#include <sofa/gui/config.h>
+
 #include <sofa/helper/vector.h>
 
 #include <string>
 
-#include <sofa/gui/config.h>
 
 namespace sofa::gui
 {
diff --git a/modules/SofaGuiCommon/src/sofa/gui/GUIManager.cpp b/modules/SofaGuiCommon/src/sofa/gui/GUIManager.cpp
index 856ce0bc5a8..ef04f970f22 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/GUIManager.cpp
+++ b/modules/SofaGuiCommon/src/sofa/gui/GUIManager.cpp
@@ -19,17 +19,20 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <fstream>
-
 #include "GUIManager.h"
+
 #include "BaseGUI.h"
-#include <SofaBase/initSofaBase.h>
-#include <SofaSimulationCommon/init.h>
-#include <sofa/helper/system/FileSystem.h>
+#include <sofa/gui/ArgumentParser.h>
+
 #include <sofa/helper/Utils.h>
 #include <sofa/helper/logging/Messaging.h>
+#include <sofa/helper/system/FileSystem.h>
 #include <sofa/helper/system/FileRepository.h>
 #include <sofa/simulation/Node.h>
+#include <SofaBase/initSofaBase.h>
+#include <SofaSimulationCommon/init.h>
+
+#include <fstream>
 
 using sofa::helper::system::FileSystem;
 using sofa::helper::Utils;
diff --git a/modules/SofaGuiCommon/src/sofa/gui/GUIManager.h b/modules/SofaGuiCommon/src/sofa/gui/GUIManager.h
index c76b72d9969..2e0d642c85d 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/GUIManager.h
+++ b/modules/SofaGuiCommon/src/sofa/gui/GUIManager.h
@@ -20,19 +20,20 @@
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
 #pragma once
-#include <sofa/helper/ArgumentParser.h>
-#include <sofa/simulation/fwd.h>
 #include <sofa/gui/config.h>
+
+#include <sofa/simulation/fwd.h>
+
 #include <vector>
 #include <string>
 #include <list>
 
-using sofa::helper::ArgumentParser;
 
 namespace sofa::gui
 {
-class BaseGUI;
 
+class BaseGUI;
+class ArgumentParser;
 
 class SOFA_SOFAGUICOMMON_API GUIManager
 {
diff --git a/modules/SofaGuiCommon/src/sofa/gui/GuiDataRepository.h b/modules/SofaGuiCommon/src/sofa/gui/GuiDataRepository.h
index f952748023e..c7aed4cd33b 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/GuiDataRepository.h
+++ b/modules/SofaGuiCommon/src/sofa/gui/GuiDataRepository.h
@@ -19,9 +19,11 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
+#include <sofa/gui/config.h>
+
 #include <sofa/helper/system/FileRepository.h>
 
 namespace sofa::gui
 {
-    extern SOFA_HELPER_API sofa::helper::system::FileRepository GuiDataRepository;
+    extern SOFA_SOFAGUICOMMON_API sofa::helper::system::FileRepository GuiDataRepository;
 } // namespace sofa::gui
diff --git a/modules/SofaGuiCommon/src/sofa/gui/MouseOperations.h b/modules/SofaGuiCommon/src/sofa/gui/MouseOperations.h
index 4db172d4331..33ba31094f7 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/MouseOperations.h
+++ b/modules/SofaGuiCommon/src/sofa/gui/MouseOperations.h
@@ -21,14 +21,15 @@
 ******************************************************************************/
 #pragma once
 #include <sofa/gui/config.h>
-#include <iostream>
-#include <vector>
+
+#include <sofa/helper/cast.h>
 
 #include <SofaGraphComponent/AddRecordedCameraButtonSetting.h>
 #include <SofaGraphComponent/AttachBodyButtonSetting.h>
 #include <SofaGraphComponent/FixPickedParticleButtonSetting.h>
-#include <sofa/gui/config.h>
-#include <sofa/helper/cast.h>
+
+#include <iostream>
+#include <vector>
 
 namespace sofa::component::collision
 {
diff --git a/modules/SofaGuiCommon/src/sofa/gui/PickHandler.cpp b/modules/SofaGuiCommon/src/sofa/gui/PickHandler.cpp
index cd4f8383257..491de37cb62 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/PickHandler.cpp
+++ b/modules/SofaGuiCommon/src/sofa/gui/PickHandler.cpp
@@ -24,15 +24,10 @@
 #include <SofaUserInteraction/ComponentMouseInteraction.h>
 #include <SofaUserInteraction/RayContact.h>
 
-#include <sofa/simulation/InitVisitor.h>
 #include <sofa/simulation/DeleteVisitor.h>
-#include <sofa/simulation/MechanicalVisitor.h>
 #include <sofa/simulation/Node.h>
 #include <sofa/core/collision/Pipeline.h>
 
-#include <SofaMeshCollision/TriangleModel.h>
-#include <SofaBaseCollision/SphereModel.h>
-
 #include <SofaGraphComponent/MouseButtonSetting.h>
 
 #include <sofa/simulation/mechanicalvisitor/MechanicalPropagateOnlyPositionVisitor.h>
diff --git a/modules/SofaGuiCommon/src/sofa/gui/ViewerFactory.h b/modules/SofaGuiCommon/src/sofa/gui/ViewerFactory.h
index 093f0baf232..455047e42d8 100644
--- a/modules/SofaGuiCommon/src/sofa/gui/ViewerFactory.h
+++ b/modules/SofaGuiCommon/src/sofa/gui/ViewerFactory.h
@@ -155,7 +155,7 @@ class SofaViewerCreator : public Creator< SofaViewerFactory, RealObject >
     }
 };
 
-#if !defined(SOFA_BUILD_SOFAGUI)
+#if !defined(SOFA_BUILD_SOFAGUICOMMON)
 extern template class SOFA_SOFAGUICOMMON_API Factory< std::string, sofa::gui::BaseViewer, sofa::gui::BaseViewerArgument& >;
 #endif
 
diff --git a/modules/SofaGuiQt/src/sofa/gui/qt/RealGUI.cpp b/modules/SofaGuiQt/src/sofa/gui/qt/RealGUI.cpp
index 3250912d882..abf4d09f292 100644
--- a/modules/SofaGuiQt/src/sofa/gui/qt/RealGUI.cpp
+++ b/modules/SofaGuiQt/src/sofa/gui/qt/RealGUI.cpp
@@ -142,7 +142,7 @@ using sofa::gui::qt::DocBrowser;
 
 using sofa::core::ExecParams;
 
-#include <boost/program_options.hpp>
+#include <sofa/gui/ArgumentParser.h>
 
 
 #ifdef SOFA_PML
@@ -813,7 +813,7 @@ void RealGUI::fileOpen ( std::string filename, bool temporaryFile, bool reload )
 
     if( currentSimulation() ) this->unloadScene();
 
-    const std::vector<std::string> sceneArgs = sofa::helper::ArgumentParser::extra_args();
+    const std::vector<std::string> sceneArgs = sofa::gui::ArgumentParser::extra_args();
     mSimulation = sofa::simulation::getSimulation()->load ( filename, reload, sceneArgs );
 
     simulation::getSimulation()->init ( mSimulation.get() );
diff --git a/modules/SofaGuiQt/src/sofa/gui/qt/SofaPluginManager.cpp b/modules/SofaGuiQt/src/sofa/gui/qt/SofaPluginManager.cpp
index 0fe593f207e..91fc16486cc 100644
--- a/modules/SofaGuiQt/src/sofa/gui/qt/SofaPluginManager.cpp
+++ b/modules/SofaGuiQt/src/sofa/gui/qt/SofaPluginManager.cpp
@@ -26,6 +26,7 @@
 #include <sofa/helper/system/FileRepository.h>
 #include <sofa/helper/system/PluginManager.h>
 #include <sofa/helper/system/DynamicLibrary.h>
+#include <sofa/helper/logging/Messaging.h>
 
 #include <QMessageBox>
 #include <QTextEdit>
diff --git a/modules/SofaGuiQt/src/sofa/gui/qt/viewer/SofaViewer.cpp b/modules/SofaGuiQt/src/sofa/gui/qt/viewer/SofaViewer.cpp
index 27b0033344c..de24e540631 100644
--- a/modules/SofaGuiQt/src/sofa/gui/qt/viewer/SofaViewer.cpp
+++ b/modules/SofaGuiQt/src/sofa/gui/qt/viewer/SofaViewer.cpp
@@ -23,6 +23,9 @@
 #include <sofa/helper/Factory.inl>
 #include <SofaBaseVisual/VisualStyle.h>
 #include <sofa/core/visual/DisplayFlags.h>
+#include <sofa/core/objectmodel/KeypressedEvent.h>
+#include <sofa/core/objectmodel/KeyreleasedEvent.h>
+#include <sofa/core/objectmodel/MouseEvent.h>
 #include <sofa/gui/qt/PickHandlerCallBacks.h>
 #include <sofa/gui/BaseGUI.h>
 
diff --git a/modules/SofaGuiQt/src/sofa/gui/qt/viewer/qgl/QtGLViewer.cpp b/modules/SofaGuiQt/src/sofa/gui/qt/viewer/qgl/QtGLViewer.cpp
index 40bf83a3603..a1f4e1eae4f 100644
--- a/modules/SofaGuiQt/src/sofa/gui/qt/viewer/qgl/QtGLViewer.cpp
+++ b/modules/SofaGuiQt/src/sofa/gui/qt/viewer/qgl/QtGLViewer.cpp
@@ -27,6 +27,7 @@
 #include <sofa/simulation/UpdateMappingVisitor.h>
 #include <sofa/core/objectmodel/KeypressedEvent.h>
 #include <sofa/core/objectmodel/KeyreleasedEvent.h>
+#include <sofa/core/objectmodel/MouseEvent.h>
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/gui/ColourPickingVisitor.h>
 #include <cmath>
diff --git a/modules/SofaHeadlessRecorder/src/SofaHeadlessRecorder/HeadlessRecorder.cpp b/modules/SofaHeadlessRecorder/src/SofaHeadlessRecorder/HeadlessRecorder.cpp
index 72b80b323a9..d3c2e75bf85 100644
--- a/modules/SofaHeadlessRecorder/src/SofaHeadlessRecorder/HeadlessRecorder.cpp
+++ b/modules/SofaHeadlessRecorder/src/SofaHeadlessRecorder/HeadlessRecorder.cpp
@@ -30,7 +30,7 @@ using sofa::helper::system::SetDirectory;
 #include <sofa/simulation/Node.h>
 #include <sofa/gl/Texture.h>
 
-#include <boost/program_options.hpp>
+#include <sofa/gui/ArgumentParser.h>
 #include <thread>
 #include <chrono>