diff --git a/.gitattributes b/.gitattributes
index 3c3710e388f..6cf270921e3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1559,9 +1559,6 @@ CMake/cmake/modules/FindTAUCS.cmake -text
 CMake/cmake/modules/FindZLIB.cmake -text
 CMake/cmake/modules/GeneratorSpecificSettings.cmake -text
 CMake/cmake/modules/LogCMakeVariables.cmake -text
-CMake/cmake/modules/MacroCreateSingleSourceCGALProgram.cmake -text
-CMake/cmake/modules/MacroCreateSingleSourceCGALQt4Program.cmake -text
-CMake/cmake/modules/MacroCreateSingleSourceCGALQtProgram.cmake -text
 CMake/cmake/modules/MacroFindOptionalCGALDependency.cmake -text
 CMake/cmake/modules/MacroOptionalFindPackage.cmake -text
 CMake/cmake/modules/OptionalAddSubdirectory.cmake -text
@@ -3374,6 +3371,7 @@ Spatial_searching/doc_tex/Spatial_searching/Fig1.ps -text svneol=unset#applicati
 Spatial_searching/doc_tex/Spatial_searching/windowQuery.png -text
 Spatial_sorting/doc_tex/Spatial_sorting/fig/hilbert.png -text
 Spatial_sorting/doc_tex/Spatial_sorting/fig/hilbertLarge.jpg -text
+Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt -text
 Straight_skeleton_2/demo/Straight_skeleton_2/data/complex_0.poly -text svneol=unset#application/octet-stream
 Straight_skeleton_2/demo/Straight_skeleton_2/data/complex_1.poly -text svneol=unset#application/octet-stream
 Straight_skeleton_2/demo/Straight_skeleton_2/data/complex_2.poly -text svneol=unset#application/octet-stream
