diff --git a/include/boost/python/suite/indexing/algo_selector.hpp b/include/boost/python/suite/indexing/algo_selector.hpp
index 1f9679ee..25c2c563 100755
--- a/include/boost/python/suite/indexing/algo_selector.hpp
+++ b/include/boost/python/suite/indexing/algo_selector.hpp
@@ -19,8 +19,8 @@
 // $Id$
 //
 
-#ifndef algo_selector_rmg_20030911_included
-#define algo_selector_rmg_20030911_included
+#ifndef BOOST_PYTHON_INDEXING_ALGO_SELECTOR_HPP
+#define BOOST_PYTHON_INDEXING_ALGO_SELECTOR_HPP
 
 #include <boost/python/suite/indexing/container_proxy.hpp>
 // Include this early to ensure the declaration of the get_pointer
@@ -195,4 +195,4 @@ namespace boost { namespace python { namespace indexing {
   };
 } } }
 
-#endif // algo_selector_rmg_20030911_included
+#endif // BOOST_PYTHON_INDEXING_ALGO_SELECTOR_HPP
diff --git a/include/boost/python/suite/indexing/algorithms.hpp b/include/boost/python/suite/indexing/algorithms.hpp
index 2e5e7b36..078a4fbc 100755
--- a/include/boost/python/suite/indexing/algorithms.hpp
+++ b/include/boost/python/suite/indexing/algorithms.hpp
@@ -17,8 +17,8 @@
 // $Id$
 //
 
-#ifndef algorithms_rmg_20030823_included
-#define algorithms_rmg_20030823_included
+#ifndef BOOST_PYTHON_INDEXING_ALGORITHMS_HPP
+#define BOOST_PYTHON_INDEXING_ALGORITHMS_HPP
 
 #include <boost/python/suite/indexing/suite_utils.hpp>
 
@@ -678,4 +678,4 @@ namespace boost { namespace python { namespace indexing {
   }
 } } }
 
-#endif // algorithms_rmg_20030823_included
+#endif // BOOST_PYTHON_INDEXING_ALGORITHMS_HPP
diff --git a/include/boost/python/suite/indexing/container_proxy.hpp b/include/boost/python/suite/indexing/container_proxy.hpp
index 15c531a6..3747c4f6 100755
--- a/include/boost/python/suite/indexing/container_proxy.hpp
+++ b/include/boost/python/suite/indexing/container_proxy.hpp
@@ -15,8 +15,8 @@
 // $Id$
 //
 
-#ifndef container_proxy_rmg_20030826_included
-#define container_proxy_rmg_20030826_included
+#ifndef BOOST_PYTHON_INDEXING_CONTAINER_PROXY_HPP
+#define BOOST_PYTHON_INDEXING_CONTAINER_PROXY_HPP
 
 #include <boost/python/suite/indexing/proxy_iterator.hpp>
 #include <boost/python/suite/indexing/shared_proxy_impl.hpp>
@@ -554,4 +554,4 @@ namespace boost { namespace python { namespace indexing {
 
 } } }
 
-#endif // container_proxy_rmg_20030826_included
+#endif // BOOST_PYTHON_INDEXING_CONTAINER_PROXY_HPP
diff --git a/include/boost/python/suite/indexing/container_suite.hpp b/include/boost/python/suite/indexing/container_suite.hpp
index 5c3fab36..20448259 100755
--- a/include/boost/python/suite/indexing/container_suite.hpp
+++ b/include/boost/python/suite/indexing/container_suite.hpp
@@ -16,8 +16,8 @@
 // $Id$
 //
 
-#ifndef container_suite_rmg_20030823_included
-#define container_suite_rmg_20030823_included
+#ifndef BOOST_PYTHON_INDEXING_CONTAINER_SUITE_HPP
+#define BOOST_PYTHON_INDEXING_CONTAINER_SUITE_HPP
 
 #include <boost/python/suite/indexing/algo_selector.hpp>
 #include <boost/python/suite/indexing/visitor.hpp>
@@ -43,4 +43,4 @@ namespace boost { namespace python { namespace indexing {
   };
 } } }
 
-#endif // container_suite_rmg_20030823_included
+#endif // BOOST_PYTHON_INDEXING_CONTAINER_SUITE_HPP
diff --git a/include/boost/python/suite/indexing/container_traits.hpp b/include/boost/python/suite/indexing/container_traits.hpp
index ff744866..8b1c8045 100755
--- a/include/boost/python/suite/indexing/container_traits.hpp
+++ b/include/boost/python/suite/indexing/container_traits.hpp
@@ -19,8 +19,8 @@
 // $Id$
 //
 
