diff --git a/Examples/FeatureExtraction/CMakeLists.txt b/Examples/FeatureExtraction/CMakeLists.txt
index 0739bf5cc3190f61cf5144a44648d5f2a8f896c0..ec46f9fd89a8065e4ac0d0b713aca977c89311eb 100644
--- a/Examples/FeatureExtraction/CMakeLists.txt
+++ b/Examples/FeatureExtraction/CMakeLists.txt
@@ -1,8 +1,5 @@
 project(FeatureExtractionExamples)
 
-include_directories("${OTB_SOURCE_DIR}/Modules/Filtering/VectorDataRendering/include")
-file(GLOB DataRendering_HEADERS "${OTB_SOURCE_DIR}/Modules/Filtering/VectorDataRendering/include/*.h")
-
 add_executable(AlignmentsExample AlignmentsExample.cxx)
 target_link_libraries(AlignmentsExample ${OTB_LIBRARIES})
 
@@ -45,8 +42,8 @@ target_link_libraries(HarrisExample ${OTB_LIBRARIES})
 add_executable(HuMomentsImageFunctionExample HuMomentsImageFunctionExample.cxx)
 target_link_libraries(HuMomentsImageFunctionExample ${OTB_LIBRARIES})
 
-if (Module_OTBVectorDataRendering)
-  add_executable(LineSegmentDetectorExample LineSegmentDetectorExample.cxx ${DataRendering_HEADERS})
+if (Module_OTBVectorDataRendering AND OTB_USE_MAPNIK)
+  add_executable(LineSegmentDetectorExample LineSegmentDetectorExample.cxx)
   target_link_libraries(LineSegmentDetectorExample ${OTB_LIBRARIES})
 endif()
 
@@ -62,8 +59,8 @@ target_link_libraries(ParallelLineDetectionExample ${OTB_LIBRARIES})
 add_executable(RatioLineDetectorExample RatioLineDetectorExample.cxx)
 target_link_libraries(RatioLineDetectorExample ${OTB_LIBRARIES})
 
-if (Module_OTBVectorDataRendering)
-  add_executable(RightAngleDetectionExample RightAngleDetectionExample.cxx ${DataRendering_HEADERS})
+if (Module_OTBVectorDataRendering AND OTB_USE_MAPNIK)
+  add_executable(RightAngleDetectionExample RightAngleDetectionExample.cxx)
   target_link_libraries(RightAngleDetectionExample ${OTB_LIBRARIES})
 endif()
 
diff --git a/Examples/FeatureExtraction/test/CMakeLists.txt b/Examples/FeatureExtraction/test/CMakeLists.txt
index 0159ad4ee38e002ab04a2c0048fff502b07a432b..9e351acd2adf21b663afe76885b8baf7d868e91e 100644
--- a/Examples/FeatureExtraction/test/CMakeLists.txt
+++ b/Examples/FeatureExtraction/test/CMakeLists.txt
@@ -192,7 +192,7 @@ otb_add_test(NAME feTeCloudDetectionExampleTest COMMAND ${OTB_TEST_DRIVER}
     553 467 734 581 0.4 0.6 1.0
 )
 
-if (Module_OTBVectorDataRendering)
+if (Module_OTBVectorDataRendering AND OTB_USE_MAPNIK)
 
   # ------- Line Segment Detector test----------
   otb_add_test(NAME feTeLineSegmentDetectorExampleTest  COMMAND ${OTB_TEST_DRIVER}