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 65de07fe345..2eb4b03a6c6 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
@@ -292,6 +292,7 @@ void draw(const CGAL_PS2_TYPE& ps, GSOptions& gso,
   CGAL_USE(gso);
   CGAL_USE(title);
 
+#ifdef CGAL_USE_BASIC_VIEWER_QT
 #if defined(CGAL_TEST_SUITE)
   bool cgal_test_suite = true;
 #else
@@ -302,7 +303,6 @@ void draw(const CGAL_PS2_TYPE& ps, GSOptions& gso,
   {
     using Ps = CGAL::Polygon_set_2<T, C, D>;
     using Viewer = Polygon_set_2_basic_viewer_qt<Ps, GSOptions>;
-#ifdef CGAL_USE_BASIC_VIEWER_QT
     CGAL::Qt::init_ogl_context(4,3);
     int argc = 1;
     const char* argv[2] = {"t2_viewer", nullptr};
@@ -310,8 +310,8 @@ void draw(const CGAL_PS2_TYPE& ps, GSOptions& gso,
     Viewer basic_viewer(app.activeWindow(), ps, gso, title);
     basic_viewer.show();
     app.exec();
-#endif // CGAL_USE_BASIC_VIEWER_QT
   }
+#endif // CGAL_USE_BASIC_VIEWER_QT
 }
 
 template<class T, class C, class D>
diff --git a/Polygon/include/CGAL/draw_multipolygon_with_holes_2.h b/Polygon/include/CGAL/draw_multipolygon_with_holes_2.h
index 2de4b27f41a..f4c38fda817 100644
--- a/Polygon/include/CGAL/draw_multipolygon_with_holes_2.h
+++ b/Polygon/include/CGAL/draw_multipolygon_with_holes_2.h
@@ -19,6 +19,7 @@
 #define CGAL_DRAW_MULTIPOLYGON_WITH_HOLES_2_H
 
 #include <CGAL/Basic_viewer.h>
+#include <CGAL/Multipolygon_with_holes_2.h>
 
 #ifdef DOXYGEN_RUNNING
 namespace CGAL {
@@ -47,7 +48,6 @@ void draw(const MPH& aph);
 #if defined(CGAL_USE_BASIC_VIEWER_QT)
 
 #include <CGAL/Qt/init_ogl_context.h>
-#include <CGAL/Multipolygon_with_holes_2.h>
 
 namespace CGAL {