From ea71b8eaa1f4ae937df00cf4f2f00fb6f075b709 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <Andreas.Fabri@geometryfactory.com>
Date: Wed, 11 Apr 2007 13:59:20 +0000
Subject: [PATCH] .C ->.cpp and autolinking

---
 .../demo/Alpha_shapes_3/alpha_shapes_3.vcproj | 10 +++++-----
 .../weighted_alpha_shapes_3.vcproj            | 10 +++++-----
 .../apollonius_graph_2.vcproj                 | 14 ++++++-------
 .../demo/Arrangement_2/arrangement_2.vcproj   | 20 +++++++++----------
 .../boolean_operations.vcproj                 | 16 +++++++--------
 .../demo/Circular_kernel_2/demo.vcproj        | 16 +++++++--------
 .../demo/Convex_hull_2/convex_hull_2.vcproj   | 14 ++++++-------
 Generator/demo/Generator/generator.vcproj     | 14 ++++++-------
 .../Delaunay_triangulation_2.vcproj           | 10 +++++-----
 .../largest_empty_rect_2.vcproj               | 14 ++++++-------
 .../demo/Matrix_search/max_k-gon.vcproj       | 18 ++++++++---------
 .../rectangular_p_center_2.vcproj             | 18 ++++++++---------
 Mesh_2/demo/Mesh_2/mesh_demo.vcproj           |  8 ++++----
 .../demo/Min_circle_2/min_circle_2.vcproj     | 18 ++++++++---------
 .../demo/Min_ellipse_2/min_ellipse_2.vcproj   | 14 ++++++-------
 .../min_quadrilateral_2.vcproj                | 16 +++++++--------
 Nef_2/demo/Nef_2/nef_2.vcproj                 | 14 ++++++-------
 Nef_3/demo/Nef_3/nef_3.vcproj                 | 10 +++++-----
 Nef_3/demo/Nef_3/visual_hull.vcproj           | 10 +++++-----
 Nef_3/demo/Nef_3/visualization_SM.vcproj      | 10 +++++-----
 Nef_3/demo/Nef_3/visualization_SNC.vcproj     | 10 +++++-----
 Nef_S2/demo/Nef_S2/visualization.vcproj       | 10 +++++-----
 .../demo/Partition_2/partition_2.vcproj       | 18 ++++++++---------
 Polygon/demo/Polygon/polygon_2.vcproj         | 16 +++++++--------
 .../linear_least_squares_fitting.vcproj       | 16 +++++++--------
 Qt_widget/demo/Qt_widget/hellosegment.vcproj  | 10 +++++-----
 Qt_widget/demo/Qt_widget/layer.vcproj         | 14 ++++++-------
 .../demo/Qt_widget/standard_toolbar.vcproj    | 14 ++++++-------
 Qt_widget/demo/Qt_widget/tutorial2.vcproj     | 14 ++++++-------
 Robustness/demo/Robustness/robustness.vcproj  | 14 ++++++-------
 .../polygon_delaunay_graph_2.vcproj           | 10 +++++-----
 .../segment_delaunay_graph_2.vcproj           | 10 +++++-----
 .../Snap_rounding_2/snap_rounding_2.vcproj    | 12 +++++------
 .../spatial_searching.vcproj                  | 18 ++++++++---------
 .../straight_skeleton_2.vcproj                | 18 ++++++++---------
 .../demo/Stream_lines_2/streamlines.vcproj    | 14 ++++++-------
 .../mesh_a_3d_gray_image.vcproj               |  4 ++--
 ...onstrained_delaunay_triangulation_2.vcproj | 18 ++++++++---------
 .../delaunay_triangulation_2.vcproj           | 16 +++++++--------
 .../regular_triangulation_2.vcproj            | 20 +++++++++----------
 .../voronoi_diagram_2.vcproj                  | 12 +++++------
 41 files changed, 281 insertions(+), 281 deletions(-)

diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/alpha_shapes_3.vcproj b/Alpha_shapes_3/demo/Alpha_shapes_3/alpha_shapes_3.vcproj
index c026f7e5bd0..793cdd7319d 100644
--- a/Alpha_shapes_3/demo/Alpha_shapes_3/alpha_shapes_3.vcproj
+++ b/Alpha_shapes_3/demo/Alpha_shapes_3/alpha_shapes_3.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/alpha_shapes_3.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/alpha_shapes_3.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -125,7 +125,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\alpha_shapes_3.C">
+				RelativePath=".\alpha_shapes_3.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/weighted_alpha_shapes_3.vcproj b/Alpha_shapes_3/demo/Alpha_shapes_3/weighted_alpha_shapes_3.vcproj
index 032ee36cfb1..6d3289d933b 100644
--- a/Alpha_shapes_3/demo/Alpha_shapes_3/weighted_alpha_shapes_3.vcproj
+++ b/Alpha_shapes_3/demo/Alpha_shapes_3/weighted_alpha_shapes_3.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/weighted_alpha_shapes_3.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/alpha_shapes_3.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -125,7 +125,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\weighted_alpha_shapes_3.C">
+				RelativePath=".\weighted_alpha_shapes_3.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Apollonius_graph_2/demo/Apollonius_graph_2/apollonius_graph_2.vcproj b/Apollonius_graph_2/demo/Apollonius_graph_2/apollonius_graph_2.vcproj
index cb889183fe9..bbbaf67aa61 100644
--- a/Apollonius_graph_2/demo/Apollonius_graph_2/apollonius_graph_2.vcproj
+++ b/Apollonius_graph_2/demo/Apollonius_graph_2/apollonius_graph_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;CGAL_USE_QT;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib  winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib  winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/apollonius_graph_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames=""
@@ -49,7 +49,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o apollonius_graph_2.moc apollonius_graph_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o apollonius_graph_2.moc apollonius_graph_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -77,7 +77,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -91,7 +91,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib  winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib  winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/apollonius_graph_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -106,7 +106,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o apollonius_graph_2.moc apollonius_graph_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o apollonius_graph_2.moc apollonius_graph_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -130,7 +130,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="apollonius_graph_2.C">
+				RelativePath="apollonius_graph_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Arrangement_2/demo/Arrangement_2/arrangement_2.vcproj b/Arrangement_2/demo/Arrangement_2/arrangement_2.vcproj
index f99ceef1f89..76fe8bec026 100644
--- a/Arrangement_2/demo/Arrangement_2/arrangement_2.vcproj
+++ b/Arrangement_2/demo/Arrangement_2/arrangement_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_CORE;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib gmp.lib mpfr.lib core++.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib gmp.lib mpfr.lib  qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/arrangement_2.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_CORE;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib gmp.lib mpfr.lib core++.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib gmp.lib mpfr.lib  qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/arrangement_2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -125,7 +125,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\forms.C">
+				RelativePath=".\forms.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -140,7 +140,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\MyWindow.C">
+				RelativePath=".\MyWindow.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -155,7 +155,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\MyWindow_files.C">
+				RelativePath=".\MyWindow_files.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -170,7 +170,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\MyWindow_operations.C">
+				RelativePath=".\MyWindow_operations.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -185,7 +185,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\MyWindow_overlay.C">
+				RelativePath=".\MyWindow_overlay.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -200,7 +200,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\qt_layer.C">
+				RelativePath=".\qt_layer.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2/boolean_operations.vcproj b/Boolean_set_operations_2/demo/Boolean_set_operations_2/boolean_operations.vcproj
index bdd65512e8a..06693951aa9 100644
--- a/Boolean_set_operations_2/demo/Boolean_set_operations_2/boolean_operations.vcproj
+++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2/boolean_operations.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/boolean_operations_2.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -47,7 +47,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o boolean_operations_2.moc boolean_operations_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o boolean_operations_2.moc boolean_operations_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/boolean_operations_2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -103,7 +103,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o boolean_operations_2.moc boolean_operations_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o boolean_operations_2.moc boolean_operations_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -127,7 +127,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\boolean_operations_2.C">
+				RelativePath=".\boolean_operations_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -142,7 +142,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\boolean_operations_2_toolbar.C">
+				RelativePath=".\boolean_operations_2_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/demo.vcproj b/Circular_kernel_2/demo/Circular_kernel_2/demo.vcproj
index c908fad085e..246397ebfe1 100644
--- a/Circular_kernel_2/demo/Circular_kernel_2/demo.vcproj
+++ b/Circular_kernel_2/demo/Circular_kernel_2/demo.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/demo.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames=""
@@ -49,7 +49,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o demo.moc demo.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o demo.moc demo.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -77,7 +77,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -92,7 +92,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/demo.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -107,7 +107,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o demo.moc demo.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o demo.moc demo.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -131,10 +131,10 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\demo.C">
+				RelativePath=".\demo.cpp">
 			</File>
 			<File
-				RelativePath=".\Qt_widget_get_arc.C">
+				RelativePath=".\Qt_widget_get_arc.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/Convex_hull_2/demo/Convex_hull_2/convex_hull_2.vcproj b/Convex_hull_2/demo/Convex_hull_2/convex_hull_2.vcproj
index dbb76c6a5b5..7eed374542d 100644
--- a/Convex_hull_2/demo/Convex_hull_2/convex_hull_2.vcproj
+++ b/Convex_hull_2/demo/Convex_hull_2/convex_hull_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/convex_hull_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC"
@@ -76,7 +76,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -90,7 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/convex_hull_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -128,7 +128,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="convex_hull_2.C">
+				RelativePath="convex_hull_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -143,7 +143,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_move_list_point.C">
+				RelativePath="Qt_widget_move_list_point.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -158,7 +158,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_toolbar.C">
+				RelativePath="Qt_widget_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Generator/demo/Generator/generator.vcproj b/Generator/demo/Generator/generator.vcproj
index fe1f7ebccd5..4e8948a76ea 100644
--- a/Generator/demo/Generator/generator.vcproj
+++ b/Generator/demo/Generator/generator.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
 				OutputFile="$(OutDir)/generator.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames=""
