diff --git a/Qt_widget/demo/Qt_widget/layer.cpp b/Qt_widget/demo/Qt_widget/layer.cpp
index 5af406a8ff9..dd7345482e5 100644
--- a/Qt_widget/demo/Qt_widget/layer.cpp
+++ b/Qt_widget/demo/Qt_widget/layer.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2004  INRIA Sophia-Antipolis (France).
+// Copyright (c) 2002-2004,2007  INRIA Sophia-Antipolis (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
@@ -75,7 +75,7 @@ private slots:
   }
 }; //endclass
 
-//  moc_source_file : layer.C
+//  moc_source_file : layer.cpp
 #include "layer.moc"
 
 int main( int argc, char **argv )
diff --git a/Qt_widget/demo/Qt_widget/makefile b/Qt_widget/demo/Qt_widget/makefile
index cff22cb7ffc..8f08bc65278 100644
--- a/Qt_widget/demo/Qt_widget/makefile
+++ b/Qt_widget/demo/Qt_widget/makefile
@@ -13,10 +13,10 @@ include $(CGAL_MAKEFILE)
 #                    compiler flags
 #---------------------------------------------------------------------#
 
-CXXFLAGS = -I../../../include \
+CXXFLAGS = \
+           -I../../include \
            $(CGAL_CXXFLAGS) \
-           $(LONG_NAME_PROBLEM_CXXFLAGS) \
-           $(DEBUG_OPT)
+           $(LONG_NAME_PROBLEM_CXXFLAGS)
 
 #---------------------------------------------------------------------#
 #                    linker flags
@@ -27,7 +27,7 @@ LIBPATH = \
 
 LDFLAGS = \
           $(LONG_NAME_PROBLEM_LDFLAGS) \
-          $(CGAL_QT_LDFLAGS) 
+          $(CGAL_QT_LDFLAGS)
 
 #---------------------------------------------------------------------#
 #                    target entries
@@ -35,45 +35,51 @@ LDFLAGS = \
 
 all:            \
                 hellosegment$(EXE_EXT) \
-		tutorial2$(EXE_EXT) \
+                layer$(EXE_EXT) \
                 standard_toolbar$(EXE_EXT) \
-                layer$(EXE_EXT) 
+                tutorial2$(EXE_EXT) 
 
 hellosegment$(EXE_EXT): hellosegment$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)hellosegment hellosegment$(OBJ_EXT) $(LDFLAGS)
 
-tutorial2.moc :
-	$(QT_MOC) tutorial2.cpp -o tutorial2.moc
-
-tutorial2$(EXE_EXT): tutorial2.moc tutorial2$(OBJ_EXT)
-	$(CGAL_CXX)  $(EXE_OPT)tutorial2 tutorial2$(OBJ_EXT) $(LDFLAGS)
-
-standard_toolbar.moc:  standard_toolbar.cpp
-	$(QT_MOC) -o standard_toolbar.moc standard_toolbar.cpp
-
-standard_toolbar$(OBJ_EXT): standard_toolbar.moc
-
-standard_toolbar$(EXE_EXT): standard_toolbar$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)standard_toolbar standard_toolbar$(OBJ_EXT) $(LDFLAGS)
-
 layer.moc:  layer.cpp
-	$(QT_MOC) -o layer.moc layer.cpp
+	$(QT_MOC) -o layer.moc  layer.cpp
 
 layer$(OBJ_EXT): layer.moc
 
 layer$(EXE_EXT): layer$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)layer layer$(OBJ_EXT) $(LDFLAGS)
 
+standard_toolbar.moc:  standard_toolbar.cpp
+	$(QT_MOC) -o standard_toolbar.moc  standard_toolbar.cpp
+
+standard_toolbar$(OBJ_EXT): standard_toolbar.moc
+
+standard_toolbar$(EXE_EXT): standard_toolbar$(OBJ_EXT)
+	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)standard_toolbar standard_toolbar$(OBJ_EXT) $(LDFLAGS)
+
+tutorial2.moc:  tutorial2.cpp
+	$(QT_MOC) -o tutorial2.moc  tutorial2.cpp
+
+tutorial2$(OBJ_EXT): tutorial2.moc
+
+tutorial2$(EXE_EXT): tutorial2$(OBJ_EXT)
+	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)tutorial2 tutorial2$(OBJ_EXT) $(LDFLAGS)
+
 clean: \
                    hellosegment.clean \
