diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt
index 14ae9c84d496b527d50cb66e51cc818184ebfe5a..91b4463f91d5ab97f6b30dea0e5ef5698bacc536 100644
--- a/Code/CMakeLists.txt
+++ b/Code/CMakeLists.txt
@@ -1,2 +1,2 @@
 SUBDIRS(Common BasicFilters IO ChangeDetection FeatureExtraction
-Learning Visu Segmentation)
+Learning Visu) 
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index f1003b4fab7a9e7cd0d96edad8466e8088f1d488..a430a8510b11c10b89bb66828fbd27e412bb7249 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -12,4 +12,5 @@ SUBDIRS(
   Visu
   Learning
   Classification
+  Segmentation
 )
diff --git a/Examples/Patented/CMakeLists.txt b/Examples/Patented/CMakeLists.txt
index d35c93b5e2c59ea31c50e4fa25bf00d9f1807c52..d12b8cbf6dd11a5b5c3827a83b20c2fb03e1b0a2 100644
--- a/Examples/Patented/CMakeLists.txt
+++ b/Examples/Patented/CMakeLists.txt
@@ -2,10 +2,10 @@ PROJECT(PatentedExamples)
 INCLUDE_REGULAR_EXPRESSION("^.*$")
 
 
-#ADD_EXECUTABLE(FuzzyConnectednessImageFilter FuzzyConnectednessImageFilter.cxx )
-#TARGET_LINK_LIBRARIES(FuzzyConnectednessImageFilter OTBIO OTBCommon ITKNumerics ITKIO)
+ADD_EXECUTABLE(FuzzyConnectednessImageFilter FuzzyConnectednessImageFilter.cxx )
+TARGET_LINK_LIBRARIES(FuzzyConnectednessImageFilter OTBIO OTBCommon ITKNumerics ITKIO)
 
-#ADD_EXECUTABLE(HybridSegmentationFuzzyVoronoi HybridSegmentationFuzzyVoronoi.cxx )
-#TARGET_LINK_LIBRARIES(HybridSegmentationFuzzyVoronoi OTBIO OTBCommon ITKNumerics ITKIO)
+ADD_EXECUTABLE(HybridSegmentationFuzzyVoronoi HybridSegmentationFuzzyVoronoi.cxx )
+TARGET_LINK_LIBRARIES(HybridSegmentationFuzzyVoronoi OTBIO OTBCommon ITKNumerics ITKIO)
 
 
diff --git a/Examples/Patented/HybridSegmentationFuzzyVoronoi.cxx b/Examples/Patented/HybridSegmentationFuzzyVoronoi.cxx
index 81be342570c0b116d8e898becd43d3b212374a23..a6c783f062bdcc4da324c18cc066435f511c585e 100644
--- a/Examples/Patented/HybridSegmentationFuzzyVoronoi.cxx
+++ b/Examples/Patented/HybridSegmentationFuzzyVoronoi.cxx
@@ -53,7 +53,7 @@
 // Software Guide : EndCodeSnippet
 
 
-#include "itkImage.h"
+#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
@@ -83,7 +83,7 @@ int main( int argc, char *argv[] )
   // Software Guide : BeginCodeSnippet
   typedef  float     InputPixelType;
   const    unsigned int      Dimension = 2;
-  typedef itk::Image< InputPixelType, Dimension >  InputImageType;
+  typedef otb::Image< InputPixelType, Dimension >  InputImageType;
   // Software Guide : EndCodeSnippet
 
 
@@ -103,7 +103,7 @@ int main( int argc, char *argv[] )
 
   // Software Guide : BeginCodeSnippet
   typedef unsigned char      BinaryPixelType;
-  typedef itk::Image< BinaryPixelType, Dimension >      BinaryImageType;
+  typedef otb::Image< BinaryPixelType, Dimension >      BinaryImageType;
   // Software Guide : EndCodeSnippet
 
 
@@ -154,7 +154,7 @@ int main( int argc, char *argv[] )
 
   // Software Guide : BeginCodeSnippet
   typedef unsigned char OutputPixelType;
-  typedef itk::Image< OutputPixelType, Dimension > OutputImageType;
+  typedef otb::Image< OutputPixelType, Dimension > OutputImageType;
   // Software Guide : EndCodeSnippet
                         
 
diff --git a/Utilities/ITK/Code/Algorithms/itkVoronoiSegmentationImageFilter.txx b/Utilities/ITK/Code/Algorithms/itkVoronoiSegmentationImageFilter.txx
index e7ecad9f1070f9274d598f77e61773b87a99e9b8..2c251f0821a1cb301e7c4fa94a6ac8c32bb599c5 100644
--- a/Utilities/ITK/Code/Algorithms/itkVoronoiSegmentationImageFilter.txx
+++ b/Utilities/ITK/Code/Algorithms/itkVoronoiSegmentationImageFilter.txx
@@ -219,7 +219,7 @@ void
 VoronoiSegmentationImageFilter <TInputImage,TOutputImage,TBinaryPriorImage>
 ::PrintSelf(std::ostream& os, Indent indent) const
 {
-  Superclass::PrintSelf(os, indent);
+  //Superclass::PrintSelf(os, indent); // comment for OTB
 
   os << indent << "Mean = " << m_Mean << std::endl;
   os << indent << "MeanTolerance = " << m_MeanTolerance << std::endl;