@@ -48,7 +48,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o generator.moc generator.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o generator.moc generator.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -76,7 +76,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -90,7 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
 				OutputFile="$(OutDir)/generator.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -105,7 +105,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o generator.moc generator.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o generator.moc generator.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -129,7 +129,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="generator.C">
+				RelativePath="generator.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/Delaunay_triangulation_2.vcproj b/Kinetic_data_structures/demo/Kinetic_data_structures/Delaunay_triangulation_2.vcproj
index 4755fe57ffc..3c54ca6b6ae 100644
--- a/Kinetic_data_structures/demo/Kinetic_data_structures/Delaunay_triangulation_2.vcproj
+++ b/Kinetic_data_structures/demo/Kinetic_data_structures/Delaunay_triangulation_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP;CGAL_USE_CORE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib core++.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib  gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/Delaunay_triangulation_2.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP;CGAL_USE_CORE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib core++.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib  gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/Delaunay_triangulation_2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -125,7 +125,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\Delaunay_triangulation_2.C">
+				RelativePath=".\Delaunay_triangulation_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Largest_empty_rect_2/demo/Largest_empty_rect_2/largest_empty_rect_2.vcproj b/Largest_empty_rect_2/demo/Largest_empty_rect_2/largest_empty_rect_2.vcproj
index 6010fa064a4..131b3f50269 100644
--- a/Largest_empty_rect_2/demo/Largest_empty_rect_2/largest_empty_rect_2.vcproj
+++ b/Largest_empty_rect_2/demo/Largest_empty_rect_2/largest_empty_rect_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/largest_empty_rect_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC"
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/largest_empty_rect_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -127,7 +127,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="largest_empty_rect_2.C">
+				RelativePath="largest_empty_rect_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -142,7 +142,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_move_list_point.C">
+				RelativePath="Qt_widget_move_list_point.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -157,7 +157,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_toolbar.C">
+				RelativePath="Qt_widget_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Matrix_search/demo/Matrix_search/max_k-gon.vcproj b/Matrix_search/demo/Matrix_search/max_k-gon.vcproj
index 0af9e2d1a08..633618853ac 100644
--- a/Matrix_search/demo/Matrix_search/max_k-gon.vcproj
+++ b/Matrix_search/demo/Matrix_search/max_k-gon.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/max_k-gon.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames=""
@@ -48,7 +48,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o max_k-gon.moc max_k-gon.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o max_k-gon.moc max_k-gon.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -76,7 +76,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -90,7 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/max_k-gon.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -105,7 +105,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o max_k-gon.moc max_k-gon.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o max_k-gon.moc max_k-gon.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -129,7 +129,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="max_k-gon.C">
+				RelativePath="max_k-gon.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -144,7 +144,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_move_list_point.C">
+				RelativePath="Qt_widget_move_list_point.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -159,7 +159,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_toolbar.C">
+				RelativePath="Qt_widget_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Matrix_search/demo/Matrix_search/rectangular_p_center_2.vcproj b/Matrix_search/demo/Matrix_search/rectangular_p_center_2.vcproj
index bb91c9f7381..dfae50427f9 100644
--- a/Matrix_search/demo/Matrix_search/rectangular_p_center_2.vcproj
+++ b/Matrix_search/demo/Matrix_search/rectangular_p_center_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/rectangular_p_center_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames=""
@@ -48,7 +48,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o rectangular_p_center_2.moc rectangular_p_center_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o rectangular_p_center_2.moc rectangular_p_center_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -76,7 +76,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -90,7 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/rectangular_p_center_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -105,7 +105,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o rectangular_p_center_2.moc rectangular_p_center_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o rectangular_p_center_2.moc rectangular_p_center_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -129,7 +129,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="Qt_widget_move_list_point.C">
+				RelativePath="Qt_widget_move_list_point.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -144,7 +144,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_toolbar.C">
+				RelativePath="Qt_widget_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -159,7 +159,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="rectangular_p_center_2.C">
+				RelativePath="rectangular_p_center_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Mesh_2/demo/Mesh_2/mesh_demo.vcproj b/Mesh_2/demo/Mesh_2/mesh_demo.vcproj
index 0162fb15561..5800d6b41cc 100644
--- a/Mesh_2/demo/Mesh_2/mesh_demo.vcproj
+++ b/Mesh_2/demo/Mesh_2/mesh_demo.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/mesh_demo.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/mesh_demo.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/Min_circle_2/demo/Min_circle_2/min_circle_2.vcproj b/Min_circle_2/demo/Min_circle_2/min_circle_2.vcproj
index cd3bcf495eb..a17c9be90d8 100644
--- a/Min_circle_2/demo/Min_circle_2/min_circle_2.vcproj
+++ b/Min_circle_2/demo/Min_circle_2/min_circle_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/min_circle_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC"
@@ -48,7 +48,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o min_circle_2.moc min_circle_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o min_circle_2.moc min_circle_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -76,7 +76,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -90,7 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/min_circle_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -105,7 +105,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o min_circle_2.moc min_circle_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o min_circle_2.moc min_circle_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -129,7 +129,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="min_circle_2.C">
+				RelativePath="min_circle_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -144,7 +144,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="min_circle_2_toolbar.C">
+				RelativePath="min_circle_2_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -159,7 +159,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_move_list_point.C">
+				RelativePath="Qt_widget_move_list_point.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Min_ellipse_2/demo/Min_ellipse_2/min_ellipse_2.vcproj b/Min_ellipse_2/demo/Min_ellipse_2/min_ellipse_2.vcproj
index 25ab84dfa80..3769164e68e 100644
--- a/Min_ellipse_2/demo/Min_ellipse_2/min_ellipse_2.vcproj
+++ b/Min_ellipse_2/demo/Min_ellipse_2/min_ellipse_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/min_ellipse_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC"
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_GMP;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/min_ellipse_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -127,7 +127,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="min_ellipse_2.C">
+				RelativePath="min_ellipse_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -142,7 +142,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_move_list_point.C">
+				RelativePath="Qt_widget_move_list_point.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -157,7 +157,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_toolbar.C">
+				RelativePath="Qt_widget_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Min_quadrilateral_2/demo/Min_quadrilateral_2/min_quadrilateral_2.vcproj b/Min_quadrilateral_2/demo/Min_quadrilateral_2/min_quadrilateral_2.vcproj
index a9dc5228efa..e2ca1be77d0 100644
--- a/Min_quadrilateral_2/demo/Min_quadrilateral_2/min_quadrilateral_2.vcproj
+++ b/Min_quadrilateral_2/demo/Min_quadrilateral_2/min_quadrilateral_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/GR /Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_GMP;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/min_quadrilateral_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames=""
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/min_quadrilateral_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -126,7 +126,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="min_quadrilateral_2.C">
+				RelativePath="min_quadrilateral_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -141,7 +141,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_move_list_point.C">
+				RelativePath="Qt_widget_move_list_point.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -156,7 +156,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_toolbar.C">
+				RelativePath="Qt_widget_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -171,7 +171,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_toolbar_layers.C">
+				RelativePath="Qt_widget_toolbar_layers.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Nef_2/demo/Nef_2/nef_2.vcproj b/Nef_2/demo/Nef_2/nef_2.vcproj
index 8a5d7268240..7a3f968ac02 100644
--- a/Nef_2/demo/Nef_2/nef_2.vcproj
+++ b/Nef_2/demo/Nef_2/nef_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib gmp.lib mpfr.lib  wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib gmp.lib mpfr.lib  wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/nef_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC"
@@ -76,7 +76,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;CGAL_USE_QT;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -91,7 +91,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib gmp.lib mpfr.lib  wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib gmp.lib mpfr.lib  wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/nef_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -129,7 +129,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="nef_2.C">
+				RelativePath="nef_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -138,7 +138,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="Qt_widget_toolbar.C">
+				RelativePath="Qt_widget_toolbar.cpp">
 			</File>
 		</Filter>
 		<Filter
