diff --git a/module.cmake b/module.cmake
index 2ccd11f7bdd7c4d799a9d1e2f44ce449320fd15e..1a2327dd2df9693a4b07318f643169b8cad45ce6 100644
--- a/module.cmake
+++ b/module.cmake
@@ -1,44 +1,66 @@
 set(DOCUMENTATION "A collection of examples illustrating how to use VTK")
 
-set(qt_modules "")
-if (Module_vtkGUISupportQtOpenGL)
-  set(qt_modules vtkRenderingQt vtkViewsQt vtkGUISupportQtOpenGL)
-endif()
-
-vtk_module( WikiExamples
-  DEPENDS
+set(DEPENDS
+  vtkChartsCore
+  vtkCommonColor
+  vtkCommonComputationalGeometry
+  vtkCommonSystem
+  vtkFiltersExtraction
   vtkFiltersFlowPaths
   vtkFiltersGeneric
   vtkFiltersGeometry
-  vtkFiltersParallelStatistics
+  vtkFiltersHybrid
+  vtkFiltersModeling
+  # vtkFiltersParallelStatistics #  Optional
   vtkFiltersPoints
   vtkFiltersProgrammable
-  vtkFiltersSelection
   vtkFiltersTexture
   vtkFiltersVerdict
+  vtkGeovisCore
   vtkIOExodus
   vtkIOExport
+  # vtkIOFFMPEG # Optional
   vtkIOImport
   vtkIOInfovis
-  vtkIOLSDyna
+  # vtkIOMySQL # Optional
   vtkIOPLY
   vtkIOParallel
   vtkIOParallelXML
+  vtkImagingColor
+  vtkImagingFourier
+  vtkImagingHybrid
   vtkImagingMath
   vtkImagingMorphological
+  vtkImagingSources
   vtkImagingStatistics
   vtkImagingStencil
+  # vtkInfovisBoostGraphAlgorithms # Optional
+  vtkInfovisLayout
   vtkInteractionImage
+  vtkRenderingAnnotation
   vtkRenderingContext${VTK_RENDERING_BACKEND}
   vtkRenderingImage
   vtkRenderingLOD
-  vtkRenderingVolume${VTK_RENDERING_BACKEND}
+  vtkRenderingLabel
   vtkRendering${VTK_RENDERING_BACKEND}
+  vtkRenderingVolume${VTK_RENDERING_BACKEND}
   vtkTestingGenericBridge
   vtkTestingRendering
   vtkViewsContext2D
-  vtkViewsGeovis
-  ${qt_modules}
+  vtkViewsInfovis
+  )
+
+if(Module_vtkGUISupportQtOpenGL)
+  list(APPEND DEPENDS
+    vtkGUISupportQtOpenGL
+    vtkRenderingQt
+    vtkViewsQt
+    )
+endif()
+
+vtk_module( WikiExamples
+  DEPENDS
+    ${DEPENDS}
   DESCRIPTION
     "${DOCUMENTATION}"
 )