diff --git a/CMake/cmake/modules/MacroCreateSingleSourceCGALProgram.cmake b/CMake/cmake/modules/MacroCreateSingleSourceCGALProgram.cmake
deleted file mode 100644
index 1953f0d0257..00000000000
--- a/CMake/cmake/modules/MacroCreateSingleSourceCGALProgram.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-macro(create_single_source_cgal_program first )
-
-  set( all ${first} )
-  
-  foreach( i ${ARGN} )
-    set( all ${all} ${i} ) 
-  endforeach()
-  
-  get_filename_component(exe_name ${first} NAME_WE)
-  
-  add_executable  (${exe_name} ${all})
-  add_dependencies(${exe_name} CGAL CGAL_CORE)
-    
-  # Link the executable to CGAL and third-party libraries
-  if ( NOT AUTO_LINK_ENABLED )    
-    target_link_libraries(${exe_name} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
-  endif()
-
-  # Add " make test" rule for executable
-  # TODO: get test parameters from ${exe_name}.cmd
-  # add_test(${exe_name} ${exe_name})
-  
-endmacro()
diff --git a/CMake/cmake/modules/MacroCreateSingleSourceCGALQt4Program.cmake b/CMake/cmake/modules/MacroCreateSingleSourceCGALQt4Program.cmake
deleted file mode 100644
index ba368d75320..00000000000
--- a/CMake/cmake/modules/MacroCreateSingleSourceCGALQt4Program.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-macro(create_single_source_cgal_qt4_program first )
-
-  set( all ${first} )
-  
-  foreach( i ${ARGN} )
-    set( all ${all} ${i} ) 
-  endforeach()
-  
-  get_filename_component(exe_name ${first} NAME_WE)
-  
-  QT4_AUTOMOC( ${all} )
-  
-  # Make sure the compiler can find generated .moc files
-  include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-  include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
-  
-  add_executable  (${exe_name} ${all})
-  add_dependencies(${exe_name} CGAL CGAL_CORE)
-    
-  # Link the executable to CGAL and third-party libraries
-  if ( NOT AUTO_LINK_ENABLED )    
-    target_link_libraries(${exe_name} ${CGAL_LIBRARIES} ${QT_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
-  endif()
-
-  # Add " make test" rule for executable
-  # TODO: get test parameters from ${exe_name}.cmd
-  # add_test(${exe_name} ${exe_name})
-  
-endmacro()
diff --git a/CMake/cmake/modules/MacroCreateSingleSourceCGALQtProgram.cmake b/CMake/cmake/modules/MacroCreateSingleSourceCGALQtProgram.cmake
deleted file mode 100644
index 5069e4f1899..00000000000
--- a/CMake/cmake/modules/MacroCreateSingleSourceCGALQtProgram.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-macro(create_single_source_cgal_qt_program first )
-
-  set( all ${first} )
-  
-  foreach( i ${ARGN} )
-    set( all ${all} ${i} ) 
-  endforeach()
-  
-  get_filename_component(exe_name ${first} NAME_WE)
-  
-  QT3_AUTOMOC( ${all} )
-  
-  # Make sure the compiler can find generated .moc files
-  include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
-  include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR})
-  
-  add_executable  (${exe_name} ${all})
-  add_dependencies(${exe_name} CGAL CGAL_QT CGAL_CORE)
-    
-  # Link the executable to CGAL and third-party libraries
-  if ( NOT AUTO_LINK_ENABLED )    
-    target_link_libraries(${exe_name} ${CGAL_LIBRARIES} ${CGAL_QT_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
-  endif()
-
-  # Add " make test" rule for executable
-  # TODO: get test parameters from ${exe_name}.cmd
-  # add_test(${exe_name} ${exe_name})
-  
-endmacro()
diff --git a/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt
new file mode 100644
index 00000000000..741d93d9e1c
--- /dev/null
+++ b/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt
@@ -0,0 +1,22 @@
+project (Straight_skeleton_2_Demo)
+
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_BINARY_DIR}/cmake/modules" )
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules"  )
+
+find_package(CGAL)
+
+if ( CGAL_FOUND )
+
+  include(UseCGAL)
+  include(CreateSingleSourceCGALQt3Program)
+  
+  # Make sure the compiler can find local include files
+  if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include")
+    include_directories (BEFORE include)
+  endif()
+  
+  create_single_source_cgal_qt3_program( straight_skeleton_2.cpp straight_skeleton_2_toolbar.cpp straight_skeleton_2_toolbar_layers.cpp)
+  
+endif()
diff --git a/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt
index 8721d6b5d77..c3094d9f601 100644
--- a/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt
+++ b/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt
@@ -1,24 +1,31 @@
-project (CGAL_STRAIGHT_SKELETON CXX)
+project (Straight_skeleton_2_Example)
 
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../../cmake/modules" )
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_BINARY_DIR}/cmake/modules" )
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules"  )
 
 find_package(CGAL)
 
-include(UseCGAL)
+if ( CGAL_FOUND )
 
-set( sources "Straight_skeleton_2.cpp" )
-
-# Make sure the compiler can find local include files
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include")
-  include_directories (BEFORE include)
+  include(UseCGAL)
+  include(CreateSingleSourceCGALProgram)
+  
+  # Make sure the compiler can find local include files
+  if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include")
+    include_directories (BEFORE include)
+  endif()
+  
+  create_single_source_cgal_program( Create_offset_polygons_2.cpp )
+  create_single_source_cgal_program( Create_skeleton_and_offset_polygons_2.cpp )
+  create_single_source_cgal_program( Create_skeleton_and_offset_polygons_from_polygon_with_holes_2.cpp )
+  create_single_source_cgal_program( Create_skeleton_and_offset_polygons_with_holes_2.cpp )
+  create_single_source_cgal_program( Create_straight_skeleton_2.cpp )
+  create_single_source_cgal_program( Create_straight_skeleton_from_polygon_with_holes_2.cpp )
+  create_single_source_cgal_program( Low_level_API.cpp )
+  
 endif()
 
-# This contains an utility macro to create an executable 
-# properly linked against CGAL for each .cpp in a list of files
-include(MacroCreateSingleSourceCGALProgram)
-
-create_single_source_cgal_program( ${sources} )