@@ -153,7 +153,7 @@
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="$(QTDIR)/bin/moc.exe -o nef_2.moc nef_2.C"
+						CommandLine="$(QTDIR)/bin/moc.exe -o nef_2.moc nef_2.cpp"
 						Outputs="nef_2.moc"/>
 				</FileConfiguration>
 				<FileConfiguration
diff --git a/Nef_3/demo/Nef_3/nef_3.vcproj b/Nef_3/demo/Nef_3/nef_3.vcproj
index 1f66f1d46bd..aa5fb4897ba 100644
--- a/Nef_3/demo/Nef_3/nef_3.vcproj
+++ b/Nef_3/demo/Nef_3/nef_3.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;CGAL_USE_QT;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib  wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib  wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/nef_3.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -73,7 +73,7 @@
 				AdditionalOptions="/Zm900"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="FALSE"
@@ -86,7 +86,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/nef_3.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -123,7 +123,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\nef_3.C">
+				RelativePath=".\nef_3.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Nef_3/demo/Nef_3/visual_hull.vcproj b/Nef_3/demo/Nef_3/visual_hull.vcproj
index e7b890dacf6..ab6f0f025d6 100644
--- a/Nef_3/demo/Nef_3/visual_hull.vcproj
+++ b/Nef_3/demo/Nef_3/visual_hull.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/visual_hull.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib  gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib  gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/visual_hull.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -125,7 +125,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\visual_hull.C">
+				RelativePath=".\visual_hull.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Nef_3/demo/Nef_3/visualization_SM.vcproj b/Nef_3/demo/Nef_3/visualization_SM.vcproj
index 63319457a9e..13228439ccc 100644
--- a/Nef_3/demo/Nef_3/visualization_SM.vcproj
+++ b/Nef_3/demo/Nef_3/visualization_SM.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/visualization_SM.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib  gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib  gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/visualization_SM.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -125,7 +125,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\visualization_SM.C">
+				RelativePath=".\visualization_SM.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Nef_3/demo/Nef_3/visualization_SNC.vcproj b/Nef_3/demo/Nef_3/visualization_SNC.vcproj
index 26882c040a5..961e62b307e 100644
--- a/Nef_3/demo/Nef_3/visualization_SNC.vcproj
+++ b/Nef_3/demo/Nef_3/visualization_SNC.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/visualization_SNC.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib  gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib  gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/visualization_SNC.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -125,7 +125,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\visualization_SNC.C">
+				RelativePath=".\visualization_SNC.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Nef_S2/demo/Nef_S2/visualization.vcproj b/Nef_S2/demo/Nef_S2/visualization.vcproj
index ed37978e290..f8db915eafe 100644
--- a/Nef_S2/demo/Nef_S2/visualization.vcproj
+++ b/Nef_S2/demo/Nef_S2/visualization.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/visualization.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib  gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib  gmp.lib mpfr.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/visual_hull.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -125,7 +125,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\visualization.C">
+				RelativePath=".\visualization.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Partition_2/demo/Partition_2/partition_2.vcproj b/Partition_2/demo/Partition_2/partition_2.vcproj
index e147cc8c829..0a730bb930e 100644
--- a/Partition_2/demo/Partition_2/partition_2.vcproj
+++ b/Partition_2/demo/Partition_2/partition_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/partition_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames=""
@@ -49,7 +49,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o partition_2.moc partition_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o partition_2.moc partition_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -77,7 +77,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -91,7 +91,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/partition_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -106,7 +106,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o partition_2.moc partition_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o partition_2.moc partition_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -130,7 +130,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="partition_2.C">
+				RelativePath="partition_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -145,7 +145,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="partition_2_toolbar.C">
+				RelativePath="partition_2_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -160,7 +160,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="partition_2_toolbar_layers.C">
+				RelativePath="partition_2_toolbar_layers.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Polygon/demo/Polygon/polygon_2.vcproj b/Polygon/demo/Polygon/polygon_2.vcproj
index 5c8bb31cc6c..6fa1741b6a8 100644
--- a/Polygon/demo/Polygon/polygon_2.vcproj
+++ b/Polygon/demo/Polygon/polygon_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/polygon_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC"
@@ -48,7 +48,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o polygon_2.moc polygon_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o polygon_2.moc polygon_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -76,7 +76,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -90,7 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/polygon_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -105,7 +105,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o polygon_2.moc polygon_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o polygon_2.moc polygon_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -129,7 +129,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="polygon_2.C">
+				RelativePath="polygon_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -144,7 +144,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="polygon_2_toolbar.C">
+				RelativePath="polygon_2_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Principal_component_analysis/demo/Principal_component_analysis/linear_least_squares_fitting.vcproj b/Principal_component_analysis/demo/Principal_component_analysis/linear_least_squares_fitting.vcproj
index 85eb976ece8..70b870a0d68 100644
--- a/Principal_component_analysis/demo/Principal_component_analysis/linear_least_squares_fitting.vcproj
+++ b/Principal_component_analysis/demo/Principal_component_analysis/linear_least_squares_fitting.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/robustness.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -47,7 +47,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o linear_least_squares_fitting.moc linear_least_squares_fitting.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o linear_least_squares_fitting.moc linear_least_squares_fitting.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/robustness.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -103,7 +103,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o linear_least_squares_fitting.moc linear_least_squares_fitting.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o linear_least_squares_fitting.moc linear_least_squares_fitting.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -127,7 +127,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\linear_least_squares_fitting.C">
+				RelativePath=".\linear_least_squares_fitting.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -142,7 +142,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\linear_least_squares_fitting_toolbar.C">
+				RelativePath=".\linear_least_squares_fitting_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Qt_widget/demo/Qt_widget/hellosegment.vcproj b/Qt_widget/demo/Qt_widget/hellosegment.vcproj
index 60312c42a1b..935d4da9f76 100644
--- a/Qt_widget/demo/Qt_widget/hellosegment.vcproj
+++ b/Qt_widget/demo/Qt_widget/hellosegment.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/hellosegment.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/hellosegment.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -125,7 +125,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\hellosegment.C">
+				RelativePath=".\hellosegment.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Qt_widget/demo/Qt_widget/layer.vcproj b/Qt_widget/demo/Qt_widget/layer.vcproj
index 70c2a36aadc..272984ee05e 100644
--- a/Qt_widget/demo/Qt_widget/layer.vcproj
+++ b/Qt_widget/demo/Qt_widget/layer.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/layer.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -47,7 +47,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o layer.moc layer.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o layer.moc layer.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/layer.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -103,7 +103,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o layer.moc layer.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o layer.moc layer.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -127,7 +127,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\layer.C">
+				RelativePath=".\layer.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Qt_widget/demo/Qt_widget/standard_toolbar.vcproj b/Qt_widget/demo/Qt_widget/standard_toolbar.vcproj
index de52ad6b0af..8b2970407f0 100644
--- a/Qt_widget/demo/Qt_widget/standard_toolbar.vcproj
+++ b/Qt_widget/demo/Qt_widget/standard_toolbar.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/standard_toolbar.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -47,7 +47,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o standard_toolbar.moc standard_toolbar.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o standard_toolbar.moc standard_toolbar.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/standard_toolbar.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -103,7 +103,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o standard_toolbar.moc standard_toolbar.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o standard_toolbar.moc standard_toolbar.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -127,7 +127,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\standard_toolbar.C">
+				RelativePath=".\standard_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Qt_widget/demo/Qt_widget/tutorial2.vcproj b/Qt_widget/demo/Qt_widget/tutorial2.vcproj
index 019984f6f18..a8ef9952b95 100644
--- a/Qt_widget/demo/Qt_widget/tutorial2.vcproj
+++ b/Qt_widget/demo/Qt_widget/tutorial2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/tutorial2.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -47,7 +47,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o tutorial2.moc tutorial2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o tutorial2.moc tutorial2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/tutorial2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -103,7 +103,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o tutorial2.moc tutorial2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o tutorial2.moc tutorial2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -127,7 +127,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\tutorial2.C">
+				RelativePath=".\tutorial2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Robustness/demo/Robustness/robustness.vcproj b/Robustness/demo/Robustness/robustness.vcproj
index 5fc8ccf3400..8dc136023e4 100644
--- a/Robustness/demo/Robustness/robustness.vcproj
+++ b/Robustness/demo/Robustness/robustness.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/robustness.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -47,7 +47,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o robustness.moc robustness.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o robustness.moc robustness.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/robustness.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -103,7 +103,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o robustness.moc robustness.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o robustness.moc robustness.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -127,7 +127,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="robustness.C">
+				RelativePath="robustness.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/polygon_delaunay_graph_2.vcproj b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/polygon_delaunay_graph_2.vcproj
index 53613c04745..749c56eb9b1 100644
--- a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/polygon_delaunay_graph_2.vcproj
+++ b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/polygon_delaunay_graph_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_CORE;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib core++.lib gmp.lib mpfr.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  gmp.lib mpfr.lib  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/polygon_delaunay_graph_2.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_CORE;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib core++.lib gmp.lib mpfr.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  gmp.lib mpfr.lib  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/polygon_delaunay_graph_2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -125,7 +125,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\polygon_delaunay_graph_2.C">
+				RelativePath=".\polygon_delaunay_graph_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/segment_delaunay_graph_2.vcproj b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/segment_delaunay_graph_2.vcproj
index 7b9262e93e3..e32939adc36 100644
--- a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/segment_delaunay_graph_2.vcproj
+++ b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/segment_delaunay_graph_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_CORE;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib core++.lib gmp.lib mpfr.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  gmp.lib mpfr.lib  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/segment_delaunay_graph_2.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_CORE;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib core++.lib gmp.lib mpfr.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  gmp.lib mpfr.lib  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/segment_delaunay_graph_2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -125,7 +125,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\segment_delaunay_graph_2.C">
+				RelativePath=".\segment_delaunay_graph_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.vcproj b/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.vcproj
index a2e7b1f1e21..19fb8ce0182 100644
--- a/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.vcproj
+++ b/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -48,7 +48,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o snap_rounding_2.moc snap_rounding_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o snap_rounding_2.moc snap_rounding_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -72,7 +72,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
@@ -100,7 +100,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o snap_rounding_2.moc snap_rounding_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o snap_rounding_2.moc snap_rounding_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -125,10 +125,10 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\snap_rounding_2.C">
+				RelativePath=".\snap_rounding_2.cpp">
 			</File>
 			<File
