diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Curve_with_halfedge.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Curve_with_halfedge.h
index 3d264f7ac3d..6c24e00ab79 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Curve_with_halfedge.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Curve_with_halfedge.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef CURVE_WITH_HALFEDGE_H
-#define CURVE_WITH_HALFEDGE_H
+#ifndef CGAL_CURVE_WITH_HALFEDGE_H
+#define CGAL_CURVE_WITH_HALFEDGE_H
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
index 185fa93a588..86d4770ef83 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_AGG_META_TRAITS_H
-#define GPS_AGG_META_TRAITS_H
+#ifndef CGAL_GPS_AGG_META_TRAITS_H
+#define CGAL_GPS_AGG_META_TRAITS_H
 
 #include <vector>
 #include <CGAL/Boolean_set_operations_2/Gps_traits_decorator.h>
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h
index fa57759dfbc..e77d2714150 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GSP_AGG_OP_H
-#define GSP_AGG_OP_H
+#ifndef CGAL_GPS_AGG_OP_H
+#define CGAL_GPS_AGG_OP_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h>
 #include <CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h>
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h
index 2df63d68714..effcb1713b9 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h
@@ -18,8 +18,8 @@
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 //                 Ron Wein        <wein@post.tau.ac.il>
 
-#ifndef GSP_AGG_OP_SWEEP_H
-#define GSP_AGG_OP_SWEEP_H
+#ifndef CGAL_GSP_AGG_OP_SWEEP_H
+#define CGAL_GSP_AGG_OP_SWEEP_H
 
 #include <CGAL/Sweep_line_2.h>
 #include <CGAL/Unique_hash_map.h>
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
index d1fc62a5a80..9c00b64e3f1 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
@@ -18,8 +18,8 @@
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 //                 Ron Wein        <wein@post.tau.ac.il>
 
