diff --git a/CMakeModules/FindOpenCascade.cmake b/CMakeModules/FindOpenCascade.cmake
index 22338f828..dd002bf55 100644
--- a/CMakeModules/FindOpenCascade.cmake
+++ b/CMakeModules/FindOpenCascade.cmake
@@ -63,8 +63,6 @@ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBO TKBO)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBRep TKBRep)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKCAF TKCAF)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKCDF TKCDF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKDCAF TKDCAF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKDraw TKDraw)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKernel TKernel)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKFeat TKFeat)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKFillet TKFillet)
@@ -81,26 +79,17 @@ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKMeshVS TKMeshVS)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKOffset TKOffset)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKOpenGl TKOpenGl)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKPrim TKPrim)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKQADraw TKQADraw)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKService TKService)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKShHealing TKShHealing)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKStdL TKStdL)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKStd TKStd)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEP209 TKSTEP209)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEPAttr TKSTEPAttr)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEPBase TKSTEPBase)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEP TKSTEP)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTL TKSTL)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTObjDRAW TKTObjDRAW)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTObj TKTObj)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTopAlgo TKTopAlgo)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTopTest TKTopTest)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKV3d TKV3d)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKVCAF TKVCAF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKViewerTest TKViewerTest)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKVRML TKVRML)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXCAF TKXCAF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXDEDRAW TKXDEDRAW)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXDEIGES TKXDEIGES)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXDESTEP TKXDESTEP)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXMesh TKXMesh)
@@ -109,7 +98,6 @@ FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXml TKXml)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXmlTObj TKXmlTObj)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXmlXCAF TKXmlXCAF)
 FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXSBase TKXSBase)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXSDRAW TKXSDRAW)
 
 set (OPENCASCADE_LIBRARY_TYPE_DESCR 
 "Specifies the type of library to be used. 'Shared' libraries
@@ -149,7 +137,6 @@ SET(OPENCASCADE_LIBRARY ${OPENCASCADE_LIBRARY}
     ${OPENCASCADE_TKBRep}
     ${OPENCASCADE_TKCAF}
     ${OPENCASCADE_TKCDF}
-    ${OPENCASCADE_TKDCAF}
     ${OPENCASCADE_TKernel}
     ${OPENCASCADE_TKG2d}
     ${OPENCASCADE_TKG3d}
@@ -169,7 +156,6 @@ SET(OPENCASCADE_LIBRARY ${OPENCASCADE_LIBRARY}
     ${OPENCASCADE_TKSTEPBase}
     ${OPENCASCADE_TKTopAlgo}
     ${OPENCASCADE_TKV3d}
-    ${OPENCASCADE_TKVCAF}
     ${OPENCASCADE_TKXCAF}
     ${OPENCASCADE_TKXDEIGES}
     ${OPENCASCADE_TKXDESTEP}