-				RelativePath=".\snap_rounding_2_toolbar.C">
+				RelativePath=".\snap_rounding_2_toolbar.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/Spatial_searching/demo/Spatial_searching/spatial_searching.vcproj b/Spatial_searching/demo/Spatial_searching/spatial_searching.vcproj
index d1a99a63c81..d04b8fb95cf 100644
--- a/Spatial_searching/demo/Spatial_searching/spatial_searching.vcproj
+++ b/Spatial_searching/demo/Spatial_searching/spatial_searching.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;$(QTDIR)/include"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
 				OutputFile="$(OutDir)/spatial_searching.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -47,7 +47,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o spatial_searching.moc spatial_searching.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o spatial_searching.moc spatial_searching.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;$(QTDIR)/include"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
 				OutputFile="$(OutDir)/spatial_searching.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -102,7 +102,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o spatial_searching.moc spatial_searching.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o spatial_searching.moc spatial_searching.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -126,7 +126,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="Qt_widget_move_list_point.C">
+				RelativePath="Qt_widget_move_list_point.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -141,7 +141,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="spatial_searching.C">
+				RelativePath="spatial_searching.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -156,7 +156,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="spatial_searching_toolbar.C">
+				RelativePath="spatial_searching_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Straight_skeleton_2/demo/Straight_skeleton_2/straight_skeleton_2.vcproj b/Straight_skeleton_2/demo/Straight_skeleton_2/straight_skeleton_2.vcproj
index 47520adc873..e6006da4338 100644
--- a/Straight_skeleton_2/demo/Straight_skeleton_2/straight_skeleton_2.vcproj
+++ b/Straight_skeleton_2/demo/Straight_skeleton_2/straight_skeleton_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/straight_skeleton_2.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -47,7 +47,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o straight_skeleton_2.moc straight_skeleton_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o straight_skeleton_2.moc straight_skeleton_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/straight_skeleton_2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -103,7 +103,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o straight_skeleton_2.moc straight_skeleton_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o straight_skeleton_2.moc straight_skeleton_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -127,7 +127,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\straight_skeleton_2.C">
+				RelativePath=".\straight_skeleton_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -142,7 +142,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\straight_skeleton_2_toolbar.C">
+				RelativePath=".\straight_skeleton_2_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -157,7 +157,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\straight_skeleton_2_toolbar_layers.C">
+				RelativePath=".\straight_skeleton_2_toolbar_layers.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Stream_lines_2/demo/Stream_lines_2/streamlines.vcproj b/Stream_lines_2/demo/Stream_lines_2/streamlines.vcproj
index 901742e5a48..f51a3276851 100644
--- a/Stream_lines_2/demo/Stream_lines_2/streamlines.vcproj
+++ b/Stream_lines_2/demo/Stream_lines_2/streamlines.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/streamlines.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -47,7 +47,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o streamlines.moc streamlines.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o streamlines.moc streamlines.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib Opengl32.lib Glu32.lib"
 				OutputFile="$(OutDir)/streamlines.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -103,7 +103,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o streamlines.moc streamlines.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o streamlines.moc streamlines.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -127,7 +127,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\streamlines.C">
