diff --git a/src/BeamAdapter/component/BeamInterpolation.cpp b/src/BeamAdapter/component/BeamInterpolation.cpp
index c3a225c7..2c00c629 100644
--- a/src/BeamAdapter/component/BeamInterpolation.cpp
+++ b/src/BeamAdapter/component/BeamInterpolation.cpp
@@ -33,6 +33,7 @@
 #define SOFA_PLUGIN_BEAMADAPTER_BEAMINTERPOLATION_CPP
 
 #include <sofa/defaulttype/RigidTypes.h>
+#include <BeamAdapter/config.h>
 #include <sofa/core/ObjectFactory.h>
 
 /// This define is here to prevent the declaration of the template instances as "extern".
diff --git a/src/BeamAdapter/component/constraint/AdaptiveBeamSlidingConstraint.cpp b/src/BeamAdapter/component/constraint/AdaptiveBeamSlidingConstraint.cpp
index 9dfb476b..de8e3a62 100644
--- a/src/BeamAdapter/component/constraint/AdaptiveBeamSlidingConstraint.cpp
+++ b/src/BeamAdapter/component/constraint/AdaptiveBeamSlidingConstraint.cpp
@@ -23,6 +23,7 @@
 
 //////////////////////// Inclusion of headers...from wider to narrower/closer //////////////////////
 #include <sofa/component/statecontainer/MechanicalObject.h>
+#include <BeamAdapter/config.h>
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/defaulttype/VecTypes.h>
 
diff --git a/src/BeamAdapter/component/controller/AdaptiveBeamController.cpp b/src/BeamAdapter/component/controller/AdaptiveBeamController.cpp
index 8a2c10a7..d4094b39 100644
--- a/src/BeamAdapter/component/controller/AdaptiveBeamController.cpp
+++ b/src/BeamAdapter/component/controller/AdaptiveBeamController.cpp
@@ -34,18 +34,16 @@
 #define SOFA_PLUGIN_BEAMADAPTER_ADAPTIVEBEAMCONTROLLER_CPP
 
 //////////////////////// Inclusion of headers...from wider to narrower/closer //////////////////////
+#include <BeamAdapter/config.h>
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/defaulttype/RigidTypes.h>
 
-#include <BeamAdapter/config.h>
 #include <BeamAdapter/component/controller/AdaptiveBeamController.inl>
 
-
-namespace sofa::component::controller::_adaptivebeamcontroller_
+namespace sofa::component::controller
 {
 
-using sofa::defaulttype::Rigid3Types;
 using sofa::defaulttype::Rigid3Types;
 using core::RegisterObject;
 
@@ -58,13 +56,13 @@ using core::RegisterObject;
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 //TODO(dmarchal 2017-06-01): Il faut remplacer les descriptions dans RegisterObject par un vrai description
-static int AdaptiveBeamControllerClass = RegisterObject("Adaptive beam controller")
+int AdaptiveBeamControllerClass = RegisterObject("Adaptive beam controller")
 .add< AdaptiveBeamController<Rigid3Types> >()
 ;
 
 template class SOFA_BEAMADAPTER_API AdaptiveBeamController<Rigid3Types>;
 
 
-} // namespace sofa::component::controller::_adaptivebeamcontroller_
+} // namespace sofa::component::controller
 
 
diff --git a/src/BeamAdapter/component/controller/AdaptiveBeamController.h b/src/BeamAdapter/component/controller/AdaptiveBeamController.h
index a6252580..7d8bb3c3 100644
--- a/src/BeamAdapter/component/controller/AdaptiveBeamController.h
+++ b/src/BeamAdapter/component/controller/AdaptiveBeamController.h
@@ -43,6 +43,7 @@
 #include <BeamAdapter/component/BeamInterpolation.h>
 #include <sofa/component/topology/container/dynamic/EdgeSetGeometryAlgorithms.h>
 #include <sofa/component/topology/container/dynamic/EdgeSetTopologyModifier.h>
+#include <BeamAdapter/config.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 /// Declarations
diff --git a/src/BeamAdapter/component/controller/BeamAdapterActionController.cpp b/src/BeamAdapter/component/controller/BeamAdapterActionController.cpp
index 604c673c..2ba73ecb 100644
--- a/src/BeamAdapter/component/controller/BeamAdapterActionController.cpp
+++ b/src/BeamAdapter/component/controller/BeamAdapterActionController.cpp
@@ -21,11 +21,11 @@
 ******************************************************************************/
 #define SOFA_PLUGIN_BEAMADAPTER_ACTIONCONTROLLER_CPP
 