-#ifndef GSP_AGG_OP_VISITOR
-#define GSP_AGG_OP_VISITOR
+#ifndef CGAL_GSP_AGG_OP_VISITOR_H
+#define CGAL_GSP_AGG_OP_VISITOR_H
 
 #include <CGAL/Unique_hash_map.h> 
 #include <CGAL/Sweep_line_2/Arr_construction_visitor.h>
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_base_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_base_functor.h
index 618625614f6..84927eeb855 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_base_functor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_base_functor.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_BASE_FUNCTOR
-#define GPS_BASE_FUNCTOR
+#ifndef CGAL_GPS_BASE_FUNCTOR_H
+#define CGAL_GPS_BASE_FUNCTOR_H
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_base_visitor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_base_visitor.h
index ef9820aa80f..3b0bb8c8aef 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_base_visitor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_base_visitor.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_BPS_BASE_VISITOR_H
-#define GPS_BPS_BASE_VISITOR_H
+#ifndef CGAL_GPS_BPS_BASE_VISITOR_H
+#define CGAL_GPS_BPS_BASE_VISITOR_H
 
 #include <CGAL/Unique_hash_map.h> 
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_intersection_visitor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_intersection_visitor.h
index 8753bee4e40..c46833a8700 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_intersection_visitor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_intersection_visitor.h
@@ -17,8 +17,8 @@
 //
 
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
-#ifndef GPS_BFS_INTERSECTION_VISITOR_H
-#define GPS_BFS_INTERSECTION_VISITOR_H
+#ifndef CGAL_GPS_BFS_INTERSECTION_VISITOR_H
+#define CGAL_GPS_BFS_INTERSECTION_VISITOR_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_bfs_base_visitor.h>
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_join_visitor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_join_visitor.h
index ae8effcd7a0..9ac680f9cf0 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_join_visitor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_join_visitor.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_BFS_JOIN_VISITOR_H
-#define GPS_BFS_JOIN_VISITOR_H
+#ifndef CGAL_GPS_BFS_JOIN_VISITOR_H
+#define CGAL_GPS_BFS_JOIN_VISITOR_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_bfs_base_visitor.h>
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_scanner.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_scanner.h
index 9599d19abf0..f322648de25 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_scanner.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_scanner.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_BFS_SCANNER_H
-#define GPS_BFS_SCANNER_H
+#ifndef CGAL_GPS_BFS_SCANNER_H
+#define CGAL_GPS_BFS_SCANNER_H
 
 #include <queue>
 #include <stack>
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h
index 0771bb77a29..10d376ca54c 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_bfs_xor_visitor.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_BFS_XOR_VISITOR_H
-#define GPS_BFS_XOR_VISITOR_H
+#ifndef CGAL_GPS_BFS_XOR_VISITOR_H
+#define CGAL_GPS_BFS_XOR_VISITOR_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_bfs_base_visitor.h>
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_dcel.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_dcel.h
index cd9884c07e7..e2da48ed3ff 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_dcel.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_dcel.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_DCEL_H
-#define GPS_DCEL_H
+#ifndef CGAL_GPS_DCEL_H
+#define CGAL_GPS_DCEL_H
 
 #include <CGAL/Arr_default_dcel.h>
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_traits.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_traits.h
index 513b4a9dabd..87cb63f1953 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_traits.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_default_traits.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_DEFAULT_TRAITS_H
-#define GPS_DEFAULT_TRAITS_H
+#ifndef CGAL_GPS_DEFAULT_TRAITS_H
+#define CGAL_GPS_DEFAULT_TRAITS_H
 
 #include <CGAL/Polygon_2.h>
 #include <CGAL/Polygon_with_holes_2.h>
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_difference_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_difference_functor.h
index 07298bdc8e8..46e3398e177 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_difference_functor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_difference_functor.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_DIFFERENCE_FUNCTOR
-#define GPS_DIFFERENCE_FUNCTOR
+#ifndef CGAL_GPS_DIFFERENCE_FUNCTOR_H
+#define CGAL_GPS_DIFFERENCE_FUNCTOR_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_base_functor.h>
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_do_intersect_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_do_intersect_functor.h
index c435ee05fce..c65de439269 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_do_intersect_functor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_do_intersect_functor.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_DO_INTERSECT_FUNCTOR
-#define GPS_DO_INTERSECT_FUNCTOR
+#ifndef CGAL_GPS_DO_INTERSECT_FUNCTOR_H
+#define CGAL_GPS_DO_INTERSECT_FUNCTOR_H
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_insertion_meta_traits.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_insertion_meta_traits.h
index 65a3f6081e4..40f19d474ea 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_insertion_meta_traits.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_insertion_meta_traits.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_INSERTION_META_TRAITS_H
-#define GPS_INSERTION_META_TRAITS_H
+#ifndef CGAL_GPS_INSERTION_META_TRAITS_H
+#define CGAL_GPS_INSERTION_META_TRAITS_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_traits_decorator.h>
 #include <CGAL/Boolean_set_operations_2/Curve_with_halfedge.h>
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_intersection_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_intersection_functor.h
index 752a0b52305..f3e5399a763 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_intersection_functor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_intersection_functor.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_INTERSECTION_FUNCTOR
-#define GPS_INTERSECTION_FUNCTOR
+#ifndef CGAL_GPS_INTERSECTION_FUNCTOR_H
+#define CGAL_GPS_INTERSECTION_FUNCTOR_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_base_functor.h>
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_join_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_join_functor.h
index 45f8308a2f7..d8045dabcf5 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_join_functor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_join_functor.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_JOIN_FUNCTOR
-#define GPS_JOIN_FUNCTOR
+#ifndef CGAL_GPS_JOIN_FUNCTOR_H
+#define CGAL_GPS_JOIN_FUNCTOR_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_base_functor.h>
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_merge.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_merge.h
index 43458de1902..6d5dfeef985 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_merge.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_merge.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_MERGE_H
-#define GPS_MERGE_h
+#ifndef CGAL_GPS_MERGE_H
+#define CGAL_GPS_MERGE_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_agg_op.h>
 #include <CGAL/Boolean_set_operations_2/Gps_bfs_join_visitor.h>
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h
index 00a334f9c10..54fbe18011c 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_POLYGON_SIMPILFIER_H
-#define GPS_POLYGON_SIMPILFIER_H
+#ifndef CGAL_GPS_POLYGON_SIMPILFIER_H
+#define CGAL_GPS_POLYGON_SIMPILFIER_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_simplifier_traits.h>
 #include <CGAL/Sweep_line_2.h>
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h
index ee5b2ddbf6b..2e9d391ed55 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_POLYGON_VALIDATION_VISITOR
-#define GPS_POLYGON_VALIDATION_VISITOR
+#ifndef CGAL_GPS_POLYGON_VALIDATION_VISITOR_H
+#define CGAL_GPS_POLYGON_VALIDATION_VISITOR_H
 
 #include <CGAL/Sweep_line_2.h>
 #include <CGAL/Sweep_line_2/Sweep_line_event.h>
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_simplifier_traits.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_simplifier_traits.h
index 17407fb65fe..206a4bbad5d 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_simplifier_traits.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_simplifier_traits.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_SIMPLIFIER_TRAITS_H
-#define GPS_SIMPLIFIER_TRAITS_H
+#ifndef CGAL_GPS_SIMPLIFIER_TRAITS_H
+#define CGAL_GPS_SIMPLIFIER_TRAITS_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_traits_decorator.h>
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_sym_diff_functor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_sym_diff_functor.h
index 3cd2bfcc77c..c675c21d1b1 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_sym_diff_functor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_sym_diff_functor.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_SYM_DIFF_FUNCTOR
-#define GPS_SYM_DIFF_FUNCTOR
+#ifndef CGAL_GPS_SYM_DIFF_FUNCTOR_H
+#define CGAL_GPS_SYM_DIFF_FUNCTOR_H
 
 #include <CGAL/Boolean_set_operations_2/Gps_base_functor.h>
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_adaptor.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_adaptor.h
index 86c07aa286c..cfb2e0851eb 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_adaptor.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_adaptor.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_TRAITS_ADAPTOR_H
-#define GPS_TRAITS_ADAPTOR_H
+#ifndef CGAL_GPS_TRAITS_ADAPTOR_H
+#define CGAL_GPS_TRAITS_ADAPTOR_H
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h
index bcd67fe7efc..4c7a2b29c3b 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_TRAITS_DECORATOR_H
-#define GPS_TRAITS_DECORATOR_H
+#ifndef CGAL_GPS_TRAITS_DECORATOR_H
+#define CGAL_GPS_TRAITS_DECORATOR_H
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_utils.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_utils.h
index d080fe5850e..9c0b37b3808 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_utils.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_utils.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef GPS_UTILS
-#define GPS_UTILS
+#ifndef CGAL_GPS_UTILS_H
+#define CGAL_GPS_UTILS_H
 
 #include <CGAL/Unique_hash_map.h>
 #include <CGAL/iterator.h>
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Point_with_vertex.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Point_with_vertex.h
index 529e31233ee..6e83a9a0564 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Point_with_vertex.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Point_with_vertex.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef POINT_WITH_VERTEX_H
-#define POINT_WITH_VERTEX_H
+#ifndef CGAL_POINT_WITH_VERTEX_H
+#define CGAL_POINT_WITH_VERTEX_H
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Polygon_2_curve_iterator.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Polygon_2_curve_iterator.h
index 82d004d7975..471e0677ea1 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Polygon_2_curve_iterator.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Polygon_2_curve_iterator.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Baruch Zukerman <baruchzu@post.tau.ac.il>
 
-#ifndef CGAL_POLYGON_2_CURVE_ITERATOR_H
-#define CGAL_POLYGON_2_CURVE_ITERATOR_H
+#ifndef CGAL_CGAL_POLYGON_2_CURVE_ITERATOR_H
+#define CGAL_CGAL_POLYGON_2_CURVE_ITERATOR_H
 
 #include <iterator>