-		   tutorial2.clean \
+                   layer.clean \
                    standard_toolbar.clean \
-                   layer.clean 
+                   tutorial2.clean 
 
 #---------------------------------------------------------------------#
 #                    suffix rules
 #---------------------------------------------------------------------#
 
+.C$(OBJ_EXT):
+	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
+
+
 .cpp$(OBJ_EXT):
 	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
 
diff --git a/Qt_widget/demo/Qt_widget/standard_toolbar.cpp b/Qt_widget/demo/Qt_widget/standard_toolbar.cpp
index 36ca4a9a25d..510eb3c212a 100644
--- a/Qt_widget/demo/Qt_widget/standard_toolbar.cpp
+++ b/Qt_widget/demo/Qt_widget/standard_toolbar.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2004  INRIA Sophia-Antipolis (France).
+// Copyright (c) 2002-2004,2007  INRIA Sophia-Antipolis (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
@@ -77,7 +77,7 @@ private:	//members
   CGAL::Qt_widget_standard_toolbar *std_toolbar;
 };
 
-// moc_source_file: standard_toolbar.C
+// moc_source_file: standard_toolbar.cpp
 #include "standard_toolbar.moc"
 
 int main( int argc, char **argv )
diff --git a/Qt_widget/demo/Qt_widget/tutorial2.cpp b/Qt_widget/demo/Qt_widget/tutorial2.cpp
index 692e656276b..52aa5944a5a 100644
--- a/Qt_widget/demo/Qt_widget/tutorial2.cpp
+++ b/Qt_widget/demo/Qt_widget/tutorial2.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2004  INRIA Sophia-Antipolis (France).
+// Copyright (c) 2002-2004,2007  INRIA Sophia-Antipolis (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you can redistribute it and/or
@@ -71,7 +71,7 @@ private: // private data member
   CGAL::Qt_widget* widget;
 };
 
-//moc_source_file : tutorial2.C
+//moc_source_file : tutorial2.cpp
 #include "tutorial2.moc"
 
 int main( int argc, char **argv )
diff --git a/Qt_widget/doc_tex/Qt_widget/qt_widget.tex b/Qt_widget/doc_tex/Qt_widget/qt_widget.tex
index d6ad6bdd1d2..da54a7780cc 100644
--- a/Qt_widget/doc_tex/Qt_widget/qt_widget.tex
+++ b/Qt_widget/doc_tex/Qt_widget/qt_widget.tex
@@ -184,9 +184,9 @@ several methods to compile the outputs of \ccc{moc}. In CGAL, we have
 chosen to include the outputs of \ccc{moc} in a source files. See the
 \qt\ documentation on \ccc{moc} for other possibilities.
 
-The line \ccc{//moc_source_file : tutorial2.C} is for users that use
+The line \ccc{//moc_source_file : tutorial2.cpp} is for users that use
 makefiles. This line tells to the \cgal\ makefile generator that
-\ccc{tutorial2.C} should be the file that \ccc{moc} should be run on.
+\ccc{tutorial2.cpp} should be the file that \ccc{moc} should be run on.
 
 Let us come back to the control flow in the above example.
 The main widget of the application is the widget \ccc{w}
diff --git a/Qt_widget/doc_tex/Qt_widget_ref/Qt_widget.tex b/Qt_widget/doc_tex/Qt_widget_ref/Qt_widget.tex
index 567ad62839f..19e6fe7d60a 100644
--- a/Qt_widget/doc_tex/Qt_widget_ref/Qt_widget.tex
+++ b/Qt_widget/doc_tex/Qt_widget_ref/Qt_widget.tex
@@ -332,8 +332,7 @@ calling layer's redraw.}
 
 \ccExample
 
-In the given example, that is found in
-tutorial/Qt\_widget/tutorial1/tutorial1.C, we create an object of type
+In the given example, we create an object of type
 \ccStyle{Qt_widget} and then we use the operators for output and the
 manipulators to show some of the widget's functionality.