diff --git a/CGAL_Core/src/CGAL_Core/CMakeLists.txt b/CGAL_Core/src/CGAL_Core/CMakeLists.txt
index fe0362484fa..1c4a8640b61 100644
--- a/CGAL_Core/src/CGAL_Core/CMakeLists.txt
+++ b/CGAL_Core/src/CGAL_Core/CMakeLists.txt
@@ -10,7 +10,7 @@ link_directories    ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
 
 collect_cgal_library(CGAL_Core "")
 
-if(NOT ENABLE_HEADER_ONLY)
+if(NOT CGAL_HEADERS_ONLY)
    # CGAL_Core does not depend on CGAL in either DEBUG or RELEASE, but we
    # still link it.
    target_link_libraries( CGAL_Core CGAL ${CGAL_3RD_PARTY_LIBRARIES} )
diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt b/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt
index d7d6bc4d331..6578c0139f9 100644
--- a/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt
+++ b/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt
@@ -7,7 +7,7 @@ find_package( ZLIB )
 =======
 #option(WITH_VTK "Add VTK support to libCGAL_ImageIO." OFF)
 
-if (ENABLE_HEADER_ONLY)
+if (CGAL_HEADERS_ONLY)
   cache_set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
@@ -62,7 +62,7 @@ if(OPENGL_FOUND)
 
   add_definitions( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_ImageIO_3RD_PARTY_DEFINITIONS} )
 
-  if (NOT ENABLE_HEADER_ONLY)
+  if (NOT CGAL_HEADERS_ONLY)
       add_dependencies( CGAL_ImageIO CGAL )
 
       # CGAL_ImageIO only depends on CGAL in DEBUG, but we still link it
diff --git a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt
index 022112c78dd..5ac5d38020f 100644
--- a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt
+++ b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt
@@ -79,7 +79,7 @@ link_directories    ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} )
 
 collect_cgal_library( CGAL_Qt5 "${additional_files}")
 
-if(ENABLE_HEADER_ONLY)
+if(CGAL_HEADERS_ONLY)
    set(CGAL_QT5_QTMOCCMAKE_FILES ${QTMOCCMAKE_FILES} CACHE INTERNAL "CGAL qt5 qtmoc cmake files")
 else()
    qt5_use_modules(CGAL_Qt5 OpenGL Svg)