diff --git a/Isosurfacing_3/examples/Isosurfacing_3/all_cartesian_cube.cpp b/Isosurfacing_3/examples/Isosurfacing_3/all_cartesian_cube.cpp
index 6456a5af55f..b3b8487ec38 100644
--- a/Isosurfacing_3/examples/Isosurfacing_3/all_cartesian_cube.cpp
+++ b/Isosurfacing_3/examples/Isosurfacing_3/all_cartesian_cube.cpp
@@ -77,4 +77,6 @@ int main() {
     // save output indexed meshes to files, in the OFF format
     CGAL::IO::write_OFF("result_mc.off", points_mc, polygons_mc);
     CGAL::IO::write_OFF("result_dc.off", points_dc, polygons_dc);
+
+    return 0;
 }
diff --git a/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_cartesian_grid.cpp b/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_cartesian_grid.cpp
index c835677f302..7d6e23ff7e2 100644
--- a/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_cartesian_grid.cpp
+++ b/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_cartesian_grid.cpp
@@ -53,4 +53,6 @@ int main() {
 
     // write output indexed surface mesh to file, in OFF format
     CGAL::IO::write_OFF("result.off", points, polygons);
+
+    return 0;
 }
diff --git a/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_implicit_iwp.cpp b/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_implicit_iwp.cpp
index 7e910c07227..072072a7b16 100644
--- a/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_implicit_iwp.cpp
+++ b/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_implicit_iwp.cpp
@@ -54,4 +54,6 @@ int main() {
 
     // save the result in the OFF format
     CGAL::IO::write_OFF("result.off", points, polygons);
+
+    return 0;
 }
diff --git a/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_mesh_offset.cpp b/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_mesh_offset.cpp
index 561adaea12d..4cbe13aa78a 100644
--- a/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_mesh_offset.cpp
+++ b/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_mesh_offset.cpp
@@ -71,4 +71,6 @@ int main() {
 
     // save output indexed mesh to a file, in the OFF format
     CGAL::IO::write_OFF("result.off", points, polygons);
+
+    return 0;
 }
diff --git a/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_octree.cpp b/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_octree.cpp
index 8ed85436a9b..0562d8e3a10 100644
--- a/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_octree.cpp
+++ b/Isosurfacing_3/examples/Isosurfacing_3/dual_contouring_octree.cpp
@@ -83,4 +83,6 @@ int main() {
     CGAL::Isosurfacing::dual_contouring(domain, 0.8, points, polygons);
 
     CGAL::IO::write_OFF("result.off", points, polygons);
+
+    return 0;
 }
diff --git a/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_cartesian_grid_sphere.cpp b/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_cartesian_grid_sphere.cpp
index 1c1b96a0ee0..0700506ca12 100644
--- a/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_cartesian_grid_sphere.cpp
+++ b/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_cartesian_grid_sphere.cpp
@@ -46,4 +46,6 @@ int main() {
 
     // save output indexed surface mesh to file, in the OFF format
     CGAL::IO::write_OFF("result.off", points, polygons);
+
+    return 0;
 }
diff --git a/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_implicit_sphere.cpp b/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_implicit_sphere.cpp
index 284e0c4ce0e..86b036a7346 100644
--- a/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_implicit_sphere.cpp
+++ b/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_implicit_sphere.cpp
@@ -32,4 +32,6 @@ int main() {
 
     // save ouput indexed mesh to a file, in the OFF format
     CGAL::IO::write_OFF("result.off", points, polygons);
+
+    return 0;
 }
diff --git a/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_inrimage.cpp b/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_inrimage.cpp
index bccfee1ad80..7dc7fdd5182 100644
--- a/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_inrimage.cpp
+++ b/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_inrimage.cpp
@@ -37,4 +37,6 @@ int main() {
 
     // save output indexed mesh to a file, in the OFF format
     CGAL::IO::write_OFF("result.off", points, polygons);
+
+    return 0;
 }
diff --git a/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_signed_mesh_offset.cpp b/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_signed_mesh_offset.cpp
index 3a216fa1600..3c71e681fff 100644
--- a/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_signed_mesh_offset.cpp
+++ b/Isosurfacing_3/examples/Isosurfacing_3/marching_cubes_signed_mesh_offset.cpp
@@ -28,7 +28,7 @@ typedef std::vector<Point> Point_range;
 typedef std::vector<std::vector<std::size_t>> Polygon_range;
 
 
-// computes the Euclidean distance from query point p to the mesh 
+// computes the Euclidean distance from query point p to the mesh
 // via the AABB tree data structure
 inline Kernel::FT distance_to_mesh(const Tree& tree, const Point& p) {
     const Point& x = tree.closest_point(p);
@@ -94,4 +94,6 @@ int main() {
 
     // save output indexed triangle soup to a file, in the OFF format
     CGAL::IO::write_OFF("output.off", points, polygons);
+
+    return 0;
 }
diff --git a/Isosurfacing_3/test/Isosurfacing_3/Timer.h b/Isosurfacing_3/test/Isosurfacing_3/Timer.h
index c6de79b5d42..6d5f87a6424 100644
--- a/Isosurfacing_3/test/Isosurfacing_3/Timer.h
+++ b/Isosurfacing_3/test/Isosurfacing_3/Timer.h
@@ -1,5 +1,5 @@
-#ifndef CGAL_TIMER_H
-#define CGAL_TIMER_H
+#ifndef SCOPE_TIMER_H
+#define SCOPE_TIMER_H
 
 #include <chrono>
 #include <iostream>
@@ -35,4 +35,4 @@ private:
     bool running;
 };
 
-#endif  // CGAL_TIMER_H
+#endif  // SCOPE_TIMER_H
diff --git a/Isosurfacing_3/test/Isosurfacing_3/test_dual_contouring.cpp b/Isosurfacing_3/test/Isosurfacing_3/test_dual_contouring.cpp
index b99836ea1bd..d676a8a831b 100644
--- a/Isosurfacing_3/test/Isosurfacing_3/test_dual_contouring.cpp
+++ b/Isosurfacing_3/test/Isosurfacing_3/test_dual_contouring.cpp
@@ -78,4 +78,6 @@ int main() {
 
     // CGAL::IO::write_OFF("result.off", mesh);
     CGAL::IO::write_OFF("result.off", points, polygons);
+
+    return 0;
 }
diff --git a/Isosurfacing_3/test/Isosurfacing_3/test_marching_cubes.cpp b/Isosurfacing_3/test/Isosurfacing_3/test_marching_cubes.cpp
index f147111a945..528e1a969ec 100644
--- a/Isosurfacing_3/test/Isosurfacing_3/test_marching_cubes.cpp
+++ b/Isosurfacing_3/test/Isosurfacing_3/test_marching_cubes.cpp
@@ -91,4 +91,6 @@ int main() {
     test_grid_sphere(100);
 
     std::cout << "All tests passed" << std::endl;
+
+    return 0;
 }
diff --git a/Isosurfacing_3/test/Isosurfacing_3/test_util.h b/Isosurfacing_3/test/Isosurfacing_3/test_util.h
index cf51ee06882..fe3cd320c84 100644
--- a/Isosurfacing_3/test/Isosurfacing_3/test_util.h
+++ b/Isosurfacing_3/test/Isosurfacing_3/test_util.h
@@ -66,4 +66,4 @@ bool check_mesh_distance(const Mesh& m0, const Mesh& m1) {
     return true;
 }
 
-#endif  // CGAL_ISOSURFACING_TEST_UTIL_H
\ No newline at end of file
+#endif  // CGAL_ISOSURFACING_TEST_UTIL_H