diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/draw_arrangement_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/draw_arrangement_2.h
index 9b8f91eddee..e8748ae253c 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/draw_arrangement_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/draw_arrangement_2.h
@@ -29,8 +29,11 @@ namespace CGAL {
  * `CGAL::Arrangement_2` class template. Parameters of the drawing are taken
  * from the optional graphics scene options parameter.
  *
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
-Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
+ * A call to this function blocks the execution of the program until the drawing
+ * window is closed. This function requires `CGAL_Qt6`, and is only available if
+ * the macro `CGAL_USE_BASIC_VIEWER` is defined. Linking with the cmake target
+ * `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition
+ * `CGAL_USE_BASIC_VIEWER`.
  *
  * \tparam GeometryTraits_2 a geometry traits type, a model of a 2D arrangement
  * traits concept. At this point it must be an instance of either
diff --git a/Basic_viewer/examples/Basic_viewer/draw_several_windows.cpp b/Basic_viewer/examples/Basic_viewer/draw_several_windows.cpp
index f499f16f681..75c824c45e4 100644
--- a/Basic_viewer/examples/Basic_viewer/draw_several_windows.cpp
+++ b/Basic_viewer/examples/Basic_viewer/draw_several_windows.cpp
@@ -7,7 +7,7 @@
 #include <CGAL/Graphics_scene_options.h>
 #include <CGAL/Basic_viewer.h>
 
-#ifdef CGAL_USE_BASIC_VIEWER_QT
+#ifdef CGAL_USE_BASIC_VIEWER
 #include <QMainWindow>
 #endif
 
@@ -55,7 +55,7 @@ int main(void)
   CGAL::add_to_graphics_scene(output_mesh, scene2);
 
   /// (2) Qt code that create windows, add them in a layout, and create app.
-#ifdef CGAL_USE_BASIC_VIEWER_QT
+#ifdef CGAL_USE_BASIC_VIEWER
 
 #if defined(CGAL_TEST_SUITE)
   bool cgal_test_suite=true;
diff --git a/Basic_viewer/examples/Basic_viewer/draw_surface_mesh_small_faces.cpp b/Basic_viewer/examples/Basic_viewer/draw_surface_mesh_small_faces.cpp
index 84c89ab8276..f7f677e9660 100644
--- a/Basic_viewer/examples/Basic_viewer/draw_surface_mesh_small_faces.cpp
+++ b/Basic_viewer/examples/Basic_viewer/draw_surface_mesh_small_faces.cpp
@@ -103,7 +103,7 @@ int main(int argc, char* argv[])
 
   add_to_graphics_scene(sm, gs, gsosm);
 
-#ifdef CGAL_USE_BASIC_VIEWER_QT
+#ifdef CGAL_USE_BASIC_VIEWER
 
   CGAL::Qt::QApplication_and_basic_viewer app(gs, "Small faces");
   if(app)
diff --git a/Basic_viewer/include/CGAL/Qt/Basic_viewer.h b/Basic_viewer/include/CGAL/Qt/Basic_viewer.h
index 11548554768..b26ecdd479b 100644
--- a/Basic_viewer/include/CGAL/Qt/Basic_viewer.h
+++ b/Basic_viewer/include/CGAL/Qt/Basic_viewer.h
@@ -2033,6 +2033,6 @@ void draw_graphics_scene(const Graphics_scene& graphics_scene,
 
 } // End namespace CGAL
 
-#endif // CGAL_USE_BASIC_VIEWER_QT
+#endif // CGAL_USE_BASIC_VIEWER
 
 #endif // CGAL_QT_BASIC_VIEWER_H
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/draw_polygon_set_2.h b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/draw_polygon_set_2.h
index d76e1fe7985..9e3fd5f4428 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/draw_polygon_set_2.h
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/draw_polygon_set_2.h
@@ -27,8 +27,8 @@ struct Graphics_scene_options_polygon_set_2: public CGAL::Graphics_scene_options
 
 opens a new window and draws a 2D polygon set. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER`/`CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
-Linking with the cmake target `CGAL::CGAL_Basic_viewer`/`CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`/`CGAL_USE_BASIC_VIEWER`.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
+Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam PS2 which must be an instantiation of a `CGAL::Polygon_set_2<...>`.
 \tparam GSOptions a model of `GraphicsSceneOptionsPolygonSet2` concept.
diff --git a/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h b/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h
index 2eb4b03a6c6..d759add33c5 100644
--- a/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h
+++ b/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h
@@ -166,7 +166,7 @@ void compute_elements(const PWH& pwh,
 
 } // End namespace draw_function_for_boolean_set_2
 
-#if defined(CGAL_USE_BASIC_VIEWER_QT)
+#if defined(CGAL_USE_BASIC_VIEWER)
 
 template <typename PolygonSet_2, typename GSOptions>
 class Polygon_set_2_basic_viewer_qt : public Basic_viewer
@@ -261,7 +261,7 @@ private:
   GSOptions& gso;
 };
 
-#endif // CGAL_USE_BASIC_VIEWER_QT
+#endif // CGAL_USE_BASIC_VIEWER
 
 #define CGAL_PS2_TYPE CGAL::Polygon_set_2<T, C, D>
 
@@ -292,7 +292,7 @@ void draw(const CGAL_PS2_TYPE& ps, GSOptions& gso,
   CGAL_USE(gso);
   CGAL_USE(title);
 
-#ifdef CGAL_USE_BASIC_VIEWER_QT
+#ifdef CGAL_USE_BASIC_VIEWER
 #if defined(CGAL_TEST_SUITE)
   bool cgal_test_suite = true;
 #else
@@ -311,7 +311,7 @@ void draw(const CGAL_PS2_TYPE& ps, GSOptions& gso,
     basic_viewer.show();
     app.exec();
   }
-#endif // CGAL_USE_BASIC_VIEWER_QT
+#endif // CGAL_USE_BASIC_VIEWER
 }
 
 template<class T, class C, class D>
diff --git a/Installation/cmake/modules/CGALConfig_binary.cmake.in b/Installation/cmake/modules/CGALConfig_binary.cmake.in
index 9caa2801d3d..52dbfcdf94f 100644
--- a/Installation/cmake/modules/CGALConfig_binary.cmake.in
+++ b/Installation/cmake/modules/CGALConfig_binary.cmake.in
@@ -211,7 +211,7 @@ endif()
 if (NOT TARGET CGAL::CGAL_Basic_viewer_Qt)
   add_library(CGAL::CGAL_Basic_viewer_Qt INTERFACE IMPORTED GLOBAL)
     set_target_properties(CGAL::CGAL_Basic_viewer_Qt PROPERTIES
-      INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER_QT;QT_NO_KEYWORDS"
+      INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER;QT_NO_KEYWORDS"
       INTERFACE_LINK_LIBRARIES CGAL::CGAL_Qt6)
   add_library(CGAL::CGAL_Basic_viewer ALIAS CGAL::CGAL_Basic_viewer_Qt)
 endif()
diff --git a/Installation/cmake/modules/CGALConfig_install.cmake.in b/Installation/cmake/modules/CGALConfig_install.cmake.in
index 84bb413c9a0..523a2cd686b 100644
--- a/Installation/cmake/modules/CGALConfig_install.cmake.in
+++ b/Installation/cmake/modules/CGALConfig_install.cmake.in
@@ -196,9 +196,9 @@ endif()
 if (NOT TARGET CGAL::CGAL_Basic_viewer_Qt)
   add_library(CGAL::CGAL_Basic_viewer_Qt INTERFACE IMPORTED GLOBAL)
     set_target_properties(CGAL::CGAL_Basic_viewer_Qt PROPERTIES
-      INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER_QT;QT_NO_KEYWORDS"
+      INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER;QT_NO_KEYWORDS"
       INTERFACE_LINK_LIBRARIES CGAL::CGAL_Qt6)
-  add_library(CGAL::CGAL_Basic_viewer ALIAS CGAL::CGAL_Basic_viewer_Qt)    
+  add_library(CGAL::CGAL_Basic_viewer ALIAS CGAL::CGAL_Basic_viewer_Qt)
 endif()
 
 include("${CGAL_MODULES_DIR}/CGAL_enable_end_of_configuration_hook.cmake")
diff --git a/Installation/cmake/modules/CGAL_add_test.cmake b/Installation/cmake/modules/CGAL_add_test.cmake
index 61247c3c665..edc7b43dbee 100644
--- a/Installation/cmake/modules/CGAL_add_test.cmake
+++ b/Installation/cmake/modules/CGAL_add_test.cmake
@@ -124,7 +124,7 @@ function(cgal_add_compilation_test exe_name)
   if(TARGET CGAL_Qt6_moc_and_resources) # if CGAL_Qt6 was searched, and is header-only
     get_property(linked_libraries TARGET "${exe_name}" PROPERTY LINK_LIBRARIES)
     #  message(STATUS "${exe_name} depends on ${linked_libraries}")
-    if( ("CGAL_Qt6" IN_LIST linked_libraries OR "CGAL::CGAL_Qt6" IN_LIST linked_libraries OR "CGAL::CGAL_Basic_viewer_Qt" IN_LIST linked_libraries)
+    if( ("CGAL_Qt6" IN_LIST linked_libraries OR "CGAL::CGAL_Qt6" IN_LIST linked_libraries OR "CGAL::CGAL_Basic_viewer" IN_LIST linked_libraries)
         AND NOT TARGET "compilation_of__CGAL_Qt6_moc_and_resources")
       # This custom target is useless. It is used only as a flag to
       # detect that the test has already been created.
diff --git a/Installation/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake b/Installation/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake
index 006b90a1249..43d17a055f8 100644
--- a/Installation/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake
+++ b/Installation/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake
@@ -110,7 +110,7 @@ function(CGAL_hook_fix_ctest_depending_on_Qt6)
       continue()
     endif()
     get_property(_target_links TARGET ${_target} PROPERTY LINK_LIBRARIES)
-    if("CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Basic_viewer_Qt" IN_LIST _target_links)
+    if("CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Basic_viewer" IN_LIST _target_links)
       set_property(TEST "compilation of  ${_target}" APPEND PROPERTY FIXTURES_REQUIRED CGAL_Qt6_moc_and_resources_Fixture)
     endif()
     endforeach()
diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake
index 5ddd5f53852..276c7ebb6c9 100644
--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake
+++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake
@@ -199,7 +199,7 @@ endforeach()
 if (NOT TARGET CGAL::CGAL_Basic_viewer_Qt)
   add_library(CGAL::CGAL_Basic_viewer_Qt INTERFACE IMPORTED GLOBAL)
     set_target_properties(CGAL::CGAL_Basic_viewer_Qt PROPERTIES
-      INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER_QT"
+      INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_BASIC_VIEWER"
       INTERFACE_LINK_LIBRARIES CGAL::CGAL_Qt6)
   add_library(CGAL::CGAL_Basic_viewer ALIAS CGAL::CGAL_Basic_viewer_Qt)
 endif()
diff --git a/Installation/test/Installation/test_configuration_qt.cmake.in b/Installation/test/Installation/test_configuration_qt.cmake.in
index 4fcad54189b..3e2e50894f4 100644
--- a/Installation/test/Installation/test_configuration_qt.cmake.in
+++ b/Installation/test/Installation/test_configuration_qt.cmake.in
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12...3.31)
 project(test_configuration)
 find_package(CGAL COMPONENTS Qt6)
-add_definitions(-DCGAL_USE_BASIC_VIEWER_QT -DQT_NO_KEYWORDS)
+add_definitions(-DCGAL_USE_BASIC_VIEWER -DQT_NO_KEYWORDS)
 
 get_filename_component(CGAL_DIR_PATH "${CGAL_DIR}/CMakeConfig.cmake" DIRECTORY)
 get_filename_component(CGAL_GIVEN_DIR_PATH "${CGAL_GIVEN_DIR}/CMakeConfig.cmake" DIRECTORY)
diff --git a/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt b/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
index 2608c2f6ac5..cf3aa7c860e 100644
--- a/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
+++ b/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
@@ -40,7 +40,7 @@ if(NOT CGAL_Qt6_FOUND OR NOT Qt6_FOUND)
 
 else()
 
-  add_compile_definitions(CGAL_USE_BASIC_VIEWER_QT QT_NO_KEYWORDS)
+  add_compile_definitions(CGAL_USE_BASIC_VIEWER QT_NO_KEYWORDS)
   set(CMAKE_AUTOMOC ON)
   set(CMAKE_AUTOUIC ON)
   set(CMAKE_AUTORCC ON)
diff --git a/Linear_cell_complex/doc/Linear_cell_complex/CGAL/draw_linear_cell_complex.h b/Linear_cell_complex/doc/Linear_cell_complex/CGAL/draw_linear_cell_complex.h
index 3eac20b8ae4..3b8903c87f2 100644
--- a/Linear_cell_complex/doc/Linear_cell_complex/CGAL/draw_linear_cell_complex.h
+++ b/Linear_cell_complex/doc/Linear_cell_complex/CGAL/draw_linear_cell_complex.h
@@ -5,7 +5,7 @@ namespace CGAL {
 
 opens a new window and draws a linear cell complex. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam LCC which must be an instantiation of a `CGAL::Linear_cell_complex_for_combinatorial_map<...>` or `CGAL::Linear_cell_complex_for_generalized_map<...>`.
diff --git a/Nef_3/doc/Nef_3/CGAL/draw_nef_3.h b/Nef_3/doc/Nef_3/CGAL/draw_nef_3.h
index f01833fac68..a9618a3d629 100644
--- a/Nef_3/doc/Nef_3/CGAL/draw_nef_3.h
+++ b/Nef_3/doc/Nef_3/CGAL/draw_nef_3.h
@@ -5,7 +5,7 @@ namespace CGAL {
 
 opens a new window and draws a nef polyhedron. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam NP3 which must be an instantiation of a `CGAL::Nef_polyhedron_3<...>`.
diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/draw_periodic_2_triangulation_2.h b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/draw_periodic_2_triangulation_2.h
index a5c56e6e049..cc9ad80bdf0 100644
--- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/draw_periodic_2_triangulation_2.h
+++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/CGAL/draw_periodic_2_triangulation_2.h
@@ -27,7 +27,7 @@ struct Graphics_scene_options_periodic_2_triangulation_2: public CGAL::Graphics_
 
 opens a new window and draws a periodic 2D triangulation. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam P2T2 which must be an instantiation of a `CGAL::Periodic_2_triangulation_2<...>`.
diff --git a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h
index b774e3a3662..788c17ba6be 100644
--- a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h
+++ b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h
@@ -230,7 +230,7 @@ void draw(const CGAL_P2T2_TYPE& ap2t2,
   CGAL_USE(gs_options);
   CGAL_USE(title);
 
-#if defined(CGAL_USE_BASIC_VIEWER_QT)
+#if defined(CGAL_USE_BASIC_VIEWER)
   CGAL::Graphics_scene gs;
   add_to_graphics_scene(ap2t2, gs, gs_options);
   CGAL::Qt::QApplication_and_basic_viewer app(gs, title);
@@ -267,7 +267,7 @@ void draw(const CGAL_P2T2_TYPE& ap2t2,
     // Then we run the app
     app.run();
   }
-#endif // CGAL_USE_BASIC_VIEWER_QT
+#endif // CGAL_USE_BASIC_VIEWER
 }
 
 template<class Gt, class Tds>
diff --git a/Point_set_3/include/CGAL/draw_point_set_3.h b/Point_set_3/include/CGAL/draw_point_set_3.h
index 19dd74f4e2c..09f437415bb 100644
--- a/Point_set_3/include/CGAL/draw_point_set_3.h
+++ b/Point_set_3/include/CGAL/draw_point_set_3.h
@@ -28,7 +28,7 @@ namespace CGAL {
 
 opens a new window and draws a point set. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam PS which must be an instantiation of a `CGAL::Point_set_3<...>`.
diff --git a/Polygon/include/CGAL/draw_multipolygon_with_holes_2.h b/Polygon/include/CGAL/draw_multipolygon_with_holes_2.h
index 6521833f51e..8d6a56f1827 100644
--- a/Polygon/include/CGAL/draw_multipolygon_with_holes_2.h
+++ b/Polygon/include/CGAL/draw_multipolygon_with_holes_2.h
@@ -47,7 +47,7 @@ void draw(const MPH& aph);
 
 namespace CGAL {
 
-#if defined(CGAL_USE_BASIC_VIEWER_QT)
+#if defined(CGAL_USE_BASIC_VIEWER)
 
 #include <CGAL/Qt/init_ogl_context.h>
 
@@ -180,7 +180,7 @@ private:
   const Mpwh& m_mpwh;
 };
 
-#endif // CGAL_USE_BASIC_VIEWER_QT
+#endif // CGAL_USE_BASIC_VIEWER
 
 // Specialization of draw function.
 template<class T, class C>
@@ -190,7 +190,7 @@ void draw(const CGAL::Multipolygon_with_holes_2<T, C>& mpwh,
   CGAL_USE(mpwh);
   CGAL_USE(title);
 
-#if defined(CGAL_USE_BASIC_VIEWER_QT)
+#if defined(CGAL_USE_BASIC_VIEWER)
 #if defined(CGAL_TEST_SUITE)
   bool cgal_test_suite = true;
 #else
@@ -209,7 +209,7 @@ void draw(const CGAL::Multipolygon_with_holes_2<T, C>& mpwh,
     mainwindow.show();
     app.exec();
   }
-#endif // CGAL_USE_BASIC_VIEWER_QT
+#endif // CGAL_USE_BASIC_VIEWER
 }
 
 } // End namespace CGAL
diff --git a/Polygon/include/CGAL/draw_polygon_2.h b/Polygon/include/CGAL/draw_polygon_2.h
index d1d5eef74f7..a8b2d620b65 100644
--- a/Polygon/include/CGAL/draw_polygon_2.h
+++ b/Polygon/include/CGAL/draw_polygon_2.h
@@ -31,7 +31,7 @@ namespace CGAL {
 
 opens a new window and draws a 2D polygon. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam P which must be an instantiation of a `CGAL::Polygon_2<...>`.
diff --git a/Polygon/include/CGAL/draw_polygon_with_holes_2.h b/Polygon/include/CGAL/draw_polygon_with_holes_2.h
index f1626f1e8f1..6fb92ec16e0 100644
--- a/Polygon/include/CGAL/draw_polygon_with_holes_2.h
+++ b/Polygon/include/CGAL/draw_polygon_with_holes_2.h
@@ -31,7 +31,7 @@ namespace CGAL {
 
 opens a new window and draws a 2D polygon with holes. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam PH which must be an instantiation of a `CGAL::Polygon_with_holes_2<...>`.
diff --git a/Polyhedron/doc/Polyhedron/CGAL/draw_polyhedron.h b/Polyhedron/doc/Polyhedron/CGAL/draw_polyhedron.h
index c873268ec50..7574329050e 100644
--- a/Polyhedron/doc/Polyhedron/CGAL/draw_polyhedron.h
+++ b/Polyhedron/doc/Polyhedron/CGAL/draw_polyhedron.h
@@ -5,7 +5,7 @@ namespace CGAL {
 
 opens a new window and draws a polyhedron. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam P which must be an instantiation of a `CGAL::Polyhedron_3<...>`.
diff --git a/Surface_mesh/include/CGAL/draw_surface_mesh.h b/Surface_mesh/include/CGAL/draw_surface_mesh.h
index 9b5434ab785..1f1736dc37c 100644
--- a/Surface_mesh/include/CGAL/draw_surface_mesh.h
+++ b/Surface_mesh/include/CGAL/draw_surface_mesh.h
@@ -20,7 +20,7 @@
 
 opens a new window and draws a surface mesh. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam SM which must be an instantiation of a `CGAL::Surface_mesh<...>`.
diff --git a/Surface_mesh_topology/doc/Surface_mesh_topology/CGAL/draw_face_graph_with_paths.h b/Surface_mesh_topology/doc/Surface_mesh_topology/CGAL/draw_face_graph_with_paths.h
index c691b8615dd..b09424dbecd 100644
--- a/Surface_mesh_topology/doc/Surface_mesh_topology/CGAL/draw_face_graph_with_paths.h
+++ b/Surface_mesh_topology/doc/Surface_mesh_topology/CGAL/draw_face_graph_with_paths.h
@@ -5,7 +5,7 @@ namespace CGAL {
 
 opens a new window and draws `amesh`, either a 2D linear cell complex or a model of the FaceGraph concept, plus the paths lying on this mesh given in `apaths`. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam Mesh either a 2D linear cell complex or a model of the FaceGraph concept.
diff --git a/Triangulation_2/doc/Triangulation_2/CGAL/draw_constrained_triangulation_2.h b/Triangulation_2/doc/Triangulation_2/CGAL/draw_constrained_triangulation_2.h
index ad78d7dfe09..2519bcf65b2 100644
--- a/Triangulation_2/doc/Triangulation_2/CGAL/draw_constrained_triangulation_2.h
+++ b/Triangulation_2/doc/Triangulation_2/CGAL/draw_constrained_triangulation_2.h
@@ -5,8 +5,8 @@ namespace CGAL {
 
 opens a new window and draws a constrained triangulation. If the triangulation has constraints they are drawn. The faces inside and outside of the domain, based on the property map, are drawn in different colors.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER`/`CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
-Linking with the cmake target `CGAL::CGAL_Basic_viewer`/`CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`/`CGAL_USE_BASIC_VIEWER`.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
+Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam CT2 which must be an instantiation of a `CGAL::Constrained_triangulation_2<...>`.
 \tparam InDomainPMap a class model of `ReadablePropertyMap` with `CT2::Face_handle` as key type and `bool` as value type.
diff --git a/Triangulation_2/doc/Triangulation_2/CGAL/draw_triangulation_2.h b/Triangulation_2/doc/Triangulation_2/CGAL/draw_triangulation_2.h
index be243080c79..62dfbdf2854 100644
--- a/Triangulation_2/doc/Triangulation_2/CGAL/draw_triangulation_2.h
+++ b/Triangulation_2/doc/Triangulation_2/CGAL/draw_triangulation_2.h
@@ -5,7 +5,7 @@ namespace CGAL {
 
 opens a new window and draws a triangulation. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam T2 which must be an instantiation of a `CGAL::Triangulation_2<...>`.
diff --git a/Triangulation_3/doc/Triangulation_3/CGAL/draw_triangulation_3.h b/Triangulation_3/doc/Triangulation_3/CGAL/draw_triangulation_3.h
index e51a3886714..dbb9119d83d 100644
--- a/Triangulation_3/doc/Triangulation_3/CGAL/draw_triangulation_3.h
+++ b/Triangulation_3/doc/Triangulation_3/CGAL/draw_triangulation_3.h
@@ -5,7 +5,7 @@ namespace CGAL {
 
 opens a new window and draws a 3D triangulation. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam T3 which must be an instantiation of a `CGAL::Triangulation_3<...>`.
diff --git a/Voronoi_diagram_2/doc/Voronoi_diagram_2/CGAL/draw_voronoi_diagram_2.h b/Voronoi_diagram_2/doc/Voronoi_diagram_2/CGAL/draw_voronoi_diagram_2.h
index acea4d66a18..baed577bb1a 100644
--- a/Voronoi_diagram_2/doc/Voronoi_diagram_2/CGAL/draw_voronoi_diagram_2.h
+++ b/Voronoi_diagram_2/doc/Voronoi_diagram_2/CGAL/draw_voronoi_diagram_2.h
@@ -27,7 +27,7 @@ struct Graphics_scene_options_voronoi_diagram_2: public CGAL::Graphics_scene_opt
 
 opens a new window and draws a 2D voronoi diagram. Parameters of the drawing are taken from the optional graphics scene options parameter.
 
-A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` (Qt viewer) is defined.
+A call to this function blocks the execution of the program until the drawing window is closed. This function requires `CGAL_Qt6`, and is only available if the macro `CGAL_USE_BASIC_VIEWER` is defined.
 Linking with the cmake target `CGAL::CGAL_Basic_viewer` will link with `CGAL_Qt6` and add the definition `CGAL_USE_BASIC_VIEWER`.
 
 \tparam VD2 which must be an instantiation of a `CGAL::Voronoi_diagram_2<...>`.
diff --git a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h
index 356f32de3c9..f3141966a71 100644
--- a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h
+++ b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h
@@ -382,7 +382,7 @@ void draw(const CGAL_VORONOI_TYPE& av2,
 
   CGAL_USE(title);
 
-#if defined(CGAL_USE_BASIC_VIEWER_QT)
+#if defined(CGAL_USE_BASIC_VIEWER)
 
   CGAL::Qt::QApplication_and_basic_viewer app(buffer, title);
   if(app)
@@ -437,7 +437,7 @@ void draw(const CGAL_VORONOI_TYPE& av2,
     // Then we run the app
     app.run();
   }
-#endif // CGAL_USE_BASIC_VIEWER_QT
+#endif // CGAL_USE_BASIC_VIEWER
 }
 
 template<class DG, class AT, class AP>