-#ifndef container_traits_rmg_20030823_included
-#define container_traits_rmg_20030823_included
+#ifndef BOOST_PYTHON_INDEXING_CONTAINER_TRAITS_HPP
+#define BOOST_PYTHON_INDEXING_CONTAINER_TRAITS_HPP
 
 #include <boost/python/suite/indexing/suite_utils.hpp>
 #include <boost/python/suite/indexing/iterator_traits.hpp>
@@ -201,4 +201,4 @@ boost::python::indexing::base_container_traits<Container>
   value_traits_::visitor_helper (pyClass, policy);
 }
 
-#endif // container_suite_rmg_20030823_included
+#endif // BOOST_PYTHON_INDEXING_CONTAINER_SUITE_HPP
diff --git a/include/boost/python/suite/indexing/element_proxy.hpp b/include/boost/python/suite/indexing/element_proxy.hpp
index acf70a83..8a5d11c1 100755
--- a/include/boost/python/suite/indexing/element_proxy.hpp
+++ b/include/boost/python/suite/indexing/element_proxy.hpp
@@ -18,8 +18,8 @@
 // $Id$
 //
 
-#ifndef element_proxy_rmg_20030915_included
-#define element_proxy_rmg_20030915_included
+#ifndef BOOST_PYTHON_INDEXING_ELEMENT_PROXY_HPP
+#define BOOST_PYTHON_INDEXING_ELEMENT_PROXY_HPP
 
 #include <boost/python/suite/indexing/shared_proxy_impl.hpp>
 #include <boost/python/suite/indexing/value_traits.hpp>
@@ -197,4 +197,4 @@ namespace boost { namespace python { namespace indexing {
   };
 } } }
 
-#endif // element_proxy_rmg_20030915_included
+#endif // BOOST_PYTHON_INDEXING_ELEMENT_PROXY_HPP
diff --git a/include/boost/python/suite/indexing/int_slice_helper.hpp b/include/boost/python/suite/indexing/int_slice_helper.hpp
index 74e7c322..a1663d4a 100755
--- a/include/boost/python/suite/indexing/int_slice_helper.hpp
+++ b/include/boost/python/suite/indexing/int_slice_helper.hpp
@@ -15,8 +15,8 @@
 // $Id$
 //
 
-#ifndef int_slice_helper_rmg_20031013_included
-#define int_slice_helper_rmg_20031013_included
+#ifndef BOOST_PYTHON_INDEXING_INT_SLICE_HELPER_HPP
+#define BOOST_PYTHON_INDEXING_INT_SLICE_HELPER_HPP
 
 #include <boost/python/errors.hpp>
 
@@ -202,4 +202,4 @@ namespace boost { namespace python { namespace indexing {
   }
 } } }
 
-#endif // int_slice_helper_rmg_20031013_included
+#endif // BOOST_PYTHON_INDEXING_INT_SLICE_HELPER_HPP
diff --git a/include/boost/python/suite/indexing/iterator_pair.hpp b/include/boost/python/suite/indexing/iterator_pair.hpp
index 8dcfcdb7..d7db77ff 100755
--- a/include/boost/python/suite/indexing/iterator_pair.hpp
+++ b/include/boost/python/suite/indexing/iterator_pair.hpp
@@ -18,8 +18,8 @@
 // $Id$
 //
 
-#ifndef iterator_pair_rmg_20030909_included
-#define iterator_pair_rmg_20030909_included
+#ifndef BOOST_PYTHON_INDEXING_ITERATOR_PAIR_HPP
+#define BOOST_PYTHON_INDEXING_ITERATOR_PAIR_HPP
 
 #include <iterator>
 #include <stdexcept>
@@ -139,4 +139,4 @@ namespace boost { namespace python { namespace indexing {
   }
 } } }
 
-#endif // iterator_pair_rmg_20030909_included
+#endif // BOOST_PYTHON_INDEXING_ITERATOR_PAIR_HPP
diff --git a/include/boost/python/suite/indexing/iterator_traits.hpp b/include/boost/python/suite/indexing/iterator_traits.hpp
index 142da4f9..9f21aafd 100755
--- a/include/boost/python/suite/indexing/iterator_traits.hpp
+++ b/include/boost/python/suite/indexing/iterator_traits.hpp
@@ -19,8 +19,8 @@
 // $Id$
 //
 
