diff --git a/Code/Visu/otbFixedSizeFullImageWidget.h b/Code/Visu/otbFixedSizeFullImageWidget.h
index 0b3ae5b6a28d2394cbfafe9e330d39bff0fad257..a0ba9883c0a94f3f2ff0293704f893396ddb2aa5 100644
--- a/Code/Visu/otbFixedSizeFullImageWidget.h
+++ b/Code/Visu/otbFixedSizeFullImageWidget.h
@@ -18,6 +18,7 @@
 #ifndef __otbFixedSizeFullImageWidget_h
 #define __otbFixedSizeFullImageWidget_h
 
+#include "vcl_deprecated_header.h"
 #include "otbImageWidgetBase.h"
 
 namespace otb
diff --git a/Code/Visu/otbFullResolutionImageWidget.h b/Code/Visu/otbFullResolutionImageWidget.h
index f54df8df4ce1fb0894f86e9f04d57c0b23b4bdcb..0703e1d220cec7482087ba58b4061cbb6a0dc18e 100644
--- a/Code/Visu/otbFullResolutionImageWidget.h
+++ b/Code/Visu/otbFullResolutionImageWidget.h
@@ -18,6 +18,8 @@
 #ifndef __otbFullResolutionImageWidget_h
 #define __otbFullResolutionImageWidget_h
 
+#include "vcl_deprecated_header.h"
+
 #include "otbImageWidgetBase.h"
 
 namespace otb
diff --git a/Code/Visu/otbGluPolygonDrawingHelper.h b/Code/Visu/otbGluPolygonDrawingHelper.h
index f8811ce44d5ddb781a823ab6d84e78783c54eacf..f676de49d174acd7b02dffb39cc9391ea035dae2 100644
--- a/Code/Visu/otbGluPolygonDrawingHelper.h
+++ b/Code/Visu/otbGluPolygonDrawingHelper.h
@@ -18,6 +18,8 @@
 #ifndef __otbGluPolygonDrawingHelper_h
 #define __otbGluPolygonDrawingHelper_h
 
+#include "vcl_deprecated_header.h"
+
 #include <FL/gl.h>
 #  ifdef __APPLE__
 #    include <OpenGL/glu.h>
diff --git a/Code/Visu/otbHistogramAndTransferFunctionWidget.h b/Code/Visu/otbHistogramAndTransferFunctionWidget.h
index 971fbf82bfa793fc3f6d83655a502702f0f3464a..8c96f4c11395d1704696973ca68e7b99123a5067 100644
--- a/Code/Visu/otbHistogramAndTransferFunctionWidget.h
+++ b/Code/Visu/otbHistogramAndTransferFunctionWidget.h
@@ -18,6 +18,8 @@
 #ifndef __otbHistogramAndTransferFunctionWidget_h
 #define __otbHistogramAndTransferFunctionWidget_h
 
+#include "vcl_deprecated_header.h"
+
 #include "itkProcessObject.h"
 #include "itkFixedArray.h"
 #include "otbImageWidgetTransferFunction.h"
diff --git a/Code/Visu/otbImageAlternateViewer.h b/Code/Visu/otbImageAlternateViewer.h
index 377ee83a90ae069275a14f8d5ebcbe73412a9445..8cb3ed3b519253fd3562bb436ffaf9fb8c88f11e 100644
--- a/Code/Visu/otbImageAlternateViewer.h
+++ b/Code/Visu/otbImageAlternateViewer.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageAlternateViewer_h
 #define __otbImageAlternateViewer_h
 
+#include "vcl_deprecated_header.h"
+
 #include "FL/Fl_Gl_Window.H"
 #include "itkObject.h"
 #include "otbImageList.h"
diff --git a/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h b/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
index f57d541b5e4ffad21580e9dfd59c44374c0fbc8a..f7bda9029684d67b606c1cd0e849162b9103361c 100644
--- a/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
+++ b/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageToGrayscaleAnaglyphImageFilter_h
 #define __otbImageToGrayscaleAnaglyphImageFilter_h
 
