diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.cpp
index 919ec55f2a1..0e9e2833ed4 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.cpp
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.cpp
@@ -280,9 +280,9 @@ void ArrangementDemoWindow::updateInputType(QAction* a)
   tab->activateCurveInputCallback(curveType);
 }
 
-#ifdef CGAL_USE_CORE
 void ArrangementDemoWindow::on_actionAddAlgebraicCurve_triggered()
 {
+#ifdef CGAL_USE_CORE
   AlgebraicCurveInputDialog newDialog;
 
   if (newDialog.exec() == QDialog::Accepted)
@@ -312,10 +312,12 @@ void ArrangementDemoWindow::on_actionAddAlgebraicCurve_triggered()
     algCurveInputCallback->generate(cv);
     if (is_first_curve) currentTab->adjustViewport();
   }
+#endif
 }
 
 void ArrangementDemoWindow::on_actionAddRationalCurve_triggered()
 {
+#ifdef CGAL_USE_CORE
   RationalCurveInputDialog newDialog;
 
   if (newDialog.exec() == QDialog::Accepted)
@@ -346,8 +348,8 @@ void ArrangementDemoWindow::on_actionAddRationalCurve_triggered()
     algCurveInputCallback->generate(cv);
     if (is_first_curve) currentTab->adjustViewport();
   }
-}
 #endif
+}
 
 void ArrangementDemoWindow::on_actionQuit_triggered() { qApp->exit(); }
 
diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.h
index 5b124de65ff..4c338e2a838 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.h
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.h
@@ -78,10 +78,8 @@ public Q_SLOTS:
   void on_actionMerge_toggled(bool);
   void on_actionSplit_toggled(bool);
   void on_actionFill_toggled(bool);
-#ifdef CGAL_USE_CORE
   void on_actionAddAlgebraicCurve_triggered();
   void on_actionAddRationalCurve_triggered();
-#endif
 
 Q_SIGNALS:
   void modelChanged();
diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/RationalTypes.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/RationalTypes.h
index 43d40a55072..8cbca1c1949 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/RationalTypes.h
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/RationalTypes.h
@@ -12,10 +12,10 @@
 #ifndef ARRANGEMENT_DEMO_RATIONAL_TYPES_H
 #define ARRANGEMENT_DEMO_RATIONAL_TYPES_H
 
+#include <CGAL/Cartesian.h>
+#include <CGAL/Point_2.h>
 #ifdef CGAL_USE_CORE
   #include <CGAL/CORE_BigRat.h>
-  #include <CGAL/Cartesian.h>
-  #include <CGAL/Point_2.h>
 #else
   #include <CGAL/Exact_rational.h>
 #endif