+				RelativePath=".\streamlines.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Surface_mesher/examples/Surface_mesher/mesh_a_3d_gray_image.vcproj b/Surface_mesher/examples/Surface_mesher/mesh_a_3d_gray_image.vcproj
index 7345769e777..cb0e1073bbf 100644
--- a/Surface_mesher/examples/Surface_mesher/mesh_a_3d_gray_image.vcproj
+++ b/Surface_mesher/examples/Surface_mesher/mesh_a_3d_gray_image.vcproj
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib zdll.lib"
+				AdditionalDependencies=" zdll.lib"
 				OutputFile="$(OutDir)/mesh_a_3d_gray_image.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;..\..\lib\msvc7&quot;"
@@ -83,7 +83,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib zdll.lib"
+				AdditionalDependencies=" zdll.lib"
 				OutputFile="$(OutDir)/mesh_a_3d_gray_image.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;..\..\lib\msvc7&quot;"
diff --git a/Triangulation_2/demo/Triangulation_2/constrained_delaunay_triangulation_2.vcproj b/Triangulation_2/demo/Triangulation_2/constrained_delaunay_triangulation_2.vcproj
index 4545f352312..238809187ee 100644
--- a/Triangulation_2/demo/Triangulation_2/constrained_delaunay_triangulation_2.vcproj
+++ b/Triangulation_2/demo/Triangulation_2/constrained_delaunay_triangulation_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
 				OutputFile="$(OutDir)/constrained_delaunay_triangulation_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC"