+#include "vcl_deprecated_header.h"
+
 #include "itkBinaryFunctorImageFilter.h"
 #include "itkNumericTraits.h"
 
diff --git a/Code/Visu/otbImageViewer.h b/Code/Visu/otbImageViewer.h
index 57981bd3b9a6fea66ebc68d4e4ced57437435fe8..7923ff2b8972e4326b463ff90bf852aa167adbd1 100644
--- a/Code/Visu/otbImageViewer.h
+++ b/Code/Visu/otbImageViewer.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageViewer_h
 #define __otbImageViewer_h
 
+#include "vcl_deprecated_header.h"
+
 #include "otbImageViewerBase.h"
 #include <FL/Fl_Multiline_Output.H>
 
diff --git a/Code/Visu/otbImageViewerBase.h b/Code/Visu/otbImageViewerBase.h
index 296a7351aad4db6b85c9e7db39f38b5e2f391c20..28169658665103ac3b2a8377e06a60e52fe5a2da 100644
--- a/Code/Visu/otbImageViewerBase.h
+++ b/Code/Visu/otbImageViewerBase.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageViewerBase_h
 #define __otbImageViewerBase_h
 
+#include "vcl_deprecated_header.h"
+
 #include <string>
 #include "itkObject.h"
 #include "otbImageViewerScrollWidget.h"
diff --git a/Code/Visu/otbImageViewerFullResolutionEventsInterface.h b/Code/Visu/otbImageViewerFullResolutionEventsInterface.h
index 6fd04f2d27faf52966c2e6cb7caa95e820c574da..603794a9878d179f85dc4f739fb49d5d394383a8 100644
--- a/Code/Visu/otbImageViewerFullResolutionEventsInterface.h
+++ b/Code/Visu/otbImageViewerFullResolutionEventsInterface.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageViewerFullResolutionEventsInterface_h
 #define __otbImageViewerFullResolutionEventsInterface_h
 
+#include "vcl_deprecated_header.h"
+
 #include "itkObject.h"
 #include "itkImageRegion.h"
 #include "otbMacro.h"
diff --git a/Code/Visu/otbImageViewerFullWidget.h b/Code/Visu/otbImageViewerFullWidget.h
index 449fd3a826fd90f32ad13ede5d079a64d3fcaeca..1162736ec2fe06e58f078e878b749347c4eec228 100644
--- a/Code/Visu/otbImageViewerFullWidget.h
+++ b/Code/Visu/otbImageViewerFullWidget.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageViewerFullWidget_h
 #define __otbImageViewerFullWidget_h
 
+#include "vcl_deprecated_header.h"
+
 #include "otbFullResolutionImageWidget.h"
 #include "otbImageViewerFullResolutionEventsInterface.h"
 #include "otbImageWidgetBoxForm.h"
diff --git a/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h b/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
index 1e08fed512f3bbe38238ad6120f91d6a180a3818..dd5553c0df4f22cec6b869918e4fc122c6f9492c 100644
--- a/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
+++ b/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageViewerHistogramAndTransferFunctionWidget_h
 #define __otbImageViewerHistogramAndTransferFunctionWidget_h
 
+#include "vcl_deprecated_header.h"
+
 #include "otbHistogramAndTransferFunctionWidget.h"
 
 namespace otb
diff --git a/Code/Visu/otbImageViewerScrollWidget.h b/Code/Visu/otbImageViewerScrollWidget.h
index 852085428eb01306ce43499e6087e763689db1a1..c1193dcb2f6476af5dedb84a250eaecc663b2dd5 100644
--- a/Code/Visu/otbImageViewerScrollWidget.h
+++ b/Code/Visu/otbImageViewerScrollWidget.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageViewerScrollWidget_h
 #define __otbImageViewerScrollWidget_h
 
+#include "vcl_deprecated_header.h"
+
 #include "otbFixedSizeFullImageWidget.h"
 #include "otbImageWidgetRectangleForm.h"
 #include "otbImageWidgetBoxForm.h"
