diff --git a/Modules/Visualization/Mapla/src/mvdMaplaApplication.cxx b/Modules/Visualization/Mapla/src/mvdMaplaApplication.cxx
index 4a1a871a2765d59d932c377223b97e22f0433a24..0096d801ee41af7a3797ec5ae8d5b74dfb7c7232 100644
--- a/Modules/Visualization/Mapla/src/mvdMaplaApplication.cxx
+++ b/Modules/Visualization/Mapla/src/mvdMaplaApplication.cxx
@@ -31,6 +31,7 @@
 
 //
 // OTB includes (sorted by alphabetic order)
+#include "otbWrapperApplicationRegistry.h"
 
 //
 // Monteverdi includes (sorted by alphabetic order)
@@ -74,6 +75,7 @@ MaplaApplication
 MaplaApplication
 ::~MaplaApplication()
 {
+  otb::Wrapper::ApplicationRegistry::CleanRegistry();
 }
 
 /*******************************************************************************/
diff --git a/Modules/Visualization/Monteverdi/src/mvdApplication.cxx b/Modules/Visualization/Monteverdi/src/mvdApplication.cxx
index e42c38f39ab21199b0e4e0d3346581fc1b9ea0b8..265818ade759b107718b230bb87b08208b113826 100644
--- a/Modules/Visualization/Monteverdi/src/mvdApplication.cxx
+++ b/Modules/Visualization/Monteverdi/src/mvdApplication.cxx
@@ -34,6 +34,7 @@
 
 //
 // Monteverdi includes (sorted by alphabetic order)
+#include "mvdMainWindow.h"
 #include "mvdStackedLayerModel.h"
 
 //
@@ -41,6 +42,10 @@
 #  include "mvdOTBApplicationsModel.h"
 #endif
 
+#if USE_OTB_APPS
+#include "otbWrapperApplicationRegistry.h"
+#endif
+
 //
 // Class implementation.
 namespace mvd
@@ -76,6 +81,9 @@ Application
 Application
 ::~Application()
 {
+#if USE_OTB_APPS
+  otb::Wrapper::ApplicationRegistry::CleanRegistry();
+#endif
 }
 
 /*******************************************************************************/