-#ifndef iterator_traits_rmg_20030823_included
-#define iterator_traits_rmg_20030823_included
+#ifndef BOOST_PYTHON_INDEXING_ITERATOR_TRAITS_HPP
+#define BOOST_PYTHON_INDEXING_ITERATOR_TRAITS_HPP
 
 #include <boost/python/suite/indexing/suite_utils.hpp>
 
@@ -158,4 +158,4 @@ namespace boost { namespace python { namespace indexing {
   };
 } } }
 
-#endif // iterator_traits_rmg_20030823_included
+#endif // BOOST_PYTHON_INDEXING_ITERATOR_TRAITS_HPP
diff --git a/include/boost/python/suite/indexing/proxy_iterator.hpp b/include/boost/python/suite/indexing/proxy_iterator.hpp
index f0f84c24..d5cd5785 100755
--- a/include/boost/python/suite/indexing/proxy_iterator.hpp
+++ b/include/boost/python/suite/indexing/proxy_iterator.hpp
@@ -15,8 +15,8 @@
 // $Id$
 //
 
-#ifndef proxy_iterator_rmg_20031008_included
-#define proxy_iterator_rmg_20031008_included
+#ifndef BOOST_PYTHON_INDEXING_PROXY_ITERATOR_HPP
+#define BOOST_PYTHON_INDEXING_PROXY_ITERATOR_HPP
 
 #include <iterator>
 
@@ -118,4 +118,4 @@ namespace std {
   }
 }
 
-#endif // proxy_iterator_rmg_20031008_included
+#endif // BOOST_PYTHON_INDEXING_PROXY_ITERATOR_HPP
diff --git a/include/boost/python/suite/indexing/python_iterator.hpp b/include/boost/python/suite/indexing/python_iterator.hpp
index 84d9b1a1..78df5191 100755
--- a/include/boost/python/suite/indexing/python_iterator.hpp
+++ b/include/boost/python/suite/indexing/python_iterator.hpp
@@ -17,8 +17,8 @@
 // $Id$
 //
 
-#ifndef python_iterator_rmg_20030910_included
-#define python_iterator_rmg_20030910_included
+#ifndef BOOST_PYTHON_INDEXING_PYTHON_ITERATOR_HPP
+#define BOOST_PYTHON_INDEXING_PYTHON_ITERATOR_HPP
 
 #include <boost/python/object.hpp>
 #include <memory>
@@ -64,4 +64,4 @@ namespace boost { namespace python { namespace indexing {
   };
 } } }
 
-#endif // python_iterator_rmg_20030910_included
+#endif // BOOST_PYTHON_INDEXING_PYTHON_ITERATOR_HPP
diff --git a/include/boost/python/suite/indexing/shared_proxy_impl.hpp b/include/boost/python/suite/indexing/shared_proxy_impl.hpp
index d5116ff3..2df5add3 100755
--- a/include/boost/python/suite/indexing/shared_proxy_impl.hpp
+++ b/include/boost/python/suite/indexing/shared_proxy_impl.hpp
@@ -21,8 +21,8 @@
 // $Id$
 //
 
-#ifndef shared_proxy_impl_rmg_20030829_included
-#define shared_proxy_impl_rmg_20030829_included
+#ifndef BOOST_PYTHON_INDEXING_SHARED_PROXY_IMPL_HPP
+#define BOOST_PYTHON_INDEXING_SHARED_PROXY_IMPL_HPP
 
 #include <memory>
 
@@ -98,4 +98,4 @@ namespace boost { namespace python { namespace indexing {
   }
 } } }
 
-#endif // shared_proxy_impl_rmg_20030829_included
+#endif // BOOST_PYTHON_INDEXING_SHARED_PROXY_IMPL_HPP
diff --git a/include/boost/python/suite/indexing/slice.hpp b/include/boost/python/suite/indexing/slice.hpp
index 4505533e..538b1384 100755
--- a/include/boost/python/suite/indexing/slice.hpp
+++ b/include/boost/python/suite/indexing/slice.hpp
@@ -15,8 +15,8 @@
 // $Id$
 //
 
-#ifndef slice_rmg_20030910_included
-#define slice_rmg_20030910_included
+#ifndef BOOST_PYTHON_INDEXING_SLICE_HPP
+#define BOOST_PYTHON_INDEXING_SLICE_HPP
 
 #include <boost/python/object.hpp>
 #include <boost/python/errors.hpp>
@@ -85,4 +85,4 @@ namespace boost { namespace python { namespace converter {
   };
 }}}
 
-#endif // slice_rmg_20030910_included
+#endif // BOOST_PYTHON_INDEXING_SLICE_HPP
diff --git a/include/boost/python/suite/indexing/slice_handler.hpp b/include/boost/python/suite/indexing/slice_handler.hpp
index 0c0d7d88..6db789c5 100755
--- a/include/boost/python/suite/indexing/slice_handler.hpp
+++ b/include/boost/python/suite/indexing/slice_handler.hpp
@@ -15,8 +15,8 @@
 // $Id$
 //
 
-#ifndef slice_handler_rmg_20030909_included
-#define slice_handler_rmg_20030909_included
+#ifndef BOOST_PYTHON_INDEXING_SLICE_HANDLER_HPP
+#define BOOST_PYTHON_INDEXING_SLICE_HANDLER_HPP
 
 #include <boost/python/object.hpp>
 #include <boost/python/list.hpp>
@@ -297,4 +297,4 @@ namespace boost { namespace python { namespace indexing {
   }
 } } }
 
-#endif // slice_handler_rmg_20030909_included
+#endif // BOOST_PYTHON_INDEXING_SLICE_HANDLER_HPP
diff --git a/include/boost/python/suite/indexing/suite_utils.hpp b/include/boost/python/suite/indexing/suite_utils.hpp
index da91b0b5..2cb51302 100755
--- a/include/boost/python/suite/indexing/suite_utils.hpp
+++ b/include/boost/python/suite/indexing/suite_utils.hpp
@@ -17,8 +17,8 @@
 // $Id$
 //
 
-#ifndef suite_utils_rmg_20030823_included
-#define suite_utils_rmg_20030823_included
+#ifndef BOOST_PYTHON_INDEXING_SUITE_UTILS_HPP
+#define BOOST_PYTHON_INDEXING_SUITE_UTILS_HPP
 
 #include <boost/type_traits.hpp>
 
@@ -72,4 +72,4 @@ namespace boost { namespace python { namespace indexing {
 #endif
 } } }
 
-#endif // suite_utils_rmg_20030823_included
+#endif // BOOST_PYTHON_INDEXING_SUITE_UTILS_HPP
diff --git a/include/boost/python/suite/indexing/value_traits.hpp b/include/boost/python/suite/indexing/value_traits.hpp
index 79f3a145..d8522e35 100755
--- a/include/boost/python/suite/indexing/value_traits.hpp
+++ b/include/boost/python/suite/indexing/value_traits.hpp
@@ -18,8 +18,8 @@
 // $Id$
 //
 
-#ifndef value_traits_rmg_20030912_included
-#define value_traits_rmg_20030912_included
+#ifndef BOOST_PYTHON_INDEXING_VALUE_TRAITS_HPP
+#define BOOST_PYTHON_INDEXING_VALUE_TRAITS_HPP
 
 namespace boost { namespace python { namespace indexing {
   template<typename T>
@@ -38,4 +38,4 @@ namespace boost { namespace python { namespace indexing {
   };
 } } }
 
-#endif // value_traits_rmg_20030912_included
+#endif // BOOST_PYTHON_INDEXING_VALUE_TRAITS_HPP
diff --git a/include/boost/python/suite/indexing/visitor.hpp b/include/boost/python/suite/indexing/visitor.hpp
index 8d2982fc..2487f713 100755
--- a/include/boost/python/suite/indexing/visitor.hpp
+++ b/include/boost/python/suite/indexing/visitor.hpp
@@ -15,8 +15,8 @@
 // $Id$
 //
 
-#ifndef visitor_rmg_20030823_included
-#define visitor_rmg_20030823_included
+#ifndef BOOST_PYTHON_INDEXING_VISITOR_HPP
+#define BOOST_PYTHON_INDEXING_VISITOR_HPP
 
 #include <boost/python/suite/indexing/slice_handler.hpp>
 
@@ -517,4 +517,4 @@ namespace boost { namespace python { namespace indexing {
   };
 } } }
 
-#endif // visitor_rmg_20030823_included
+#endif // BOOST_PYTHON_INDEXING_VISITOR_HPP