diff --git a/Code/Visu/otbImageViewerZoomWidget.h b/Code/Visu/otbImageViewerZoomWidget.h
index dd23f85ee763f87744d75e0b406ccf7d46938e7d..6141d0a8f8aad8bc73f792c346dada1a81b60cb1 100644
--- a/Code/Visu/otbImageViewerZoomWidget.h
+++ b/Code/Visu/otbImageViewerZoomWidget.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageViewerZoomWidget_h
 #define __otbImageViewerZoomWidget_h
 
+#include "vcl_deprecated_header.h"
+
 #include "otbZoomableImageWidget.h"
 #include "otbImageWidgetRectangleForm.h"
 #include "otbImageWidgetBoxForm.h"
diff --git a/Code/Visu/otbImageWidgetBase.h b/Code/Visu/otbImageWidgetBase.h
index 3a5baebfc69a39701bb541861b043f1ee9a1d1fd..ff25c20a330368847573627fad4877515475958f 100644
--- a/Code/Visu/otbImageWidgetBase.h
+++ b/Code/Visu/otbImageWidgetBase.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageWidgetBase_h
 #define __otbImageWidgetBase_h
 
+#include "vcl_deprecated_header.h"
+
 #include <FL/gl.h>
 #include "FL/Fl_Gl_Window.H"
 #include "otbVectorImage.h"
diff --git a/Code/Visu/otbImageWidgetBoxForm.h b/Code/Visu/otbImageWidgetBoxForm.h
index 402ce9a8783813773e89e51852110146777f1bf9..658bc242e61331c9f223c2232658a3828a41f196 100644
--- a/Code/Visu/otbImageWidgetBoxForm.h
+++ b/Code/Visu/otbImageWidgetBoxForm.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageWidgetBoxForm_h
 #define __otbImageWidgetBoxForm_h
 
+#include "vcl_deprecated_header.h"
+
 #include "itkSize.h"
 #include "itkIndex.h"
 #include "otbImageWidgetFormBase.h"
diff --git a/Code/Visu/otbImageWidgetCircleForm.h b/Code/Visu/otbImageWidgetCircleForm.h
index 345276f68d6b37c1adaa30a2c63571e350790d19..da211823a813e25dc411d4734d2567c0a639d0ce 100644
--- a/Code/Visu/otbImageWidgetCircleForm.h
+++ b/Code/Visu/otbImageWidgetCircleForm.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageWidgetCircleForm_h
 #define __otbImageWidgetCircleForm_h
 
+#include "vcl_deprecated_header.h"
+
 #include "itkSize.h"
 #include "itkIndex.h"
 #include "otbImageWidgetFormBase.h"
diff --git a/Code/Visu/otbImageWidgetFormBase.h b/Code/Visu/otbImageWidgetFormBase.h
index 5c3d2355da9beb38b81432b6f1c6c3cef604aa3e..d5525aafffd5afa68d842844a376325b3221f2c8 100644
--- a/Code/Visu/otbImageWidgetFormBase.h
+++ b/Code/Visu/otbImageWidgetFormBase.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageWidgetFormBase_h
 #define __otbImageWidgetFormBase_h
 
+#include "vcl_deprecated_header.h"
+
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
 #include "itkFixedArray.h"
diff --git a/Code/Visu/otbImageWidgetPointForm.h b/Code/Visu/otbImageWidgetPointForm.h
index 6854bcd9fedbe56c14edf265e9ed6b2e565f3b10..1881301cfaf66cfb4c29504c9ba6d949f0d796a9 100644
--- a/Code/Visu/otbImageWidgetPointForm.h
+++ b/Code/Visu/otbImageWidgetPointForm.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageWidgetPointForm_h
 #define __otbImageWidgetPointForm_h
 
+#include "vcl_deprecated_header.h"
+
 #include "itkIndex.h"
 #include "otbImageWidgetFormBase.h"
 
