diff --git a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h
index cc53ba9e278..cabf63e6930 100644
--- a/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h
+++ b/Algebraic_foundations/include/CGAL/Test/_test_algebraic_structure.h
@@ -894,4 +894,4 @@ void test_algebraic_structure( const  AS & a, const  AS & b, const  AS & c) {
   
 CGAL_END_NAMESPACE
 
-#endif // CGAL_TEST_NUMBER_Type_H
+#endif // CGAL_TEST_ALGEBRAIC_STRUCTURE_H
diff --git a/Number_types/include/CGAL/Exact_type_selecter.h b/Number_types/include/CGAL/Exact_type_selecter.h
index ab526269781..d3527966ea7 100644
--- a/Number_types/include/CGAL/Exact_type_selecter.h
+++ b/Number_types/include/CGAL/Exact_type_selecter.h
@@ -21,8 +21,8 @@
 //
 // Author(s)     : Sylvain Pion
 
-#ifndef CGAL_EXACT_Type_SELECTER_H
-#define CGAL_EXACT_Type_SELECTER_H
+#ifndef CGAL_EXACT_TYPE_SELECTER_H
+#define CGAL_EXACT_TYPE_SELECTER_H
 
 // This is an undocumented private helper for Filtered_kernel.
 
@@ -113,4 +113,4 @@ struct Exact_type_selecter<Lazy_exact_nt<ET> >
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_EXACT_Type_SELECTER_H
+#endif // CGAL_EXACT_TYPE_SELECTER_H
diff --git a/Number_types/include/CGAL/GMP/Gmpq_type.h b/Number_types/include/CGAL/GMP/Gmpq_type.h
index 38a0dce6bfa..775d6841154 100644
--- a/Number_types/include/CGAL/GMP/Gmpq_type.h
+++ b/Number_types/include/CGAL/GMP/Gmpq_type.h
@@ -22,8 +22,8 @@
 // Author(s)     : Andreas Fabri, Sylvain Pion
 
 
-#ifndef CGAL_GMPQ_Type_H
-#define CGAL_GMPQ_Type_H
+#ifndef CGAL_GMPQ_TYPE_H
+#define CGAL_GMPQ_TYPE_H
 
 #include <CGAL/basic.h>
 #include <CGAL/GMP/Gmpz_type.h>
@@ -421,4 +421,4 @@ operator>>(std::istream& is, Gmpq &z)
 CGAL_END_NAMESPACE
 
 
-#endif // CGAL_GMPQ_Type_H
+#endif // CGAL_GMPQ_TYPE_H
diff --git a/Number_types/include/CGAL/GMP/Gmpz_type.h b/Number_types/include/CGAL/GMP/Gmpz_type.h
index 56da3e08126..7de96708a1b 100644
--- a/Number_types/include/CGAL/GMP/Gmpz_type.h
+++ b/Number_types/include/CGAL/GMP/Gmpz_type.h
@@ -22,8 +22,8 @@
 // Author(s)     : Andreas Fabri, Stefan Schirra, Sylvain Pion
 
 
-#ifndef CGAL_GMPZ_Type_H
-#define CGAL_GMPZ_Type_H
+#ifndef CGAL_GMPZ_TYPE_H
+#define CGAL_GMPZ_TYPE_H
 
 #include <CGAL/basic.h>
 #include <gmp.h>
@@ -458,4 +458,4 @@ struct Split_double<Gmpz>
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_GMPZ_Type_H
+#endif // CGAL_GMPZ_TYPE_H
diff --git a/Number_types/include/CGAL/GMP/Gmpzf_type.h b/Number_types/include/CGAL/GMP/Gmpzf_type.h
index 3d3e10c7475..71b16c92061 100644
--- a/Number_types/include/CGAL/GMP/Gmpzf_type.h
+++ b/Number_types/include/CGAL/GMP/Gmpzf_type.h
@@ -18,8 +18,8 @@
 //
 // Author(s)     : Bernd Gaertner <gaertner@inf.ethz.ch>
 
-#ifndef CGAL_GMPZF_Type_H
-#define CGAL_GMPZF_Type_H
+#ifndef CGAL_GMPZF_TYPE_H
+#define CGAL_GMPZF_TYPE_H
 
 // includes
 #include <CGAL/basic.h>
@@ -575,6 +575,4 @@ bool operator>(const Gmpzf &a, int b)
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_GMPZF_Type_H
-
-// ===== EOF ==================================================================
+#endif // CGAL_GMPZF_TYPE_H
diff --git a/Number_types/include/CGAL/Number_type_checker.h b/Number_types/include/CGAL/Number_type_checker.h
index a91a5d0d26e..0cc68a63c6c 100644
--- a/Number_types/include/CGAL/Number_type_checker.h
+++ b/Number_types/include/CGAL/Number_type_checker.h
@@ -21,8 +21,8 @@
 //
 // Author(s)     : Sylvain Pion, Michael Hemmer
 
-#ifndef CGAL_NUMBER_Type_CHECKER_H
-#define CGAL_NUMBER_Type_CHECKER_H
+#ifndef CGAL_NUMBER_TYPE_CHECKER_H
+#define CGAL_NUMBER_TYPE_CHECKER_H
 
 #include <CGAL/number_type_basic.h>
 
@@ -941,4 +941,4 @@ operator>> (std::istream & is, Number_type_checker<NT1, NT2, Cmp> &b)
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_NUMBER_Type_CHECKER_H
+#endif // CGAL_NUMBER_TYPE_CHECKER_H