+#include <BeamAdapter/config.h>
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/defaulttype/RigidTypes.h>
 
-#include <BeamAdapter/config.h>
 #include <BeamAdapter/component/controller/BeamAdapterActionController.inl>
 
 namespace sofa::component::controller
diff --git a/src/BeamAdapter/component/controller/InterventionalRadiologyController.cpp b/src/BeamAdapter/component/controller/InterventionalRadiologyController.cpp
index 716c8b6f..bd2a9ddf 100644
--- a/src/BeamAdapter/component/controller/InterventionalRadiologyController.cpp
+++ b/src/BeamAdapter/component/controller/InterventionalRadiologyController.cpp
@@ -32,11 +32,11 @@
 //
 #define SOFA_PLUGIN_BEAMADAPTER_INTERVENTIONALRADIOCONTROLLER_CPP
 
+#include <BeamAdapter/config.h>
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/defaulttype/VecTypes.h>
 #include <sofa/defaulttype/RigidTypes.h>
 
-#include <BeamAdapter/config.h>
 #include <BeamAdapter/component/controller/InterventionalRadiologyController.inl>
 
 
diff --git a/src/BeamAdapter/component/controller/SutureController.cpp b/src/BeamAdapter/component/controller/SutureController.cpp
index 5f322528..f56cea48 100644
--- a/src/BeamAdapter/component/controller/SutureController.cpp
+++ b/src/BeamAdapter/component/controller/SutureController.cpp
@@ -32,6 +32,7 @@
 //
 #define SOFA_PLUGIN_BEAMADAPTER_SUTURECONTROLLER_CPP
 
+#include <BeamAdapter/config.h>
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/defaulttype/RigidTypes.h>
 
diff --git a/src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.cpp b/src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.cpp
index 892221b2..82eb192c 100644
--- a/src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.cpp
+++ b/src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.cpp
@@ -34,6 +34,7 @@
 
 //////////////////////// Inclusion of headers...from wider to narrower/closer //////////////////////
 #include <sofa/defaulttype/RigidTypes.h>
+#include <BeamAdapter/config.h>
 #include <sofa/core/ObjectFactory.h>
 
 #include <BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.inl>
diff --git a/src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.cpp b/src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.cpp
index 44fa6b3d..45b2b1b9 100644
--- a/src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.cpp
+++ b/src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.cpp
@@ -34,6 +34,7 @@
 
 //////////////////////// Inclusion of headers...from wider to narrower/closer //////////////////////
 #include <sofa/defaulttype/RigidTypes.h>
+#include <BeamAdapter/config.h>
 #include <sofa/core/ObjectFactory.h>
 #include <BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.inl>
 
diff --git a/src/BeamAdapter/component/mapping/AdaptiveBeamMapping.cpp b/src/BeamAdapter/component/mapping/AdaptiveBeamMapping.cpp
index e8c17286..670fa3eb 100644
--- a/src/BeamAdapter/component/mapping/AdaptiveBeamMapping.cpp
+++ b/src/BeamAdapter/component/mapping/AdaptiveBeamMapping.cpp
@@ -34,6 +34,7 @@
 
 //////////////////////// Inclusion of headers...from wider to narrower/closer //////////////////////
 #include <sofa/core/behavior/MechanicalState.h>
+#include <BeamAdapter/config.h>
 #include <sofa/core/ObjectFactory.h>
 
 #include <BeamAdapter/component/mapping/AdaptiveBeamMapping.inl>
diff --git a/src/BeamAdapter/component/mapping/BeamLengthMapping.cpp b/src/BeamAdapter/component/mapping/BeamLengthMapping.cpp
index 0606eefd..89a9a6ab 100644
--- a/src/BeamAdapter/component/mapping/BeamLengthMapping.cpp
+++ b/src/BeamAdapter/component/mapping/BeamLengthMapping.cpp
@@ -34,6 +34,7 @@
 //////////////////////// Inclusion of headers...from wider to narrower/closer //////////////////////
 #define BEAMADAPTER_BEAMLENGTHMAPPING_CPP
 #include <sofa/core/behavior/MechanicalState.h>
+#include <BeamAdapter/config.h>
 #include <sofa/core/ObjectFactory.h>
 
 #include <BeamAdapter/component/mapping/BeamLengthMapping.inl>