diff --git a/Code/Visu/otbImageWidgetPolygonForm.h b/Code/Visu/otbImageWidgetPolygonForm.h
index 557537ae53958f64c7bcfe2d284feecc8f948f60..75d33aa11da7517b6f36448e1d31b1d7a2295478 100644
--- a/Code/Visu/otbImageWidgetPolygonForm.h
+++ b/Code/Visu/otbImageWidgetPolygonForm.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageWidgetPolygonForm_h
 #define __otbImageWidgetPolygonForm_h
 
+#include "vcl_deprecated_header.h"
+
 #include "itkSize.h"
 #include "itkIndex.h"
 #include "otbImageWidgetFormBase.h"
diff --git a/Code/Visu/otbImageWidgetPolylineForm.h b/Code/Visu/otbImageWidgetPolylineForm.h
index 2f2c57ca08cc077f7e07bccbb8b53189ceae2be6..6c2e7700db275dc8a93531a8d1ecc68a779f1ac3 100644
--- a/Code/Visu/otbImageWidgetPolylineForm.h
+++ b/Code/Visu/otbImageWidgetPolylineForm.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageWidgetPolylineForm_h
 #define __otbImageWidgetPolylineForm_h
 
+#include "vcl_deprecated_header.h"
+
 #include "itkSize.h"
 #include "itkIndex.h"
 #include "otbImageWidgetFormBase.h"
diff --git a/Code/Visu/otbImageWidgetRectangleForm.h b/Code/Visu/otbImageWidgetRectangleForm.h
index 41c0e461bf9247224f2fc659487b86218ca53e3f..242b9ecce2f67c27b85cce9de0b005e53a1f122f 100644
--- a/Code/Visu/otbImageWidgetRectangleForm.h
+++ b/Code/Visu/otbImageWidgetRectangleForm.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageWidgetRectangleForm_h
 #define __otbImageWidgetRectangleForm_h
 
+#include "vcl_deprecated_header.h"
+
 #include "otbImageWidgetFormBase.h"
 #include "otbMacro.h"
 
diff --git a/Code/Visu/otbImageWidgetTransferFunction.h b/Code/Visu/otbImageWidgetTransferFunction.h
index 7c2fe6f47726b414e16b685324f9f8e8b34b53ad..847a49fafdf88d3c42a7c8da0eb00698a782ad02 100644
--- a/Code/Visu/otbImageWidgetTransferFunction.h
+++ b/Code/Visu/otbImageWidgetTransferFunction.h
@@ -18,6 +18,8 @@
 #ifndef __otbImageWidgetTransferFunction_h
 #define __otbImageWidgetTransferFunction_h
 
+#include "vcl_deprecated_header.h"
+
 #include "itkProcessObject.h"
 #include "itkMacro.h"
 #include "otbMath.h"
diff --git a/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h b/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
index 6818ab677ffb73dc370617bf77d4a85adae72da0..69ff2e58811ec332d8e897f1a5c959adedb8101f 100644
--- a/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
+++ b/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
@@ -18,6 +18,8 @@
 #ifndef __otbVectorImageToColorAnaglyphVectorImageFilter_h
 #define __otbVectorImageToColorAnaglyphVectorImageFilter_h
 
+#include "vcl_deprecated_header.h"
+
 #include "itkBinaryFunctorImageFilter.h"
 #include "itkNumericTraits.h"
 
diff --git a/Code/Visu/otbZoomableImageWidget.h b/Code/Visu/otbZoomableImageWidget.h
index afe8761b9fd5d20daecd4fafab6e0fefa4da2e7c..c79b485cd9f2bc7d2d0bc719dda72b3bf7cb1bc6 100644
--- a/Code/Visu/otbZoomableImageWidget.h
+++ b/Code/Visu/otbZoomableImageWidget.h
@@ -18,6 +18,8 @@
 #ifndef __otbZoomableImageWidget_h
 #define __otbZoomableImageWidget_h
 
+#include "vcl_deprecated_header.h"
+
 #include "otbImageWidgetBase.h"
 
 namespace otb