diff --git a/.gitattributes b/.gitattributes
index 1e03b25677e..6bf27a594f2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1724,7 +1724,6 @@ Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake -text
 Installation/cmake/modules/CGAL_Common.cmake -text
 Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake -text
 Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgramQt4.cmake -text
-Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake -text
 Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake -text
 Installation/cmake/modules/CGAL_Locate_CGAL_TAUCS.cmake -text
 Installation/cmake/modules/CGAL_Macros.cmake -text
diff --git a/Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake b/Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake
deleted file mode 100644
index ebb8e90e94e..00000000000
--- a/Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... )
-#    This macro is intended to be used in FindXXX.cmake modules files.
-#    It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and
-#    it also sets the <UPPERCASED_NAME>_FOUND variable.
-#    The package is found if all variables listed are TRUE.
-#    Example:
-#
-#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
-#
-#    LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and 
-#    LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.
-#    If it is not found and REQUIRED was used, it fails with FATAL_ERROR, 
-#    independent whether QUIET was used or not.
-#    If it is found, the location is reported using the VAR1 argument, so 
-#    here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out.
-#    If the second argument is DEFAULT_MSG, the message in the failure case will 
-#    be "Could NOT find LibXml2", if you don't like this message you can specify
-#    your own custom failure message there.
-
-macro(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 )
-
-  if("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
-    set(_FAIL_MESSAGE "Could NOT find ${_NAME}")
-  else()
-    set(_FAIL_MESSAGE "${_FAIL_MSG}")
-  endif()
-
-  string(TOUPPER ${_NAME} _NAME_UPPER)
-
-  set(${_NAME_UPPER}_FOUND TRUE)
-  if(NOT ${_VAR1})
-    set(${_NAME_UPPER}_FOUND FALSE)
-  endif()
-
-  foreach(_CURRENT_VAR ${ARGN})
-    if(NOT ${_CURRENT_VAR})
-      set(${_NAME_UPPER}_FOUND FALSE)
-    endif()
-  endforeach()
-  
-  if (${_NAME_UPPER}_FOUND)
-    if (NOT ${_NAME}_FIND_QUIETLY)
-      message(STATUS "Found ${_NAME}: ${${_VAR1}}")
-    endif()
-  else()
-    if (${_NAME}_FIND_REQUIRED)
-      message(FATAL_ERROR "${_FAIL_MESSAGE}")
-    else()
-      if (NOT ${_NAME}_FIND_QUIETLY)
-        message(STATUS "${_FAIL_MESSAGE}")
-      endif()
-    endif()
-  endif()
-  
-endmacro()
diff --git a/Installation/cmake/modules/FindCGAL_CORE.cmake b/Installation/cmake/modules/FindCGAL_CORE.cmake
index 946af735ef7..b2578b306e1 100644
--- a/Installation/cmake/modules/FindCGAL_CORE.cmake
+++ b/Installation/cmake/modules/FindCGAL_CORE.cmake
@@ -7,7 +7,7 @@
 
 # CORE needs GMP
 
-include(CGAL_FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 
 
 if(GMP_FOUND)
diff --git a/Installation/cmake/modules/FindCORE.cmake b/Installation/cmake/modules/FindCORE.cmake
index 05a0ef3aae4..6effa1d5e52 100644
--- a/Installation/cmake/modules/FindCORE.cmake
+++ b/Installation/cmake/modules/FindCORE.cmake
@@ -6,7 +6,7 @@
 # TODO: support Windows and MacOSX
 
 # CORE needs GMP
-include(CGAL_FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 
 if(GMP_FOUND)
   if (CORE_INCLUDE_DIR AND CORE_LIBRARIES)
diff --git a/Installation/cmake/modules/FindGMP.cmake b/Installation/cmake/modules/FindGMP.cmake
index 76ad2d9770f..797099912ef 100644
--- a/Installation/cmake/modules/FindGMP.cmake
+++ b/Installation/cmake/modules/FindGMP.cmake
@@ -7,7 +7,7 @@
 
 # TODO: support MacOSX
 
-include(CGAL_FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 include(CGAL_GeneratorSpecificSettings)
 
 if(GMP_INCLUDE_DIR)
diff --git a/Installation/cmake/modules/FindGMPXX.cmake b/Installation/cmake/modules/FindGMPXX.cmake
index 333cd1d44b6..f32e4458299 100644
--- a/Installation/cmake/modules/FindGMPXX.cmake
+++ b/Installation/cmake/modules/FindGMPXX.cmake
@@ -26,7 +26,7 @@ if(GMP_FOUND)
                DOC "Path to the GMPXX library"
                )
                
-  include(CGAL_FindPackageHandleStandardArgs)
+  include(FindPackageHandleStandardArgs)
   
   find_package_handle_standard_args(GMPXX "DEFAULT_MSG" GMPXX_LIBRARIES GMPXX_INCLUDE_DIR )
 
diff --git a/Installation/cmake/modules/FindMPFI.cmake b/Installation/cmake/modules/FindMPFI.cmake
index b9975a77a7a..4456125f22f 100644
--- a/Installation/cmake/modules/FindMPFI.cmake
+++ b/Installation/cmake/modules/FindMPFI.cmake
@@ -24,7 +24,7 @@ if( GMP_FOUND )
     include( MPFIConfig OPTIONAL )
   endif( NOT MPFI_INCLUDE_DIR OR NOT MPFI_LIBRARIES_DIR )
 
-  include(CGAL_FindPackageHandleStandardArgs)
+  include(FindPackageHandleStandardArgs)
 
   find_package_handle_standard_args(MPFI "DEFAULT_MSG" MPFI_LIBRARIES MPFI_INCLUDE_DIR )
 
diff --git a/Installation/cmake/modules/FindMPFR.cmake b/Installation/cmake/modules/FindMPFR.cmake
index 2453f66fc03..94f41f9d9a6 100644
--- a/Installation/cmake/modules/FindMPFR.cmake
+++ b/Installation/cmake/modules/FindMPFR.cmake
@@ -7,7 +7,7 @@
 
 # TODO: support MacOSX
 
-include(CGAL_FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 include(CGAL_GeneratorSpecificSettings)
 
 if(MPFR_INCLUDE_DIR)
diff --git a/Installation/cmake/modules/FindNTL.cmake b/Installation/cmake/modules/FindNTL.cmake
index d6d43e1cb1c..4ee892eb344 100644
--- a/Installation/cmake/modules/FindNTL.cmake
+++ b/Installation/cmake/modules/FindNTL.cmake
@@ -80,7 +80,7 @@ else( NOT GMP_FOUND )
 
       get_filename_component(NTL_LIBRARIES_DIR ${NTL_LIBRARIES} PATH CACHE )
 
-      include(CGAL_FindPackageHandleStandardArgs)
+      include(FindPackageHandleStandardArgs)
 
       find_package_handle_standard_args( NTL
                                          DEFAULT_MSG
diff --git a/Installation/cmake/modules/FindRS.cmake b/Installation/cmake/modules/FindRS.cmake
index b17b2c0b2dd..c6d01331659 100644
--- a/Installation/cmake/modules/FindRS.cmake
+++ b/Installation/cmake/modules/FindRS.cmake
@@ -62,7 +62,7 @@ if( MPFI_FOUND )
       include( RSConfig OPTIONAL )
     endif( NOT RS_INCLUDE_DIR OR NOT RS_LIBRARIES_DIR )
 
-    include(CGAL_FindPackageHandleStandardArgs)
+    include(FindPackageHandleStandardArgs)
 
     find_package_handle_standard_args( RS
                                        "DEFAULT_MSG"