@@ -48,7 +48,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o constrained_delaunay_triangulation_2.moc constrained_delaunay_triangulation_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o constrained_delaunay_triangulation_2.moc constrained_delaunay_triangulation_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -76,7 +76,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -90,7 +90,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib "
 				OutputFile="$(OutDir)/constrained_delaunay_triangulation_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -104,7 +104,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o constrained_delaunay_triangulation_2.moc constrained_delaunay_triangulation_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o constrained_delaunay_triangulation_2.moc constrained_delaunay_triangulation_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -128,7 +128,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="constrained_delaunay_triangulation_2.C">
+				RelativePath="constrained_delaunay_triangulation_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -143,7 +143,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="constrained_delaunay_triangulation_2_toolbar.C">
+				RelativePath="constrained_delaunay_triangulation_2_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -158,7 +158,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="constrained_delaunay_triangulation_2_toolbar_layers.C">
+				RelativePath="constrained_delaunay_triangulation_2_toolbar_layers.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Triangulation_2/demo/Triangulation_2/delaunay_triangulation_2.vcproj b/Triangulation_2/demo/Triangulation_2/delaunay_triangulation_2.vcproj
index 216de211f17..f866b61ace2 100644
--- a/Triangulation_2/demo/Triangulation_2/delaunay_triangulation_2.vcproj
+++ b/Triangulation_2/demo/Triangulation_2/delaunay_triangulation_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/delaunay_triangulation_2.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames=""
@@ -77,7 +77,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\mkspecs\win32-msvc&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT;CGAL_USE_GMP"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -92,7 +92,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/delaunay_triangulation_2.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -131,7 +131,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="delaunay_triangulation_2.C">
+				RelativePath="delaunay_triangulation_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -146,7 +146,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="delaunay_triangulation_2_toolbar.C">
+				RelativePath="delaunay_triangulation_2_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -161,7 +161,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="delaunay_triangulation_2_toolbar_layers.C">
+				RelativePath="delaunay_triangulation_2_toolbar_layers.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -176,7 +176,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="triangulation_2_edit_vertex.C">
+				RelativePath="triangulation_2_edit_vertex.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Triangulation_2/demo/Triangulation_2/regular_triangulation_2.vcproj b/Triangulation_2/demo/Triangulation_2/regular_triangulation_2.vcproj
index 7ece5b63b56..ae4ec935970 100644
--- a/Triangulation_2/demo/Triangulation_2/regular_triangulation_2.vcproj
+++ b/Triangulation_2/demo/Triangulation_2/regular_triangulation_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)/include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)/include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib imm32.lib wsock32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib imm32.lib wsock32.lib"
 				OutputFile="$(OutDir)/regular_triangulation_2.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -47,7 +47,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o regular_triangulation_2.moc regular_triangulation_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o regular_triangulation_2.moc regular_triangulation_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -75,7 +75,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc7&quot;;&quot;../../include&quot;;&quot;$(QTDIR)/include&quot;"
