Some CGAL_USE_QT versus <CGAL/basic.h> ordering issues spotted

by the following (quick and very dirty) perl regexp :
perl -0777pi.bak -e 'print m!CGAL_USE_QT(.|[\r\n])*CGAL/basic!g;' */demo/*/*.C

Min_circle_2/demo/Min_circle_2/min_circle_2.C

@@ -33,7 +33,6 @@ int main(int, char*){
 #include <set>
 #include <string>
 
-#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/Min_circle_2.h>
 #include <CGAL/Min_circle_2_traits_2.h>

Min_ellipse_2/demo/Min_ellipse_2/min_ellipse_2.C

@@ -40,7 +40,6 @@ int main(int, char*)
 #include <set>
 #include <string>
 
-#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/Min_ellipse_2.h>
 #include <CGAL/Min_ellipse_2_traits_2.h>

Min_quadrilateral_2/demo/Min_quadrilateral_2/min_quadrilateral_2.C

@@ -23,13 +23,10 @@
 #ifndef CGAL_USE_QT
 #include <iostream>
 
-
 int main(int, char*)
 {
-
   std::cout << "Sorry, this demo needs QT...";
   std::cout << std::endl;
-
   return 0;
 }
 
@@ -41,7 +38,6 @@ int main(int, char*)
 #include <string>
 
 //CGAL
-#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/point_generators_2.h>
 #include <CGAL/Polygon_2.h>

Minkowski_sum_2/demo/Minkowski_sum_2/Minkowski_demo.C

@@ -1,6 +1,9 @@
 /*
  * A simple demo that computes the Minkowski sum of two polygons.
  */
+
+#include <CGAL/basic.h>
+
 #ifndef CGAL_USE_QT
 
 #include <iostream>
@@ -17,8 +20,6 @@ int main ()
 //#define RWRW_STATS
 #define USE_LAZY_KERNEL
 
-#include <CGAL/basic.h>
-
 #ifdef USE_LAZY_KERNEL
 
 /*

Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo2.C

@@ -18,6 +18,8 @@
 // Author(s)     : Michael Seel       <seel@mpi-sb.mpg.de>
 //                 Peter Hachenberger <hachenberger@mpi-sb.mpg.de>
 
+#include <CGAL/basic.h>
+
 #ifndef CGAL_USE_QT
 #include <iostream>
 int main(int, char*){

Partition_2/demo/Partition_2/partition_2.C

@@ -23,18 +23,15 @@
 #ifndef CGAL_USE_QT
 #include <iostream>
 
-
 int main(int, char*)
 {
-
   std::cout << "Sorry, this demo needs QT...";
   std::cout << std::endl;
-
   return 0;
 }
 
 #else
-#include <CGAL/basic.h>
+
 #include <qplatinumstyle.h>
 #include <qapplication.h>
 #include <qmainwindow.h>

Stream_lines_2/demo/Stream_lines_2/streamlines.C

@@ -1,18 +1,19 @@
 // if QT is not installed, a message will be issued in runtime.
+
+#include <CGAL/basic.h>
 #include <iostream>
+
 #ifndef CGAL_USE_QT
 
 int main(int, char*)
 {
-
   std::cout << "Sorry, this demo needs QT...";
   std::cout << std::endl;
-
   return 0;
 }
 
 #else
-#include <CGAL/basic.h>
+
 #include <qapplication.h>
 #include <qfont.h>
 #include <qpushbutton.h>

Triangulation_2/demo/Triangulation_2/constrained.C

@@ -25,10 +25,8 @@
 
 int main(int, char*)
 {
-
   std::cout << "Sorry, this demo needs QT...";
   std::cout << std::endl;
-
   return 0;
 }
 
@@ -39,7 +37,6 @@ int main(int, char*)
 #include <set>
 #include <string>
 
-#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/Point_2.h>
 #include <CGAL/Triangulation_euclidean_traits_2.h>