+				AdditionalIncludeDirectories="&quot;../../include/CGAL/config/msvc&quot;;&quot;../../include&quot;;&quot;$(QTDIR)/include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib imm32.lib wsock32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib imm32.lib wsock32.lib"
 				OutputFile="$(OutDir)/regular_triangulation_2.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -103,7 +103,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o regular_triangulation_2.moc regular_triangulation_2.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o regular_triangulation_2.moc regular_triangulation_2.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -127,7 +127,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath="regular_triangulation_2.C">
+				RelativePath="regular_triangulation_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -142,7 +142,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="regular_triangulation_2_toolbar.C">
+				RelativePath="regular_triangulation_2_toolbar.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -157,7 +157,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="regular_triangulation_2_toolbar_layers.C">
+				RelativePath="regular_triangulation_2_toolbar_layers.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -172,7 +172,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="triangulation_2_edit_vertex.C">
+				RelativePath="triangulation_2_edit_vertex.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.vcproj b/Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.vcproj
index 4c41ab4aa54..41917d2ce91 100644
--- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.vcproj
+++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/voronoi_diagram_2.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm900"
 				Optimization="0"
-				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CGAL_USE_QT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/voronoi_diagram_2.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc7;../../include;$(QTDIR)/include"
+				AdditionalIncludeDirectories="./include;../../include/CGAL/config/msvc;../../include;$(QTDIR)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CGAL_USE_QT"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -88,7 +88,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cgal.lib cgalqt.lib qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
+				AdditionalDependencies="  qt-mt.lib qtmain.lib wsock32.lib winmm.lib imm32.lib"
 				OutputFile="$(OutDir)/robustness.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
@@ -102,7 +102,7 @@
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(QTDIR)/bin/moc.exe -o robustness.moc robustness.C"/>
+				CommandLine="$(QTDIR)/bin/moc.exe -o robustness.moc robustness.cpp"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -126,7 +126,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
 			<File
-				RelativePath=".\voronoi_diagram_2.C">
+				RelativePath=".\voronoi_diagram_2.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool