diff --git a/example/extension/detail/advance_impl.hpp b/example/extension/detail/advance_impl.hpp
index 0d778123..99ea215e 100644
--- a/example/extension/detail/advance_impl.hpp
+++ b/example/extension/detail/advance_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ADVANCE_IMPL_20060222_2150)
+#ifndef BOOST_FUSION_ADVANCE_IMPL_20060222_2150
 #define BOOST_FUSION_ADVANCE_IMPL_20060222_2150
 
 namespace example
diff --git a/example/extension/detail/at_impl.hpp b/example/extension/detail/at_impl.hpp
index 60558930..861d84ac 100644
--- a/example/extension/detail/at_impl.hpp
+++ b/example/extension/detail/at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_20060223_2017)
+#ifndef BOOST_FUSION_AT_IMPL_20060223_2017
 #define BOOST_FUSION_AT_IMPL_20060223_2017
 
 #include <string>
diff --git a/example/extension/detail/at_key_impl.hpp b/example/extension/detail/at_key_impl.hpp
index e925c62a..66bad92d 100644
--- a/example/extension/detail/at_key_impl.hpp
+++ b/example/extension/detail/at_key_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_KEY_IMPL_20060223_2017)
+#ifndef BOOST_FUSION_AT_KEY_IMPL_20060223_2017
 #define BOOST_FUSION_AT_KEY_IMPL_20060223_2017
 
 #include <string>
diff --git a/example/extension/detail/begin_impl.hpp b/example/extension/detail/begin_impl.hpp
index a4296c59..8f8cf3dd 100644
--- a/example/extension/detail/begin_impl.hpp
+++ b/example/extension/detail/begin_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BEGIN_IMPL_20060222_2042)
+#ifndef BOOST_FUSION_BEGIN_IMPL_20060222_2042
 #define BOOST_FUSION_BEGIN_IMPL_20060222_2042
 
 #include "../example_struct_iterator.hpp"
diff --git a/example/extension/detail/category_of_impl.hpp b/example/extension/detail/category_of_impl.hpp
index b0bc7d90..5dc2704f 100644
--- a/example/extension/detail/category_of_impl.hpp
+++ b/example/extension/detail/category_of_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_20060223_2037)
+#ifndef BOOST_FUSION_CATEGORY_OF_IMPL_20060223_2037
 #define BOOST_FUSION_CATEGORY_OF_IMPL_20060223_2037
 
 #include <boost/fusion/support/category_of.hpp>
diff --git a/example/extension/detail/deref_impl.hpp b/example/extension/detail/deref_impl.hpp
index 7e515e9d..ca474a12 100644
--- a/example/extension/detail/deref_impl.hpp
+++ b/example/extension/detail/deref_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEREF_IMPL_20060222_1952)
+#ifndef BOOST_FUSION_DEREF_IMPL_20060222_1952
 #define BOOST_FUSION_DEREF_IMPL_20060222_1952
 
 #include <boost/static_assert.hpp>
diff --git a/example/extension/detail/distance_impl.hpp b/example/extension/detail/distance_impl.hpp
index b138cc4a..ae11c71d 100644
--- a/example/extension/detail/distance_impl.hpp
+++ b/example/extension/detail/distance_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DISTANCE_IMPL_20060223_0814)
+#ifndef BOOST_FUSION_DISTANCE_IMPL_20060223_0814
 #define BOOST_FUSION_DISTANCE_IMPL_20060223_0814
 
 #include <boost/mpl/minus.hpp>
diff --git a/example/extension/detail/end_impl.hpp b/example/extension/detail/end_impl.hpp
index 749bb33a..38df8881 100644
--- a/example/extension/detail/end_impl.hpp
+++ b/example/extension/detail/end_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_END_IMPL_20060222_2042)
+#ifndef BOOST_FUSION_END_IMPL_20060222_2042
 #define BOOST_FUSION_END_IMPL_20060222_2042
 
 #include "../example_struct_iterator.hpp"
diff --git a/example/extension/detail/equal_to_impl.hpp b/example/extension/detail/equal_to_impl.hpp
index 8ab27649..1adf6176 100644
--- a/example/extension/detail/equal_to_impl.hpp
+++ b/example/extension/detail/equal_to_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_EQUAL_TO_IMPL_20060223_1941)
+#ifndef BOOST_FUSION_EQUAL_TO_IMPL_20060223_1941
 #define BOOST_FUSION_EQUAL_TO_IMPL_20060223_1941
 
 #include <boost/mpl/equal_to.hpp>
diff --git a/example/extension/detail/has_key_impl.hpp b/example/extension/detail/has_key_impl.hpp
index 596827ce..085258c6 100644
--- a/example/extension/detail/has_key_impl.hpp
+++ b/example/extension/detail/has_key_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_HAS_KEY_IMPL_20060223_2156)
+#ifndef BOOST_FUSION_HAS_KEY_IMPL_20060223_2156
 #define BOOST_FUSION_HAS_KEY_IMPL_20060223_2156
 
 #include <boost/type_traits/is_same.hpp>
diff --git a/example/extension/detail/is_sequence_impl.hpp b/example/extension/detail/is_sequence_impl.hpp
index e373342a..071152e0 100644
--- a/example/extension/detail/is_sequence_impl.hpp
+++ b/example/extension/detail/is_sequence_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_SEQUENCE_IMPL_20060228_1946)
+#ifndef BOOST_FUSION_IS_SEQUENCE_IMPL_20060228_1946
 #define BOOST_FUSION_IS_SEQUENCE_IMPL_20060228_1946
 
 #include <boost/mpl/bool.hpp>
diff --git a/example/extension/detail/is_view_impl.hpp b/example/extension/detail/is_view_impl.hpp
index b2344bf2..f2bc34ca 100644
--- a/example/extension/detail/is_view_impl.hpp
+++ b/example/extension/detail/is_view_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_VIEW_IMPL_200604227_2150)
+#ifndef BOOST_FUSION_IS_VIEW_IMPL_200604227_2150
 #define BOOST_FUSION_IS_VIEW_IMPL_200604227_2150
 
 #include <boost/mpl/bool.hpp>
diff --git a/example/extension/detail/next_impl.hpp b/example/extension/detail/next_impl.hpp
index 8fbaa8b1..eb07cde1 100644
--- a/example/extension/detail/next_impl.hpp
+++ b/example/extension/detail/next_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_NEXT_IMPL_20060222_1859)
+#ifndef BOOST_FUSION_NEXT_IMPL_20060222_1859
 #define BOOST_FUSION_NEXT_IMPL_20060222_1859
 
 namespace example
diff --git a/example/extension/detail/prior_impl.hpp b/example/extension/detail/prior_impl.hpp
index 415692ce..c0672c68 100644
--- a/example/extension/detail/prior_impl.hpp
+++ b/example/extension/detail/prior_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_PRIOR_IMPL_20060222_1944)
+#ifndef BOOST_FUSION_PRIOR_IMPL_20060222_1944
 #define BOOST_FUSION_PRIOR_IMPL_20060222_1944
 
 namespace example
diff --git a/example/extension/detail/size_impl.hpp b/example/extension/detail/size_impl.hpp
index 4dc6ec93..485f80af 100644
--- a/example/extension/detail/size_impl.hpp
+++ b/example/extension/detail/size_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SIZE_IMPL_20060223_2033)
+#ifndef BOOST_FUSION_SIZE_IMPL_20060223_2033
 #define BOOST_FUSION_SIZE_IMPL_20060223_2033
 
 #include <boost/mpl/int.hpp>
diff --git a/example/extension/detail/value_at_impl.hpp b/example/extension/detail/value_at_impl.hpp
index 6a1d63ef..e3002d6b 100644
--- a/example/extension/detail/value_at_impl.hpp
+++ b/example/extension/detail/value_at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_IMPL_20060223_2025)
+#ifndef BOOST_FUSION_VALUE_AT_IMPL_20060223_2025
 #define BOOST_FUSION_VALUE_AT_IMPL_20060223_2025
 
 namespace example
diff --git a/example/extension/detail/value_at_key_impl.hpp b/example/extension/detail/value_at_key_impl.hpp
index cabc59aa..f2ec503f 100644
--- a/example/extension/detail/value_at_key_impl.hpp
+++ b/example/extension/detail/value_at_key_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_KEY_IMPL_20060223_2025)
+#ifndef BOOST_FUSION_VALUE_AT_KEY_IMPL_20060223_2025
 #define BOOST_FUSION_VALUE_AT_KEY_IMPL_20060223_2025
 
 namespace fields
diff --git a/example/extension/detail/value_of_impl.hpp b/example/extension/detail/value_of_impl.hpp
index 6fc7e161..4b1dffc1 100644
--- a/example/extension/detail/value_of_impl.hpp
+++ b/example/extension/detail/value_of_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_OF_IMPL_20060223_1905)
+#ifndef BOOST_FUSION_VALUE_OF_IMPL_20060223_1905
 #define BOOST_FUSION_VALUE_OF_IMPL_20060223_1905
 
 #include <string>
diff --git a/example/extension/example_struct.hpp b/example/extension/example_struct.hpp
index cbb058f5..e8a9cbe9 100644
--- a/example/extension/example_struct.hpp
+++ b/example/extension/example_struct.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_EXAMPLE_STRUCT)
+#ifndef BOOST_FUSION_EXAMPLE_STRUCT
 #define BOOST_FUSION_EXAMPLE_STRUCT
 
 #include "./tag_of.hpp"
diff --git a/example/extension/example_struct_iterator.hpp b/example/extension/example_struct_iterator.hpp
index fa04f085..63223a03 100644
--- a/example/extension/example_struct_iterator.hpp
+++ b/example/extension/example_struct_iterator.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_EXAMPLE_STRUCT_ITERATOR)
+#ifndef BOOST_FUSION_EXAMPLE_STRUCT_ITERATOR
 #define BOOST_FUSION_EXAMPLE_STRUCT_ITERATOR
 
 #include <boost/fusion/support/iterator_base.hpp>
diff --git a/example/extension/example_struct_type.hpp b/example/extension/example_struct_type.hpp
index e1d8e175..e1e90e25 100644
--- a/example/extension/example_struct_type.hpp
+++ b/example/extension/example_struct_type.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_EXAMPLE_STRUCT_TYPE)
+#ifndef BOOST_FUSION_EXAMPLE_STRUCT_TYPE
 #define BOOST_FUSION_EXAMPLE_STRUCT_TYPE
 
 #include <string>
diff --git a/example/extension/tag_of.hpp b/example/extension/tag_of.hpp
index 083b730c..ea80b0eb 100644
--- a/example/extension/tag_of.hpp
+++ b/example/extension/tag_of.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_TAG_OF_20060222_2052)
+#ifndef BOOST_FUSION_TAG_OF_20060222_2052
 #define BOOST_FUSION_TAG_OF_20060222_2052
 
 #include <boost/fusion/support/tag_of_fwd.hpp>
diff --git a/include/boost/fusion/adapted.hpp b/include/boost/fusion/adapted.hpp
index 5bc33899..3906fe63 100644
--- a/include/boost/fusion/adapted.hpp
+++ b/include/boost/fusion/adapted.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ADAPTED_30122005_1420)
+#ifndef BOOST_FUSION_ADAPTED_30122005_1420
 #define BOOST_FUSION_ADAPTED_30122005_1420
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/array.hpp b/include/boost/fusion/adapted/array.hpp
index b9508178..4b185de0 100644
--- a/include/boost/fusion/adapted/array.hpp
+++ b/include/boost/fusion/adapted/array.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ARRAY_27122005_1035)
+#ifndef BOOST_FUSION_ARRAY_27122005_1035
 #define BOOST_FUSION_ARRAY_27122005_1035
 
 //For backwards compatibility
diff --git a/include/boost/fusion/adapted/boost_array.hpp b/include/boost/fusion/adapted/boost_array.hpp
index eb6c0af3..2b69293c 100644
--- a/include/boost/fusion/adapted/boost_array.hpp
+++ b/include/boost/fusion/adapted/boost_array.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BOOST_ARRAY_27122005_1035)
+#ifndef BOOST_FUSION_BOOST_ARRAY_27122005_1035
 #define BOOST_FUSION_BOOST_ARRAY_27122005_1035
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_array/array_iterator.hpp b/include/boost/fusion/adapted/boost_array/array_iterator.hpp
index 546d16f0..c026b7e3 100644
--- a/include/boost/fusion/adapted/boost_array/array_iterator.hpp
+++ b/include/boost/fusion/adapted/boost_array/array_iterator.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ARRAY_ITERATOR_26122005_2250)
+#ifndef BOOST_FUSION_ARRAY_ITERATOR_26122005_2250
 #define BOOST_FUSION_ARRAY_ITERATOR_26122005_2250
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
index e355d022..5beda16b 100644
--- a/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_27122005_1241)
+#ifndef BOOST_FUSION_AT_IMPL_27122005_1241
 #define BOOST_FUSION_AT_IMPL_27122005_1241
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
index 8481b765..f4545890 100644
--- a/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BEGIN_IMPL_27122005_1117)
+#ifndef BOOST_FUSION_BEGIN_IMPL_27122005_1117
 #define BOOST_FUSION_BEGIN_IMPL_27122005_1117
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp
index 038f6db9..fb2caa2a 100644
--- a/include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044)
+#ifndef BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044
 #define BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
index 7574b364..71a11047 100644
--- a/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_END_IMPL_27122005_1120)
+#ifndef BOOST_FUSION_END_IMPL_27122005_1120
 #define BOOST_FUSION_END_IMPL_27122005_1120
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp
index ac52e720..0c639b64 100644
--- a/include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_SEQUENCE_IMPL_27122005_1648)
+#ifndef BOOST_FUSION_IS_SEQUENCE_IMPL_27122005_1648
 #define BOOST_FUSION_IS_SEQUENCE_IMPL_27122005_1648
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp
index 0a84aa0a..bbcbc70a 100644
--- a/include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_VIEW_IMPL_27042006_2221)
+#ifndef BOOST_FUSION_IS_VIEW_IMPL_27042006_2221
 #define BOOST_FUSION_IS_VIEW_IMPL_27042006_2221
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_array/detail/size_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/size_impl.hpp
index c04ab93c..7860d9a2 100644
--- a/include/boost/fusion/adapted/boost_array/detail/size_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/size_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SIZE_IMPL_27122005_1251)
+#ifndef BOOST_FUSION_SIZE_IMPL_27122005_1251
 #define BOOST_FUSION_SIZE_IMPL_27122005_1251
 
 namespace boost { namespace fusion {
diff --git a/include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp
index 9f80f73b..ec004891 100644
--- a/include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_IMPL_27122005_1256)
+#ifndef BOOST_FUSION_VALUE_AT_IMPL_27122005_1256
 #define BOOST_FUSION_VALUE_AT_IMPL_27122005_1256
 
 namespace boost { namespace fusion {
diff --git a/include/boost/fusion/adapted/boost_array/tag_of.hpp b/include/boost/fusion/adapted/boost_array/tag_of.hpp
index d93fed1d..32b411f2 100644
--- a/include/boost/fusion/adapted/boost_array/tag_of.hpp
+++ b/include/boost/fusion/adapted/boost_array/tag_of.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_TAG_OF_27122005_1030)
+#ifndef FUSION_SEQUENCE_TAG_OF_27122005_1030
 #define FUSION_SEQUENCE_TAG_OF_27122005_1030
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple.hpp b/include/boost/fusion/adapted/boost_tuple.hpp
index 7ef65686..81de6d15 100644
--- a/include/boost/fusion/adapted/boost_tuple.hpp
+++ b/include/boost/fusion/adapted/boost_tuple.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BOOST_TUPLE_09272006_0732)
+#ifndef BOOST_FUSION_BOOST_TUPLE_09272006_0732
 #define BOOST_FUSION_BOOST_TUPLE_09272006_0732
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp b/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp
index 024d8720..c396a58a 100644
--- a/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BOOST_TUPLE_ITERATOR_09262006_1851)
+#ifndef FUSION_BOOST_TUPLE_ITERATOR_09262006_1851
 #define FUSION_BOOST_TUPLE_ITERATOR_09262006_1851
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp
index 32ca5bec..d2eabbd3 100644
--- a/include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_09262006_1920)
+#ifndef BOOST_FUSION_AT_IMPL_09262006_1920
 #define BOOST_FUSION_AT_IMPL_09262006_1920
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp
index 1fbbb19c..9c269885 100644
--- a/include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BEGIN_IMPL_09272006_0719)
+#ifndef BOOST_FUSION_BEGIN_IMPL_09272006_0719
 #define BOOST_FUSION_BEGIN_IMPL_09272006_0719
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/detail/build_cons.hpp b/include/boost/fusion/adapted/boost_tuple/detail/build_cons.hpp
index 216fb0a6..eea8c4b0 100644
--- a/include/boost/fusion/adapted/boost_tuple/detail/build_cons.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/build_cons.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BUILD_CONS_10172012_0130)
+#ifndef BOOST_FUSION_BUILD_CONS_10172012_0130
 #define BOOST_FUSION_BUILD_CONS_10172012_0130
 
 #include <boost/tuple/tuple.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp
index 9b52c98a..9f68d55c 100644
--- a/include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_09272006_0726)
+#ifndef BOOST_FUSION_CATEGORY_OF_IMPL_09272006_0726
 #define BOOST_FUSION_CATEGORY_OF_IMPL_09272006_0726
 
 namespace boost { namespace fusion 
diff --git a/include/boost/fusion/adapted/boost_tuple/detail/convert_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/convert_impl.hpp
index 8f2fbeec..a043eeba 100644
--- a/include/boost/fusion/adapted/boost_tuple/detail/convert_impl.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/convert_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CONVERT_IMPL_10172012_0120)
+#ifndef BOOST_FUSION_CONVERT_IMPL_10172012_0120
 #define BOOST_FUSION_CONVERT_IMPL_10172012_0120
 
 #include <boost/tuple/tuple.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp
index 9f7f07c3..297991be 100644
--- a/include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_END_IMPL_09272006_0721)
+#ifndef BOOST_FUSION_END_IMPL_09272006_0721
 #define BOOST_FUSION_END_IMPL_09272006_0721
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp
index eb4a1185..22f26f11 100644
--- a/include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_SEQUENCE_IMPL_09272006_0726)
+#ifndef BOOST_FUSION_IS_SEQUENCE_IMPL_09272006_0726
 #define BOOST_FUSION_IS_SEQUENCE_IMPL_09272006_0726
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp
index 63844110..ceb59636 100644
--- a/include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_VIEW_IMPL_09272006_0725)
+#ifndef BOOST_FUSION_IS_VIEW_IMPL_09272006_0725
 #define BOOST_FUSION_IS_VIEW_IMPL_09272006_0725
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp
index 37162786..62ca54fe 100644
--- a/include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SIZE_IMPL_09272006_0724)
+#ifndef BOOST_FUSION_SIZE_IMPL_09272006_0724
 #define BOOST_FUSION_SIZE_IMPL_09272006_0724
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp b/include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp
index 39992713..5bc0ce98 100644
--- a/include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_IMPL_09262006_1926)
+#ifndef BOOST_FUSION_VALUE_AT_IMPL_09262006_1926
 #define BOOST_FUSION_VALUE_AT_IMPL_09262006_1926
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/mpl/clear.hpp b/include/boost/fusion/adapted/boost_tuple/mpl/clear.hpp
index 1cca019c..eaaf482e 100644
--- a/include/boost/fusion/adapted/boost_tuple/mpl/clear.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/mpl/clear.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CLEAR_10172012_0100)
+#ifndef BOOST_FUSION_CLEAR_10172012_0100
 #define BOOST_FUSION_CLEAR_10172012_0100
 
 #include <boost/mpl/identity.hpp>
diff --git a/include/boost/fusion/adapted/boost_tuple/tag_of.hpp b/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
index cf24ffbf..47fa2696 100644
--- a/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_TAG_OF_09262006_1900)
+#ifndef BOOST_FUSION_TAG_OF_09262006_1900
 #define BOOST_FUSION_TAG_OF_09262006_1900
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl.hpp b/include/boost/fusion/adapted/mpl.hpp
index 3eca0320..6c360170 100644
--- a/include/boost/fusion/adapted/mpl.hpp
+++ b/include/boost/fusion/adapted/mpl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MPL_31122005_1152)
+#ifndef BOOST_FUSION_MPL_31122005_1152
 #define BOOST_FUSION_MPL_31122005_1152
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl/detail/at_impl.hpp b/include/boost/fusion/adapted/mpl/detail/at_impl.hpp
index 232ca4df..5f507c68 100644
--- a/include/boost/fusion/adapted/mpl/detail/at_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_31122005_1642)
+#ifndef BOOST_FUSION_AT_IMPL_31122005_1642
 #define BOOST_FUSION_AT_IMPL_31122005_1642
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl/detail/begin_impl.hpp b/include/boost/fusion/adapted/mpl/detail/begin_impl.hpp
index 3f087bda..fe160d5b 100644
--- a/include/boost/fusion/adapted/mpl/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/begin_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BEGIN_IMPL_31122005_1209)
+#ifndef BOOST_FUSION_BEGIN_IMPL_31122005_1209
 #define BOOST_FUSION_BEGIN_IMPL_31122005_1209
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp b/include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp
index 8cf2f88b..867b1610 100644
--- a/include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_20060217_2141)
+#ifndef BOOST_FUSION_CATEGORY_OF_IMPL_20060217_2141
 #define BOOST_FUSION_CATEGORY_OF_IMPL_20060217_2141
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl/detail/empty_impl.hpp b/include/boost/fusion/adapted/mpl/detail/empty_impl.hpp
index 4e385ff5..7d5ec448 100644
--- a/include/boost/fusion/adapted/mpl/detail/empty_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/empty_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_EMPTY_IMPL_31122005_1554)
+#ifndef BOOST_FUSION_EMPTY_IMPL_31122005_1554
 #define BOOST_FUSION_EMPTY_IMPL_31122005_1554
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl/detail/end_impl.hpp b/include/boost/fusion/adapted/mpl/detail/end_impl.hpp
index 7ef13fb4..a2e0752f 100644
--- a/include/boost/fusion/adapted/mpl/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/end_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_END_IMPL_31122005_1237)
+#ifndef BOOST_FUSION_END_IMPL_31122005_1237
 #define BOOST_FUSION_END_IMPL_31122005_1237
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp b/include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp
index 9e5a1dc4..99d67f27 100644
--- a/include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_HAS_KEY_IMPL_31122005_1647)
+#ifndef BOOST_FUSION_HAS_KEY_IMPL_31122005_1647
 #define BOOST_FUSION_HAS_KEY_IMPL_31122005_1647
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp
index caed9e62..0f21ca5e 100644
--- a/include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_SEQUENCE_IMPL_31122005_1505)
+#ifndef BOOST_FUSION_IS_SEQUENCE_IMPL_31122005_1505
 #define BOOST_FUSION_IS_SEQUENCE_IMPL_31122005_1505
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp b/include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp
index b4942489..58a23d12 100644
--- a/include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_VIEW_IMPL_03202006_0048)
+#ifndef BOOST_FUSION_IS_VIEW_IMPL_03202006_0048
 #define BOOST_FUSION_IS_VIEW_IMPL_03202006_0048
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl/detail/size_impl.hpp b/include/boost/fusion/adapted/mpl/detail/size_impl.hpp
index 379b97dc..6c0a841d 100644
--- a/include/boost/fusion/adapted/mpl/detail/size_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/size_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SIZE_IMPL_31122005_1508)
+#ifndef BOOST_FUSION_SIZE_IMPL_31122005_1508
 #define BOOST_FUSION_SIZE_IMPL_31122005_1508
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp b/include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp
index 0d3eb652..e8f826b5 100644
--- a/include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp
+++ b/include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_IMPL_31122005_1621)
+#ifndef BOOST_FUSION_VALUE_AT_IMPL_31122005_1621
 #define BOOST_FUSION_VALUE_AT_IMPL_31122005_1621
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/mpl/mpl_iterator.hpp b/include/boost/fusion/adapted/mpl/mpl_iterator.hpp
index 87de32ad..769d7b4e 100644
--- a/include/boost/fusion/adapted/mpl/mpl_iterator.hpp
+++ b/include/boost/fusion/adapted/mpl/mpl_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MPL_ITERATOR_05052005_0731)
+#ifndef FUSION_MPL_ITERATOR_05052005_0731
 #define FUSION_MPL_ITERATOR_05052005_0731
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_array.hpp b/include/boost/fusion/adapted/std_array.hpp
index 64ae6460..045cec3a 100644
--- a/include/boost/fusion/adapted/std_array.hpp
+++ b/include/boost/fusion/adapted/std_array.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY__01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY__01062013_1700
 #define BOOST_FUSION_STD_ARRAY__01062013_1700
 
 #include <boost/fusion/adapted/std_array/std_array_iterator.hpp>
diff --git a/include/boost/fusion/adapted/std_array/detail/array_size.hpp b/include/boost/fusion/adapted/std_array/detail/array_size.hpp
index 013d3d7b..d787d99d 100644
--- a/include/boost/fusion/adapted/std_array/detail/array_size.hpp
+++ b/include/boost/fusion/adapted/std_array/detail/array_size.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_ARRAY_SIZE_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_ARRAY_SIZE_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_ARRAY_SIZE_01062013_1700
 
 #include <cstddef>
diff --git a/include/boost/fusion/adapted/std_array/detail/at_impl.hpp b/include/boost/fusion/adapted/std_array/detail/at_impl.hpp
index 6086264a..1e77ac5e 100644
--- a/include/boost/fusion/adapted/std_array/detail/at_impl.hpp
+++ b/include/boost/fusion/adapted/std_array/detail/at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_AT_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_AT_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_AT_IMPL_01062013_1700
 
 #include <boost/type_traits/is_const.hpp>
diff --git a/include/boost/fusion/adapted/std_array/detail/begin_impl.hpp b/include/boost/fusion/adapted/std_array/detail/begin_impl.hpp
index c84082e3..65702951 100644
--- a/include/boost/fusion/adapted/std_array/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/std_array/detail/begin_impl.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_BEGIN_OF_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_BEGIN_OF_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_BEGIN_OF_IMPL_01062013_1700
 
 #include <boost/fusion/adapted/std_array/std_array_iterator.hpp>
diff --git a/include/boost/fusion/adapted/std_array/detail/category_of_impl.hpp b/include/boost/fusion/adapted/std_array/detail/category_of_impl.hpp
index b5fa0935..9e9f5247 100644
--- a/include/boost/fusion/adapted/std_array/detail/category_of_impl.hpp
+++ b/include/boost/fusion/adapted/std_array/detail/category_of_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_CATEGORY_OF_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_CATEGORY_OF_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_CATEGORY_OF_IMPL_01062013_1700
 
 #include <boost/config/no_tr1/utility.hpp>
diff --git a/include/boost/fusion/adapted/std_array/detail/end_impl.hpp b/include/boost/fusion/adapted/std_array/detail/end_impl.hpp
index b7b789ef..c7ff6b6f 100644
--- a/include/boost/fusion/adapted/std_array/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/std_array/detail/end_impl.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_END_OF_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_END_OF_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_END_OF_IMPL_01062013_1700
 
 #include <boost/fusion/adapted/std_array/std_array_iterator.hpp>
diff --git a/include/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp
index 8308e838..d729867f 100644
--- a/include/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp
+++ b/include/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_IS_SEQUENCE_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_IS_SEQUENCE_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_IS_SEQUENCE_IMPL_01062013_1700
 
 #include <boost/mpl/bool.hpp>
diff --git a/include/boost/fusion/adapted/std_array/detail/is_view_impl.hpp b/include/boost/fusion/adapted/std_array/detail/is_view_impl.hpp
index 89cd04cf..df104f2c 100644
--- a/include/boost/fusion/adapted/std_array/detail/is_view_impl.hpp
+++ b/include/boost/fusion/adapted/std_array/detail/is_view_impl.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_IS_VIEW_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_IS_VIEW_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_IS_VIEW_IMPL_01062013_1700
 
 #include <boost/mpl/bool.hpp>
diff --git a/include/boost/fusion/adapted/std_array/detail/size_impl.hpp b/include/boost/fusion/adapted/std_array/detail/size_impl.hpp
index 7df51b2a..603b1579 100644
--- a/include/boost/fusion/adapted/std_array/detail/size_impl.hpp
+++ b/include/boost/fusion/adapted/std_array/detail/size_impl.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_SIZE_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_SIZE_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_SIZE_IMPL_01062013_1700
 
 #include <boost/fusion/adapted/std_array/detail/array_size.hpp>
diff --git a/include/boost/fusion/adapted/std_array/detail/value_at_impl.hpp b/include/boost/fusion/adapted/std_array/detail/value_at_impl.hpp
index 3d7871a7..549cd9e0 100644
--- a/include/boost/fusion/adapted/std_array/detail/value_at_impl.hpp
+++ b/include/boost/fusion/adapted/std_array/detail/value_at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_VALUE_AT_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_VALUE_AT_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_VALUE_AT_IMPL_01062013_1700
 
 namespace boost { namespace fusion {
diff --git a/include/boost/fusion/adapted/std_array/std_array_iterator.hpp b/include/boost/fusion/adapted/std_array/std_array_iterator.hpp
index eaf45116..8d53b844 100644
--- a/include/boost/fusion/adapted/std_array/std_array_iterator.hpp
+++ b/include/boost/fusion/adapted/std_array/std_array_iterator.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_ARRAY_ITERATOR_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_ARRAY_ITERATOR_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_ARRAY_ITERATOR_01062013_1700
 
 #include <cstddef>
diff --git a/include/boost/fusion/adapted/std_array/tag_of.hpp b/include/boost/fusion/adapted/std_array/tag_of.hpp
index 543c5bb4..8aa0bd49 100644
--- a/include/boost/fusion/adapted/std_array/tag_of.hpp
+++ b/include/boost/fusion/adapted/std_array/tag_of.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_TAG_OF_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_TAG_OF_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_TAG_OF_01062013_1700
 
 #include <boost/fusion/support/tag_of_fwd.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple.hpp b/include/boost/fusion/adapted/std_tuple.hpp
index b7e84791..a4ef1a8d 100644
--- a/include/boost/fusion/adapted/std_tuple.hpp
+++ b/include/boost/fusion/adapted/std_tuple.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BOOST_TUPLE_09242011_1744)
+#ifndef BOOST_FUSION_BOOST_TUPLE_09242011_1744
 #define BOOST_FUSION_BOOST_TUPLE_09242011_1744
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp
index 47a20a25..18f625ca 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_AT_IMPL_09242011_1744
 #define BOOST_FUSION_AT_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp
index 1d5d392b..1c5b8a75 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BEGIN_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_BEGIN_IMPL_09242011_1744
 #define BOOST_FUSION_BEGIN_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp b/include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp
index b60dc76f..b7f3104a 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BUILD_STD_TUPLE_05292014_0100)
+#ifndef BOOST_FUSION_BUILD_STD_TUPLE_05292014_0100
 #define BOOST_FUSION_BUILD_STD_TUPLE_05292014_0100
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/detail/category_of_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/category_of_impl.hpp
index b41e8418..64fba977 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/category_of_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/category_of_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_04202013_0940)
+#ifndef BOOST_FUSION_CATEGORY_OF_IMPL_04202013_0940
 #define BOOST_FUSION_CATEGORY_OF_IMPL_04202013_0940
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp
index 96b67b11..426971ec 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CONVERT_IMPL_10172012_0940)
+#ifndef BOOST_FUSION_CONVERT_IMPL_10172012_0940
 #define BOOST_FUSION_CONVERT_IMPL_10172012_0940
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp
index 500b0491..c5d87227 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_END_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_END_IMPL_09242011_1744
 #define BOOST_FUSION_END_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/is_sequence_impl.hpp
index 67207265..de18d8d4 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/is_sequence_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/is_sequence_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_SEQUENCE_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_IS_SEQUENCE_IMPL_09242011_1744
 #define BOOST_FUSION_IS_SEQUENCE_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/detail/is_view_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/is_view_impl.hpp
index e161984f..810e6839 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/is_view_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/is_view_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_VIEW_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_IS_VIEW_IMPL_09242011_1744
 #define BOOST_FUSION_IS_VIEW_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/detail/size_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/size_impl.hpp
index 11c294e5..69b52e97 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/size_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/size_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SIZE_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_SIZE_IMPL_09242011_1744
 #define BOOST_FUSION_SIZE_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/detail/value_at_impl.hpp b/include/boost/fusion/adapted/std_tuple/detail/value_at_impl.hpp
index e3e853ca..3f6e2111 100644
--- a/include/boost/fusion/adapted/std_tuple/detail/value_at_impl.hpp
+++ b/include/boost/fusion/adapted/std_tuple/detail/value_at_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_VALUE_AT_IMPL_09242011_1744
 #define BOOST_FUSION_VALUE_AT_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/mpl/clear.hpp b/include/boost/fusion/adapted/std_tuple/mpl/clear.hpp
index 87123164..450490e1 100644
--- a/include/boost/fusion/adapted/std_tuple/mpl/clear.hpp
+++ b/include/boost/fusion/adapted/std_tuple/mpl/clear.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CLEAR_10172012_0940)
+#ifndef BOOST_FUSION_CLEAR_10172012_0940
 #define BOOST_FUSION_CLEAR_10172012_0940
 
 #include <boost/mpl/identity.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp b/include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp
index c84c8470..8d9e9aba 100644
--- a/include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp
+++ b/include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_STD_TUPLE_ITERATOR_09112011_1905)
+#ifndef FUSION_STD_TUPLE_ITERATOR_09112011_1905
 #define FUSION_STD_TUPLE_ITERATOR_09112011_1905
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/adapted/std_tuple/tag_of.hpp b/include/boost/fusion/adapted/std_tuple/tag_of.hpp
index e1453354..acca9c4f 100644
--- a/include/boost/fusion/adapted/std_tuple/tag_of.hpp
+++ b/include/boost/fusion/adapted/std_tuple/tag_of.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_TAG_OF_09112011_1842)
+#ifndef BOOST_FUSION_TAG_OF_09112011_1842
 #define BOOST_FUSION_TAG_OF_09112011_1842
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm.hpp b/include/boost/fusion/algorithm.hpp
index f698ff97..8d8fd819 100644
--- a/include/boost/fusion/algorithm.hpp
+++ b/include/boost/fusion/algorithm.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ALGORITHM_10022005_0549)
+#ifndef FUSION_ALGORITHM_10022005_0549
 #define FUSION_ALGORITHM_10022005_0549
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/auxiliary.hpp b/include/boost/fusion/algorithm/auxiliary.hpp
index 313c81f8..7cd0a305 100644
--- a/include/boost/fusion/algorithm/auxiliary.hpp
+++ b/include/boost/fusion/algorithm/auxiliary.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ALGORITHM_AUXILIARY_02192011_0907)
+#ifndef FUSION_ALGORITHM_AUXILIARY_02192011_0907
 #define FUSION_ALGORITHM_AUXILIARY_02192011_0907
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/auxiliary/copy.hpp b/include/boost/fusion/algorithm/auxiliary/copy.hpp
index ec240bae..aca8c67a 100644
--- a/include/boost/fusion/algorithm/auxiliary/copy.hpp
+++ b/include/boost/fusion/algorithm/auxiliary/copy.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_COPY_02162011_2308)
+#ifndef FUSION_COPY_02162011_2308
 #define FUSION_COPY_02162011_2308
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/auxiliary/move.hpp b/include/boost/fusion/algorithm/auxiliary/move.hpp
index 68552829..953e2898 100644
--- a/include/boost/fusion/algorithm/auxiliary/move.hpp
+++ b/include/boost/fusion/algorithm/auxiliary/move.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MOVE_01192013_2225)
+#ifndef FUSION_MOVE_01192013_2225
 #define FUSION_MOVE_01192013_2225
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/iteration.hpp b/include/boost/fusion/algorithm/iteration.hpp
index 0b58a28f..10b7e490 100644
--- a/include/boost/fusion/algorithm/iteration.hpp
+++ b/include/boost/fusion/algorithm/iteration.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ALGORITHM_ITERATION_10022005_0549)
+#ifndef FUSION_ALGORITHM_ITERATION_10022005_0549
 #define FUSION_ALGORITHM_ITERATION_10022005_0549
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/iteration/accumulate.hpp b/include/boost/fusion/algorithm/iteration/accumulate.hpp
index 7d524a15..67e36f8e 100644
--- a/include/boost/fusion/algorithm/iteration/accumulate.hpp
+++ b/include/boost/fusion/algorithm/iteration/accumulate.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ACCUMULATE_09172005_1032)
+#ifndef FUSION_ACCUMULATE_09172005_1032
 #define FUSION_ACCUMULATE_09172005_1032
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp b/include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp
index f00e67f9..097f37e4 100644
--- a/include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp
+++ b/include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ACCUMULATE_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_ACCUMULATE_FWD_HPP_INCLUDED
 #define BOOST_FUSION_ACCUMULATE_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/iteration/detail/for_each.hpp b/include/boost/fusion/algorithm/iteration/detail/for_each.hpp
index c674511e..f02198dd 100644
--- a/include/boost/fusion/algorithm/iteration/detail/for_each.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/for_each.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_FOR_EACH_05052005_1028)
+#ifndef FUSION_FOR_EACH_05052005_1028
 #define FUSION_FOR_EACH_05052005_1028
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp b/include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp
index 663c6fed..8aa514b9 100644
--- a/include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/segmented_fold.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_FOLD_S_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FOLD_S_HPP_INCLUDED
 #define BOOST_FUSION_FOLD_S_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp b/include/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp
index 404ba2a0..fb98d092 100644
--- a/include/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp
+++ b/include/boost/fusion/algorithm/iteration/detail/segmented_for_each.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_FOR_EACH_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_FOR_EACH_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_FOR_EACH_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/iteration/fold.hpp b/include/boost/fusion/algorithm/iteration/fold.hpp
index 039e01c0..2046cccc 100644
--- a/include/boost/fusion/algorithm/iteration/fold.hpp
+++ b/include/boost/fusion/algorithm/iteration/fold.hpp
@@ -24,7 +24,7 @@
 #include <boost/core/enable_if.hpp>
 #include <boost/type_traits/add_reference.hpp>
 
-#if !defined(BOOST_FUSION_DONT_USE_PREPROCESSED_FILES)
+#ifndef BOOST_FUSION_DONT_USE_PREPROCESSED_FILES
 #include <boost/fusion/algorithm/iteration/detail/preprocessed/fold.hpp>
 #else
 #if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
diff --git a/include/boost/fusion/algorithm/iteration/for_each.hpp b/include/boost/fusion/algorithm/iteration/for_each.hpp
index 34996675..08010270 100644
--- a/include/boost/fusion/algorithm/iteration/for_each.hpp
+++ b/include/boost/fusion/algorithm/iteration/for_each.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_FOR_EACH_20070527_0943)
+#ifndef BOOST_FUSION_FOR_EACH_20070527_0943
 #define BOOST_FUSION_FOR_EACH_20070527_0943
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/iteration/for_each_fwd.hpp b/include/boost/fusion/algorithm/iteration/for_each_fwd.hpp
index c3ffaa42..ae44a12a 100644
--- a/include/boost/fusion/algorithm/iteration/for_each_fwd.hpp
+++ b/include/boost/fusion/algorithm/iteration/for_each_fwd.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_FOR_EACH_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FOR_EACH_FWD_HPP_INCLUDED
 #define BOOST_FUSION_FOR_EACH_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query.hpp b/include/boost/fusion/algorithm/query.hpp
index 1e999b43..f08a4715 100644
--- a/include/boost/fusion/algorithm/query.hpp
+++ b/include/boost/fusion/algorithm/query.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ALGORITHM_QUERY_10022005_0549)
+#ifndef FUSION_ALGORITHM_QUERY_10022005_0549
 #define FUSION_ALGORITHM_QUERY_10022005_0549
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/all.hpp b/include/boost/fusion/algorithm/query/all.hpp
index 5122af58..109b8f65 100644
--- a/include/boost/fusion/algorithm/query/all.hpp
+++ b/include/boost/fusion/algorithm/query/all.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ALL_05052005_1238)
+#ifndef BOOST_FUSION_ALL_05052005_1238
 #define BOOST_FUSION_ALL_05052005_1238
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/any.hpp b/include/boost/fusion/algorithm/query/any.hpp
index e1aad08d..4588ed6a 100644
--- a/include/boost/fusion/algorithm/query/any.hpp
+++ b/include/boost/fusion/algorithm/query/any.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ANY_05052005_1230)
+#ifndef FUSION_ANY_05052005_1230
 #define FUSION_ANY_05052005_1230
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/count.hpp b/include/boost/fusion/algorithm/query/count.hpp
index 7a352129..81037e35 100644
--- a/include/boost/fusion/algorithm/query/count.hpp
+++ b/include/boost/fusion/algorithm/query/count.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_COUNT_09162005_0150)
+#ifndef BOOST_FUSION_COUNT_09162005_0150
 #define BOOST_FUSION_COUNT_09162005_0150
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/count_if.hpp b/include/boost/fusion/algorithm/query/count_if.hpp
index 8ef86b01..1c3b2e00 100644
--- a/include/boost/fusion/algorithm/query/count_if.hpp
+++ b/include/boost/fusion/algorithm/query/count_if.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_COUNT_IF_09162005_0137)
+#ifndef BOOST_FUSION_COUNT_IF_09162005_0137
 #define BOOST_FUSION_COUNT_IF_09162005_0137
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/detail/all.hpp b/include/boost/fusion/algorithm/query/detail/all.hpp
index e7e1535d..c8a4640e 100644
--- a/include/boost/fusion/algorithm/query/detail/all.hpp
+++ b/include/boost/fusion/algorithm/query/detail/all.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ALL_05052005_1237)
+#ifndef FUSION_ALL_05052005_1237
 #define FUSION_ALL_05052005_1237
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/detail/any.hpp b/include/boost/fusion/algorithm/query/detail/any.hpp
index 43628eac..6d7dcc76 100644
--- a/include/boost/fusion/algorithm/query/detail/any.hpp
+++ b/include/boost/fusion/algorithm/query/detail/any.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ANY_05052005_1229)
+#ifndef FUSION_ANY_05052005_1229
 #define FUSION_ANY_05052005_1229
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/detail/count.hpp b/include/boost/fusion/algorithm/query/detail/count.hpp
index 86714ff7..a4d87cee 100644
--- a/include/boost/fusion/algorithm/query/detail/count.hpp
+++ b/include/boost/fusion/algorithm/query/detail/count.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_COUNT_09162005_0158)
+#ifndef FUSION_COUNT_09162005_0158
 #define FUSION_COUNT_09162005_0158
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/detail/count_if.hpp b/include/boost/fusion/algorithm/query/detail/count_if.hpp
index 17c67a0b..595404df 100644
--- a/include/boost/fusion/algorithm/query/detail/count_if.hpp
+++ b/include/boost/fusion/algorithm/query/detail/count_if.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_COUNT_IF_09162005_0141)
+#ifndef BOOST_FUSION_COUNT_IF_09162005_0141
 #define BOOST_FUSION_COUNT_IF_09162005_0141
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/detail/find_if.hpp b/include/boost/fusion/algorithm/query/detail/find_if.hpp
index 06a7af79..0c161ce7 100644
--- a/include/boost/fusion/algorithm/query/detail/find_if.hpp
+++ b/include/boost/fusion/algorithm/query/detail/find_if.hpp
@@ -7,7 +7,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_FIND_IF_05052005_1107)
+#ifndef FUSION_FIND_IF_05052005_1107
 #define FUSION_FIND_IF_05052005_1107
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/detail/segmented_find.hpp b/include/boost/fusion/algorithm/query/detail/segmented_find.hpp
index d8533afe..138e7e67 100644
--- a/include/boost/fusion/algorithm/query/detail/segmented_find.hpp
+++ b/include/boost/fusion/algorithm/query/detail/segmented_find.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_FIND_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_FIND_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_FIND_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/detail/segmented_find_if.hpp b/include/boost/fusion/algorithm/query/detail/segmented_find_if.hpp
index fd527c73..f0903336 100644
--- a/include/boost/fusion/algorithm/query/detail/segmented_find_if.hpp
+++ b/include/boost/fusion/algorithm/query/detail/segmented_find_if.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_FIND_IF_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_FIND_IF_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_FIND_IF_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/find.hpp b/include/boost/fusion/algorithm/query/find.hpp
index 41c22fb3..d3968553 100644
--- a/include/boost/fusion/algorithm/query/find.hpp
+++ b/include/boost/fusion/algorithm/query/find.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_FIND_05052005_1107)
+#ifndef FUSION_FIND_05052005_1107
 #define FUSION_FIND_05052005_1107
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/find_fwd.hpp b/include/boost/fusion/algorithm/query/find_fwd.hpp
index c4fc0a9f..d0654996 100644
--- a/include/boost/fusion/algorithm/query/find_fwd.hpp
+++ b/include/boost/fusion/algorithm/query/find_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_FIND_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FIND_FWD_HPP_INCLUDED
 #define BOOST_FUSION_FIND_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/find_if.hpp b/include/boost/fusion/algorithm/query/find_if.hpp
index 38601ebf..63dbfe13 100644
--- a/include/boost/fusion/algorithm/query/find_if.hpp
+++ b/include/boost/fusion/algorithm/query/find_if.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_FIND_IF_05052005_1108)
+#ifndef FUSION_FIND_IF_05052005_1108
 #define FUSION_FIND_IF_05052005_1108
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/find_if_fwd.hpp b/include/boost/fusion/algorithm/query/find_if_fwd.hpp
index 5c8abd5b..19f3c10b 100644
--- a/include/boost/fusion/algorithm/query/find_if_fwd.hpp
+++ b/include/boost/fusion/algorithm/query/find_if_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_FIND_IF_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FIND_IF_FWD_HPP_INCLUDED
 #define BOOST_FUSION_FIND_IF_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/query/none.hpp b/include/boost/fusion/algorithm/query/none.hpp
index 1fecdbfe..d9a7b2fc 100644
--- a/include/boost/fusion/algorithm/query/none.hpp
+++ b/include/boost/fusion/algorithm/query/none.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_NONE_07062005_1128)
+#ifndef BOOST_FUSION_NONE_07062005_1128
 #define BOOST_FUSION_NONE_07062005_1128
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation.hpp b/include/boost/fusion/algorithm/transformation.hpp
index b9534e80..7124e071 100644
--- a/include/boost/fusion/algorithm/transformation.hpp
+++ b/include/boost/fusion/algorithm/transformation.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ALGORITHM_TRANSFORMATION_10022005_0551)
+#ifndef FUSION_ALGORITHM_TRANSFORMATION_10022005_0551
 #define FUSION_ALGORITHM_TRANSFORMATION_10022005_0551
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/clear.hpp b/include/boost/fusion/algorithm/transformation/clear.hpp
index d2e42fe0..d728845a 100644
--- a/include/boost/fusion/algorithm/transformation/clear.hpp
+++ b/include/boost/fusion/algorithm/transformation/clear.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CLEAR_09172005_1127)
+#ifndef FUSION_CLEAR_09172005_1127
 #define FUSION_CLEAR_09172005_1127
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/detail/replace.hpp b/include/boost/fusion/algorithm/transformation/detail/replace.hpp
index 88c4faab..ee2c6d1a 100644
--- a/include/boost/fusion/algorithm/transformation/detail/replace.hpp
+++ b/include/boost/fusion/algorithm/transformation/detail/replace.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_REPLACE_08182005_0841)
+#ifndef FUSION_REPLACE_08182005_0841
 #define FUSION_REPLACE_08182005_0841
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp b/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp
index 2ecff682..7e3a60bb 100644
--- a/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp
+++ b/include/boost/fusion/algorithm/transformation/detail/replace_if.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_REPLACE_IF_08182005_0946)
+#ifndef FUSION_REPLACE_IF_08182005_0946
 #define FUSION_REPLACE_IF_08182005_0946
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/erase.hpp b/include/boost/fusion/algorithm/transformation/erase.hpp
index 8eebc357..c2c78311 100644
--- a/include/boost/fusion/algorithm/transformation/erase.hpp
+++ b/include/boost/fusion/algorithm/transformation/erase.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ERASE_07232005_0534)
+#ifndef FUSION_ERASE_07232005_0534
 #define FUSION_ERASE_07232005_0534
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/erase_key.hpp b/include/boost/fusion/algorithm/transformation/erase_key.hpp
index 3757f46f..e1e5d804 100644
--- a/include/boost/fusion/algorithm/transformation/erase_key.hpp
+++ b/include/boost/fusion/algorithm/transformation/erase_key.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ERASE_KEY_10022005_1851)
+#ifndef FUSION_ERASE_KEY_10022005_1851
 #define FUSION_ERASE_KEY_10022005_1851
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/filter.hpp b/include/boost/fusion/algorithm/transformation/filter.hpp
index 2fc62720..f78bc026 100644
--- a/include/boost/fusion/algorithm/transformation/filter.hpp
+++ b/include/boost/fusion/algorithm/transformation/filter.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_FILTER_02122005_1839)
+#ifndef FUSION_FILTER_02122005_1839
 #define FUSION_FILTER_02122005_1839
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/filter_if.hpp b/include/boost/fusion/algorithm/transformation/filter_if.hpp
index ca28e0e8..46f7c19a 100644
--- a/include/boost/fusion/algorithm/transformation/filter_if.hpp
+++ b/include/boost/fusion/algorithm/transformation/filter_if.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_FILTER_IF_07172005_0818)
+#ifndef FUSION_FILTER_IF_07172005_0818
 #define FUSION_FILTER_IF_07172005_0818
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/insert.hpp b/include/boost/fusion/algorithm/transformation/insert.hpp
index c6d5219d..547bbd9c 100644
--- a/include/boost/fusion/algorithm/transformation/insert.hpp
+++ b/include/boost/fusion/algorithm/transformation/insert.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INSERT_07222005_0730)
+#ifndef FUSION_INSERT_07222005_0730
 #define FUSION_INSERT_07222005_0730
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/insert_range.hpp b/include/boost/fusion/algorithm/transformation/insert_range.hpp
index 57878309..20220969 100644
--- a/include/boost/fusion/algorithm/transformation/insert_range.hpp
+++ b/include/boost/fusion/algorithm/transformation/insert_range.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INSERT_RANGE_009172005_1147)
+#ifndef FUSION_INSERT_RANGE_009172005_1147
 #define FUSION_INSERT_RANGE_009172005_1147
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/join.hpp b/include/boost/fusion/algorithm/transformation/join.hpp
index 8be49224..eb91e617 100644
--- a/include/boost/fusion/algorithm/transformation/join.hpp
+++ b/include/boost/fusion/algorithm/transformation/join.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_JOIN_200601222109)
+#ifndef FUSION_JOIN_200601222109
 #define FUSION_JOIN_200601222109
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/pop_back.hpp b/include/boost/fusion/algorithm/transformation/pop_back.hpp
index 9a7e7547..b2d715e3 100644
--- a/include/boost/fusion/algorithm/transformation/pop_back.hpp
+++ b/include/boost/fusion/algorithm/transformation/pop_back.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_POP_BACK_09172005_1038)
+#ifndef FUSION_POP_BACK_09172005_1038
 #define FUSION_POP_BACK_09172005_1038
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/pop_front.hpp b/include/boost/fusion/algorithm/transformation/pop_front.hpp
index 11b7f6ee..0711d808 100644
--- a/include/boost/fusion/algorithm/transformation/pop_front.hpp
+++ b/include/boost/fusion/algorithm/transformation/pop_front.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_POP_FRONT_09172005_1115)
+#ifndef FUSION_POP_FRONT_09172005_1115
 #define FUSION_POP_FRONT_09172005_1115
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/push_back.hpp b/include/boost/fusion/algorithm/transformation/push_back.hpp
index 51c2569d..fab3e70a 100644
--- a/include/boost/fusion/algorithm/transformation/push_back.hpp
+++ b/include/boost/fusion/algorithm/transformation/push_back.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_PUSH_BACK_07162005_0235)
+#ifndef FUSION_PUSH_BACK_07162005_0235
 #define FUSION_PUSH_BACK_07162005_0235
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/push_front.hpp b/include/boost/fusion/algorithm/transformation/push_front.hpp
index a1b7b390..15b16687 100644
--- a/include/boost/fusion/algorithm/transformation/push_front.hpp
+++ b/include/boost/fusion/algorithm/transformation/push_front.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_PUSH_FRONT_07162005_0749)
+#ifndef FUSION_PUSH_FRONT_07162005_0749
 #define FUSION_PUSH_FRONT_07162005_0749
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/remove.hpp b/include/boost/fusion/algorithm/transformation/remove.hpp
index f8bebf70..9fad1eae 100644
--- a/include/boost/fusion/algorithm/transformation/remove.hpp
+++ b/include/boost/fusion/algorithm/transformation/remove.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_REMOVE_07162005_0818)
+#ifndef FUSION_REMOVE_07162005_0818
 #define FUSION_REMOVE_07162005_0818
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/remove_if.hpp b/include/boost/fusion/algorithm/transformation/remove_if.hpp
index 3f8ebbcd..e3dbad56 100644
--- a/include/boost/fusion/algorithm/transformation/remove_if.hpp
+++ b/include/boost/fusion/algorithm/transformation/remove_if.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_REMOVE_IF_07162005_0818)
+#ifndef FUSION_REMOVE_IF_07162005_0818
 #define FUSION_REMOVE_IF_07162005_0818
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/replace.hpp b/include/boost/fusion/algorithm/transformation/replace.hpp
index 4d754cc0..9498fdc1 100644
--- a/include/boost/fusion/algorithm/transformation/replace.hpp
+++ b/include/boost/fusion/algorithm/transformation/replace.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_REPLACE_08182005_0830)
+#ifndef FUSION_REPLACE_08182005_0830
 #define FUSION_REPLACE_08182005_0830
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/replace_if.hpp b/include/boost/fusion/algorithm/transformation/replace_if.hpp
index 8a2bddc6..cbb9e416 100644
--- a/include/boost/fusion/algorithm/transformation/replace_if.hpp
+++ b/include/boost/fusion/algorithm/transformation/replace_if.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_REPLACE_IF_08182005_0939)
+#ifndef FUSION_REPLACE_IF_08182005_0939
 #define FUSION_REPLACE_IF_08182005_0939
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/reverse.hpp b/include/boost/fusion/algorithm/transformation/reverse.hpp
index 53de417a..3f606c65 100644
--- a/include/boost/fusion/algorithm/transformation/reverse.hpp
+++ b/include/boost/fusion/algorithm/transformation/reverse.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_REVERSE_07212005_1230)
+#ifndef FUSION_REVERSE_07212005_1230
 #define FUSION_REVERSE_07212005_1230
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/transform.hpp b/include/boost/fusion/algorithm/transformation/transform.hpp
index 6a487ccc..68744694 100644
--- a/include/boost/fusion/algorithm/transformation/transform.hpp
+++ b/include/boost/fusion/algorithm/transformation/transform.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_TRANSFORM_07052005_1057)
+#ifndef FUSION_TRANSFORM_07052005_1057
 #define FUSION_TRANSFORM_07052005_1057
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/algorithm/transformation/zip.hpp b/include/boost/fusion/algorithm/transformation/zip.hpp
index 0775a429..deafc86b 100644
--- a/include/boost/fusion/algorithm/transformation/zip.hpp
+++ b/include/boost/fusion/algorithm/transformation/zip.hpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_ZIP_HPP_20060125_2058)
+#ifndef FUSION_ZIP_HPP_20060125_2058
 #define FUSION_ZIP_HPP_20060125_2058
 
 #include <boost/fusion/view/zip_view.hpp>
diff --git a/include/boost/fusion/container.hpp b/include/boost/fusion/container.hpp
index ab19e2cd..e2ae556b 100644
--- a/include/boost/fusion/container.hpp
+++ b/include/boost/fusion/container.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_CLASS_10022005_0614)
+#ifndef FUSION_SEQUENCE_CLASS_10022005_0614
 #define FUSION_SEQUENCE_CLASS_10022005_0614
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque.hpp b/include/boost/fusion/container/deque.hpp
index c07de030..e5643e86 100644
--- a/include/boost/fusion/container/deque.hpp
+++ b/include/boost/fusion/container/deque.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEQUENCE_CONTAINER_DEQUE_24112006_2036)
+#ifndef BOOST_FUSION_SEQUENCE_CONTAINER_DEQUE_24112006_2036
 #define BOOST_FUSION_SEQUENCE_CONTAINER_DEQUE_24112006_2036
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/back_extended_deque.hpp b/include/boost/fusion/container/deque/back_extended_deque.hpp
index 04b1d41f..c1d8e661 100644
--- a/include/boost/fusion/container/deque/back_extended_deque.hpp
+++ b/include/boost/fusion/container/deque/back_extended_deque.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BACK_EXTENDED_DEQUE_26112006_2209)
+#ifndef BOOST_FUSION_BACK_EXTENDED_DEQUE_26112006_2209
 #define BOOST_FUSION_BACK_EXTENDED_DEQUE_26112006_2209
 
 #include <boost/config.hpp>
diff --git a/include/boost/fusion/container/deque/convert.hpp b/include/boost/fusion/container/deque/convert.hpp
index 9a4bf01a..6fe40343 100644
--- a/include/boost/fusion/container/deque/convert.hpp
+++ b/include/boost/fusion/container/deque/convert.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_20061213_2207)
+#ifndef FUSION_CONVERT_20061213_2207
 #define FUSION_CONVERT_20061213_2207
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/deque.hpp b/include/boost/fusion/container/deque/deque.hpp
index a282a701..3fd8dec3 100644
--- a/include/boost/fusion/container/deque/deque.hpp
+++ b/include/boost/fusion/container/deque/deque.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEQUE_26112006_1649)
+#ifndef BOOST_FUSION_DEQUE_26112006_1649
 #define BOOST_FUSION_DEQUE_26112006_1649
 
 # include <boost/fusion/container/deque/deque_fwd.hpp>
diff --git a/include/boost/fusion/container/deque/deque_fwd.hpp b/include/boost/fusion/container/deque/deque_fwd.hpp
index 5b8ea56f..45d8a848 100644
--- a/include/boost/fusion/container/deque/deque_fwd.hpp
+++ b/include/boost/fusion/container/deque/deque_fwd.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DEQUE_FORWARD_02092007_0749)
+#ifndef FUSION_DEQUE_FORWARD_02092007_0749
 #define FUSION_DEQUE_FORWARD_02092007_0749
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/deque_iterator.hpp b/include/boost/fusion/container/deque/deque_iterator.hpp
index 66fd635d..d3291d88 100644
--- a/include/boost/fusion/container/deque/deque_iterator.hpp
+++ b/include/boost/fusion/container/deque/deque_iterator.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEQUE_ITERATOR_26112006_2154)
+#ifndef BOOST_FUSION_DEQUE_ITERATOR_26112006_2154
 #define BOOST_FUSION_DEQUE_ITERATOR_26112006_2154
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/detail/at_impl.hpp b/include/boost/fusion/container/deque/detail/at_impl.hpp
index 3edf4829..ead09c06 100644
--- a/include/boost/fusion/container/deque/detail/at_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEQUE_AT_IMPL_09122006_2017)
+#ifndef BOOST_FUSION_DEQUE_AT_IMPL_09122006_2017
 #define BOOST_FUSION_DEQUE_AT_IMPL_09122006_2017
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/detail/begin_impl.hpp b/include/boost/fusion/container/deque/detail/begin_impl.hpp
index 27b4f41b..678dc52e 100644
--- a/include/boost/fusion/container/deque/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/begin_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEQUE_BEGIN_IMPL_09122006_2034)
+#ifndef BOOST_FUSION_DEQUE_BEGIN_IMPL_09122006_2034
 #define BOOST_FUSION_DEQUE_BEGIN_IMPL_09122006_2034
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/detail/build_deque.hpp b/include/boost/fusion/container/deque/detail/build_deque.hpp
index 4dd990ae..d4b55c2a 100644
--- a/include/boost/fusion/container/deque/detail/build_deque.hpp
+++ b/include/boost/fusion/container/deque/detail/build_deque.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BUILD_DEQUE_02032013_1921)
+#ifndef BOOST_FUSION_BUILD_DEQUE_02032013_1921
 #define BOOST_FUSION_BUILD_DEQUE_02032013_1921
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/detail/convert_impl.hpp b/include/boost/fusion/container/deque/detail/convert_impl.hpp
index ede0cc48..0400c1b4 100644
--- a/include/boost/fusion/container/deque/detail/convert_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/convert_impl.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_IMPL_20061213_2207)
+#ifndef FUSION_CONVERT_IMPL_20061213_2207
 #define FUSION_CONVERT_IMPL_20061213_2207
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp b/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
index 860a2a29..802ef36d 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_AS_DEQUE_20061213_2210)
+#ifndef FUSION_AS_DEQUE_20061213_2210
 #define FUSION_AS_DEQUE_20061213_2210
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp b/include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp
index 587aa3b0..3c5ddfe4 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/build_deque.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BUILD_DEQUE_02032013_1921)
+#ifndef BOOST_FUSION_BUILD_DEQUE_02032013_1921
 #define BOOST_FUSION_BUILD_DEQUE_02032013_1921
 
 #if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE)
diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque.hpp
index 9a130ecb..bc4c7063 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/deque.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/deque.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_PP_FUSION_DEQUE_26112006_1649)
+#ifndef BOOST_PP_FUSION_DEQUE_26112006_1649
 #define BOOST_PP_FUSION_DEQUE_26112006_1649
 
 #if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE)
diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp
index eeaa29ff..3e9cf2c9 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/deque_forward_ctor.hpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #if !defined(BOOST_PP_IS_ITERATING)
-#if !defined(BOOST_FUSION_SEQUENCE_DEQUE_DETAIL_DEQUE_FORWARD_CTOR_04122006_2212)
+#ifndef BOOST_FUSION_SEQUENCE_DEQUE_DETAIL_DEQUE_FORWARD_CTOR_04122006_2212
 #define BOOST_FUSION_SEQUENCE_DEQUE_DETAIL_DEQUE_FORWARD_CTOR_04122006_2212
 
 #if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE)
diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp
index 0da8bd22..c79e9627 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/deque_fwd.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_PP_DEQUE_FORWARD_02092007_0749)
+#ifndef FUSION_PP_DEQUE_FORWARD_02092007_0749
 #define FUSION_PP_DEQUE_FORWARD_02092007_0749
 
 #if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE)
diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque_initial_size.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque_initial_size.hpp
index 5ac245d9..83658cba 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/deque_initial_size.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/deque_initial_size.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEQUE_DETAIL_DEQUE_INITIAL_SIZE_26112006_2139)
+#ifndef BOOST_FUSION_DEQUE_DETAIL_DEQUE_INITIAL_SIZE_26112006_2139
 #define BOOST_FUSION_DEQUE_DETAIL_DEQUE_INITIAL_SIZE_26112006_2139
 
 #if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE)
diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values.hpp
index fcbd74a7..cdb5e1ce 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEQUE_DETAIL_DEQUE_KEYED_VALUES_26112006_1330)
+#ifndef BOOST_FUSION_DEQUE_DETAIL_DEQUE_KEYED_VALUES_26112006_1330
 #define BOOST_FUSION_DEQUE_DETAIL_DEQUE_KEYED_VALUES_26112006_1330
 
 #if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE)
diff --git a/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values_call.hpp b/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values_call.hpp
index 87f3714b..af485cad 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values_call.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/deque_keyed_values_call.hpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #if !defined(BOOST_PP_IS_ITERATING)
-#if !defined(BOOST_FUSION_SEQUENCE_DEQUE_DETAIL_DEQUE_KEYED_VALUES_CALL_04122006_2211)
+#ifndef BOOST_FUSION_SEQUENCE_DEQUE_DETAIL_DEQUE_KEYED_VALUES_CALL_04122006_2211
 #define BOOST_FUSION_SEQUENCE_DEQUE_DETAIL_DEQUE_KEYED_VALUES_CALL_04122006_2211
 
 #if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE)
diff --git a/include/boost/fusion/container/deque/detail/cpp03/limits.hpp b/include/boost/fusion/container/deque/detail/cpp03/limits.hpp
index 16e25fa0..9832335a 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/limits.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/limits.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEQUE_LIMITS_26112006_1737)
+#ifndef BOOST_FUSION_DEQUE_LIMITS_26112006_1737
 #define BOOST_FUSION_DEQUE_LIMITS_26112006_1737
 
 #if defined(BOOST_FUSION_HAS_VARIADIC_DEQUE)
diff --git a/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp b/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
index 7c6df7b6..5c30df53 100644
--- a/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
+++ b/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEQUE_DETAIL_CPP11_DEQUE_KEYED_VALUES_07042012_1901)
+#ifndef BOOST_FUSION_DEQUE_DETAIL_CPP11_DEQUE_KEYED_VALUES_07042012_1901
 #define BOOST_FUSION_DEQUE_DETAIL_CPP11_DEQUE_KEYED_VALUES_07042012_1901
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/detail/end_impl.hpp b/include/boost/fusion/container/deque/detail/end_impl.hpp
index 8f67ff4a..c71577f4 100644
--- a/include/boost/fusion/container/deque/detail/end_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/end_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEQUE_END_IMPL_09122006_2034)
+#ifndef BOOST_FUSION_DEQUE_END_IMPL_09122006_2034
 #define BOOST_FUSION_DEQUE_END_IMPL_09122006_2034
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/detail/keyed_element.hpp b/include/boost/fusion/container/deque/detail/keyed_element.hpp
index 3ab88b92..f7dc4747 100644
--- a/include/boost/fusion/container/deque/detail/keyed_element.hpp
+++ b/include/boost/fusion/container/deque/detail/keyed_element.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEQUE_DETAIL_KEYED_ELEMENT_26112006_1330)
+#ifndef BOOST_FUSION_DEQUE_DETAIL_KEYED_ELEMENT_26112006_1330
 #define BOOST_FUSION_DEQUE_DETAIL_KEYED_ELEMENT_26112006_1330
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/detail/value_at_impl.hpp b/include/boost/fusion/container/deque/detail/value_at_impl.hpp
index f15dee01..6f503f46 100644
--- a/include/boost/fusion/container/deque/detail/value_at_impl.hpp
+++ b/include/boost/fusion/container/deque/detail/value_at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEQUE_VALUE_AT_IMPL_08122006_0756)
+#ifndef BOOST_FUSION_DEQUE_VALUE_AT_IMPL_08122006_0756
 #define BOOST_FUSION_DEQUE_VALUE_AT_IMPL_08122006_0756
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/deque/front_extended_deque.hpp b/include/boost/fusion/container/deque/front_extended_deque.hpp
index ab4cdf7c..0fb252a8 100644
--- a/include/boost/fusion/container/deque/front_extended_deque.hpp
+++ b/include/boost/fusion/container/deque/front_extended_deque.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_FRONT_EXTENDED_DEQUE_26112006_2209)
+#ifndef BOOST_FUSION_FRONT_EXTENDED_DEQUE_26112006_2209
 #define BOOST_FUSION_FRONT_EXTENDED_DEQUE_26112006_2209
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/generation.hpp b/include/boost/fusion/container/generation.hpp
index 98e0298b..c8626e84 100644
--- a/include/boost/fusion/container/generation.hpp
+++ b/include/boost/fusion/container/generation.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_GENERATION_10022005_0615)
+#ifndef FUSION_SEQUENCE_GENERATION_10022005_0615
 #define FUSION_SEQUENCE_GENERATION_10022005_0615
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/generation/cons_tie.hpp b/include/boost/fusion/container/generation/cons_tie.hpp
index 2058ebf5..a5ec6777 100644
--- a/include/boost/fusion/container/generation/cons_tie.hpp
+++ b/include/boost/fusion/container/generation/cons_tie.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONS_TIE_07182005_0854)
+#ifndef FUSION_CONS_TIE_07182005_0854
 #define FUSION_CONS_TIE_07182005_0854
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/generation/deque_tie.hpp b/include/boost/fusion/container/generation/deque_tie.hpp
index 8b6b9e7b..013ad325 100644
--- a/include/boost/fusion/container/generation/deque_tie.hpp
+++ b/include/boost/fusion/container/generation/deque_tie.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DEQUE_TIE_01272013_1401)
+#ifndef FUSION_DEQUE_TIE_01272013_1401
 #define FUSION_DEQUE_TIE_01272013_1401
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/generation/detail/pp_deque_tie.hpp b/include/boost/fusion/container/generation/detail/pp_deque_tie.hpp
index 9146118e..dbed5093 100644
--- a/include/boost/fusion/container/generation/detail/pp_deque_tie.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_deque_tie.hpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_PP_DEQUE_TIE_07192005_1242)
+#ifndef FUSION_PP_DEQUE_TIE_07192005_1242
 #define FUSION_PP_DEQUE_TIE_07192005_1242
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/generation/detail/pp_list_tie.hpp b/include/boost/fusion/container/generation/detail/pp_list_tie.hpp
index be25627a..0a738780 100644
--- a/include/boost/fusion/container/generation/detail/pp_list_tie.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_list_tie.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_PP_LIST_TIE_07192005_0109)
+#ifndef FUSION_PP_LIST_TIE_07192005_0109
 #define FUSION_PP_LIST_TIE_07192005_0109
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/generation/detail/pp_make_deque.hpp b/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
index 5635c73c..53a8163a 100644
--- a/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_PP_MAKE_DEQUE_07162005_0243)
+#ifndef FUSION_PP_MAKE_DEQUE_07162005_0243
 #define FUSION_MAKE_PP_DEQUE_07162005_0243
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/generation/detail/pp_make_list.hpp b/include/boost/fusion/container/generation/detail/pp_make_list.hpp
index 989bf36b..73adcdcc 100644
--- a/include/boost/fusion/container/generation/detail/pp_make_list.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_make_list.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_PP_MAKE_LIST_07192005_1239)
+#ifndef FUSION_PP_MAKE_LIST_07192005_1239
 #define FUSION_PP_MAKE_LIST_07192005_1239
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/generation/detail/pp_make_map.hpp b/include/boost/fusion/container/generation/detail/pp_make_map.hpp
index ad20cd4d..d55d0b04 100644
--- a/include/boost/fusion/container/generation/detail/pp_make_map.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_make_map.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_PP_MAKE_MAP_07222005_1247)
+#ifndef FUSION_PP_MAKE_MAP_07222005_1247
 #define FUSION_PP_MAKE_MAP_07222005_1247
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/generation/detail/pp_make_set.hpp b/include/boost/fusion/container/generation/detail/pp_make_set.hpp
index f3f9a9e8..4738fe86 100644
--- a/include/boost/fusion/container/generation/detail/pp_make_set.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_make_set.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_MAKE_SET_09162005_1125)
+#ifndef FUSION_MAKE_SET_09162005_1125
 #define FUSION_MAKE_SET_09162005_1125
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/generation/detail/pp_make_vector.hpp b/include/boost/fusion/container/generation/detail/pp_make_vector.hpp
index b19cf354..bb8127a0 100644
--- a/include/boost/fusion/container/generation/detail/pp_make_vector.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_make_vector.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_MAKE_VECTOR_07162005_0243)
+#ifndef FUSION_MAKE_VECTOR_07162005_0243
 #define FUSION_MAKE_VECTOR_07162005_0243
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/generation/detail/pp_map_tie.hpp b/include/boost/fusion/container/generation/detail/pp_map_tie.hpp
index 1a53c919..e37b4b1d 100644
--- a/include/boost/fusion/container/generation/detail/pp_map_tie.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_map_tie.hpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_PP_MAP_TIE_20060814_1116)
+#ifndef FUSION_PP_MAP_TIE_20060814_1116
 #define FUSION_PP_MAP_TIE_20060814_1116
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/generation/detail/pp_vector_tie.hpp b/include/boost/fusion/container/generation/detail/pp_vector_tie.hpp
index 132c38af..f2303651 100644
--- a/include/boost/fusion/container/generation/detail/pp_vector_tie.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_vector_tie.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_VECTOR_TIE_07192005_1242)
+#ifndef FUSION_VECTOR_TIE_07192005_1242
 #define FUSION_VECTOR_TIE_07192005_1242
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/generation/ignore.hpp b/include/boost/fusion/container/generation/ignore.hpp
index 78196632..7875a1d7 100644
--- a/include/boost/fusion/container/generation/ignore.hpp
+++ b/include/boost/fusion/container/generation/ignore.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_IGNORE_07192005_0329)
+#ifndef FUSION_IGNORE_07192005_0329
 #define FUSION_IGNORE_07192005_0329
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/generation/make_cons.hpp b/include/boost/fusion/container/generation/make_cons.hpp
index 616f1105..1652061e 100644
--- a/include/boost/fusion/container/generation/make_cons.hpp
+++ b/include/boost/fusion/container/generation/make_cons.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MAKE_CONS_07172005_0918)
+#ifndef FUSION_MAKE_CONS_07172005_0918
 #define FUSION_MAKE_CONS_07172005_0918
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/generation/make_deque.hpp b/include/boost/fusion/container/generation/make_deque.hpp
index cb802f9a..a53004bb 100644
--- a/include/boost/fusion/container/generation/make_deque.hpp
+++ b/include/boost/fusion/container/generation/make_deque.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MAKE_DEQUE_01272013_1401)
+#ifndef FUSION_MAKE_DEQUE_01272013_1401
 #define FUSION_MAKE_DEQUE_01272013_1401
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/generation/make_map.hpp b/include/boost/fusion/container/generation/make_map.hpp
index a6538f81..59efffe7 100644
--- a/include/boost/fusion/container/generation/make_map.hpp
+++ b/include/boost/fusion/container/generation/make_map.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MAKE_MAP_07222005_1247)
+#ifndef FUSION_MAKE_MAP_07222005_1247
 #define FUSION_MAKE_MAP_07222005_1247
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/generation/map_tie.hpp b/include/boost/fusion/container/generation/map_tie.hpp
index 259eee5f..0d1c31cc 100644
--- a/include/boost/fusion/container/generation/map_tie.hpp
+++ b/include/boost/fusion/container/generation/map_tie.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MAP_TIE_07222005_1247)
+#ifndef FUSION_MAP_TIE_07222005_1247
 #define FUSION_MAP_TIE_07222005_1247
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list.hpp b/include/boost/fusion/container/list.hpp
index e3a1d8ef..fcef211e 100644
--- a/include/boost/fusion/container/list.hpp
+++ b/include/boost/fusion/container/list.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_CLASS_LIST_10022005_0605)
+#ifndef FUSION_SEQUENCE_CLASS_LIST_10022005_0605
 #define FUSION_SEQUENCE_CLASS_LIST_10022005_0605
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/cons.hpp b/include/boost/fusion/container/list/cons.hpp
index dd7f8873..79fa2ec4 100644
--- a/include/boost/fusion/container/list/cons.hpp
+++ b/include/boost/fusion/container/list/cons.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONS_07172005_0843)
+#ifndef FUSION_CONS_07172005_0843
 #define FUSION_CONS_07172005_0843
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/cons_fwd.hpp b/include/boost/fusion/container/list/cons_fwd.hpp
index 547c42ca..e58e99ee 100644
--- a/include/boost/fusion/container/list/cons_fwd.hpp
+++ b/include/boost/fusion/container/list/cons_fwd.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CONS_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_CONS_FWD_HPP_INCLUDED
 #define BOOST_FUSION_CONS_FWD_HPP_INCLUDED
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/container/list/cons_iterator.hpp b/include/boost/fusion/container/list/cons_iterator.hpp
index f6655a70..6ac21e51 100644
--- a/include/boost/fusion/container/list/cons_iterator.hpp
+++ b/include/boost/fusion/container/list/cons_iterator.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONS_ITERATOR_07172005_0849)
+#ifndef FUSION_CONS_ITERATOR_07172005_0849
 #define FUSION_CONS_ITERATOR_07172005_0849
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/convert.hpp b/include/boost/fusion/container/list/convert.hpp
index d85fafeb..d7ed72c6 100644
--- a/include/boost/fusion/container/list/convert.hpp
+++ b/include/boost/fusion/container/list/convert.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_09232005_1215)
+#ifndef FUSION_CONVERT_09232005_1215
 #define FUSION_CONVERT_09232005_1215
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/at_impl.hpp b/include/boost/fusion/container/list/detail/at_impl.hpp
index ab36665c..64128440 100644
--- a/include/boost/fusion/container/list/detail/at_impl.hpp
+++ b/include/boost/fusion/container/list/detail/at_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_AT_IMPL_07172005_0726)
+#ifndef FUSION_AT_IMPL_07172005_0726
 #define FUSION_AT_IMPL_07172005_0726
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/begin_impl.hpp b/include/boost/fusion/container/list/detail/begin_impl.hpp
index 088b382d..29474387 100644
--- a/include/boost/fusion/container/list/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/list/detail/begin_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BEGIN_IMPL_07172005_0824)
+#ifndef FUSION_BEGIN_IMPL_07172005_0824
 #define FUSION_BEGIN_IMPL_07172005_0824
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/build_cons.hpp b/include/boost/fusion/container/list/detail/build_cons.hpp
index 206af1f1..b9576016 100644
--- a/include/boost/fusion/container/list/detail/build_cons.hpp
+++ b/include/boost/fusion/container/list/detail/build_cons.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BUILD_CONS_09232005_1222)
+#ifndef FUSION_BUILD_CONS_09232005_1222
 #define FUSION_BUILD_CONS_09232005_1222
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/convert_impl.hpp b/include/boost/fusion/container/list/detail/convert_impl.hpp
index ff010186..996fd91d 100644
--- a/include/boost/fusion/container/list/detail/convert_impl.hpp
+++ b/include/boost/fusion/container/list/detail/convert_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_IMPL_09232005_1215)
+#ifndef FUSION_CONVERT_IMPL_09232005_1215
 #define FUSION_CONVERT_IMPL_09232005_1215
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/cpp03/limits.hpp b/include/boost/fusion/container/list/detail/cpp03/limits.hpp
index cc64ad72..67405a22 100644
--- a/include/boost/fusion/container/list/detail/cpp03/limits.hpp
+++ b/include/boost/fusion/container/list/detail/cpp03/limits.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_LIST_LIMITS_07172005_0112)
+#ifndef FUSION_LIST_LIMITS_07172005_0112
 #define FUSION_LIST_LIMITS_07172005_0112
 
 #include <boost/fusion/support/detail/pp_round.hpp>
diff --git a/include/boost/fusion/container/list/detail/cpp03/list.hpp b/include/boost/fusion/container/list/detail/cpp03/list.hpp
index 048d59b6..f08e2773 100644
--- a/include/boost/fusion/container/list/detail/cpp03/list.hpp
+++ b/include/boost/fusion/container/list/detail/cpp03/list.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_LIST_07172005_1153)
+#ifndef FUSION_LIST_07172005_1153
 #define FUSION_LIST_07172005_1153
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/cpp03/list_forward_ctor.hpp b/include/boost/fusion/container/list/detail/cpp03/list_forward_ctor.hpp
index f9a70678..00154ffc 100644
--- a/include/boost/fusion/container/list/detail/cpp03/list_forward_ctor.hpp
+++ b/include/boost/fusion/container/list/detail/cpp03/list_forward_ctor.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_LIST_FORWARD_CTOR_07172005_0113)
+#ifndef FUSION_LIST_FORWARD_CTOR_07172005_0113
 #define FUSION_LIST_FORWARD_CTOR_07172005_0113
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/list/detail/cpp03/list_fwd.hpp b/include/boost/fusion/container/list/detail/cpp03/list_fwd.hpp
index cedc7003..7c642c7d 100644
--- a/include/boost/fusion/container/list/detail/cpp03/list_fwd.hpp
+++ b/include/boost/fusion/container/list/detail/cpp03/list_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_LIST_FORWARD_07172005_0224)
+#ifndef FUSION_LIST_FORWARD_07172005_0224
 #define FUSION_LIST_FORWARD_07172005_0224
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/cpp03/list_to_cons.hpp b/include/boost/fusion/container/list/detail/cpp03/list_to_cons.hpp
index 989e91ab..0080c054 100644
--- a/include/boost/fusion/container/list/detail/cpp03/list_to_cons.hpp
+++ b/include/boost/fusion/container/list/detail/cpp03/list_to_cons.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_LIST_TO_CONS_07172005_1041)
+#ifndef FUSION_LIST_TO_CONS_07172005_1041
 #define FUSION_LIST_TO_CONS_07172005_1041
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/cpp03/list_to_cons_call.hpp b/include/boost/fusion/container/list/detail/cpp03/list_to_cons_call.hpp
index e49db4a8..ee0099f1 100644
--- a/include/boost/fusion/container/list/detail/cpp03/list_to_cons_call.hpp
+++ b/include/boost/fusion/container/list/detail/cpp03/list_to_cons_call.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_LIST_TO_CONS_CALL_07192005_0138)
+#ifndef FUSION_LIST_TO_CONS_CALL_07192005_0138
 #define FUSION_LIST_TO_CONS_CALL_07192005_0138
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/list/detail/deref_impl.hpp b/include/boost/fusion/container/list/detail/deref_impl.hpp
index 3358a2a2..62f58903 100644
--- a/include/boost/fusion/container/list/detail/deref_impl.hpp
+++ b/include/boost/fusion/container/list/detail/deref_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DEREF_IMPL_07172005_0831)
+#ifndef FUSION_DEREF_IMPL_07172005_0831
 #define FUSION_DEREF_IMPL_07172005_0831
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/empty_impl.hpp b/include/boost/fusion/container/list/detail/empty_impl.hpp
index e25eab0b..a2da1319 100644
--- a/include/boost/fusion/container/list/detail/empty_impl.hpp
+++ b/include/boost/fusion/container/list/detail/empty_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEQUENCE_EMPTY_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEQUENCE_EMPTY_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_SEQUENCE_EMPTY_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/end_impl.hpp b/include/boost/fusion/container/list/detail/end_impl.hpp
index 6ed05a5f..19fbfc0c 100644
--- a/include/boost/fusion/container/list/detail/end_impl.hpp
+++ b/include/boost/fusion/container/list/detail/end_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_END_IMPL_07172005_0828)
+#ifndef FUSION_END_IMPL_07172005_0828
 #define FUSION_END_IMPL_07172005_0828
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/equal_to_impl.hpp b/include/boost/fusion/container/list/detail/equal_to_impl.hpp
index a0fc297f..ad5881ff 100644
--- a/include/boost/fusion/container/list/detail/equal_to_impl.hpp
+++ b/include/boost/fusion/container/list/detail/equal_to_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_EQUAL_TO_IMPL_09172005_1120)
+#ifndef FUSION_EQUAL_TO_IMPL_09172005_1120
 #define FUSION_EQUAL_TO_IMPL_09172005_1120
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/next_impl.hpp b/include/boost/fusion/container/list/detail/next_impl.hpp
index f766458b..b9fdeb40 100644
--- a/include/boost/fusion/container/list/detail/next_impl.hpp
+++ b/include/boost/fusion/container/list/detail/next_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NEXT_IMPL_07172005_0836)
+#ifndef FUSION_NEXT_IMPL_07172005_0836
 #define FUSION_NEXT_IMPL_07172005_0836
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/reverse_cons.hpp b/include/boost/fusion/container/list/detail/reverse_cons.hpp
index 14905180..88fb8001 100644
--- a/include/boost/fusion/container/list/detail/reverse_cons.hpp
+++ b/include/boost/fusion/container/list/detail/reverse_cons.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_REVERSE_CONS_HPP_INCLUDED)
+#ifndef BOOST_FUSION_REVERSE_CONS_HPP_INCLUDED
 #define BOOST_FUSION_REVERSE_CONS_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/value_at_impl.hpp b/include/boost/fusion/container/list/detail/value_at_impl.hpp
index 8b288a12..5c280343 100644
--- a/include/boost/fusion/container/list/detail/value_at_impl.hpp
+++ b/include/boost/fusion/container/list/detail/value_at_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_AT_IMPL_07172005_0952)
+#ifndef FUSION_VALUE_AT_IMPL_07172005_0952
 #define FUSION_VALUE_AT_IMPL_07172005_0952
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/list/detail/value_of_impl.hpp b/include/boost/fusion/container/list/detail/value_of_impl.hpp
index 9e7aa208..7e26b6a3 100644
--- a/include/boost/fusion/container/list/detail/value_of_impl.hpp
+++ b/include/boost/fusion/container/list/detail/value_of_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_OF_IMPL_07172005_0838)
+#ifndef FUSION_VALUE_OF_IMPL_07172005_0838
 #define FUSION_VALUE_OF_IMPL_07172005_0838
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/container/list/nil.hpp b/include/boost/fusion/container/list/nil.hpp
index 1b2c2349..5999751f 100644
--- a/include/boost/fusion/container/list/nil.hpp
+++ b/include/boost/fusion/container/list/nil.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NIL_04232014_0843)
+#ifndef FUSION_NIL_04232014_0843
 #define FUSION_NIL_04232014_0843
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map.hpp b/include/boost/fusion/container/map.hpp
index 95998898..f1084d90 100644
--- a/include/boost/fusion/container/map.hpp
+++ b/include/boost/fusion/container/map.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_CLASS_MAP_10022005_0606)
+#ifndef FUSION_SEQUENCE_CLASS_MAP_10022005_0606
 #define FUSION_SEQUENCE_CLASS_MAP_10022005_0606
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/convert.hpp b/include/boost/fusion/container/map/convert.hpp
index 10431c84..9938466d 100644
--- a/include/boost/fusion/container/map/convert.hpp
+++ b/include/boost/fusion/container/map/convert.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_MAIN_09232005_1340)
+#ifndef FUSION_CONVERT_MAIN_09232005_1340
 #define FUSION_CONVERT_MAIN_09232005_1340
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/at_impl.hpp b/include/boost/fusion/container/map/detail/at_impl.hpp
index ab35870f..5fd395ae 100644
--- a/include/boost/fusion/container/map/detail/at_impl.hpp
+++ b/include/boost/fusion/container/map/detail/at_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MAP_DETAIL_AT_IMPL_02042013_0821)
+#ifndef BOOST_FUSION_MAP_DETAIL_AT_IMPL_02042013_0821
 #define BOOST_FUSION_MAP_DETAIL_AT_IMPL_02042013_0821
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/at_key_impl.hpp b/include/boost/fusion/container/map/detail/at_key_impl.hpp
index a546bd00..2a300f86 100644
--- a/include/boost/fusion/container/map/detail/at_key_impl.hpp
+++ b/include/boost/fusion/container/map/detail/at_key_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MAP_DETAIL_AT_KEY_IMPL_02042013_0821)
+#ifndef BOOST_FUSION_MAP_DETAIL_AT_KEY_IMPL_02042013_0821
 #define BOOST_FUSION_MAP_DETAIL_AT_KEY_IMPL_02042013_0821
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/begin_impl.hpp b/include/boost/fusion/container/map/detail/begin_impl.hpp
index 65b39d1f..d2620df8 100644
--- a/include/boost/fusion/container/map/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/map/detail/begin_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MAP_BEGIN_IMPL_02042013_0857)
+#ifndef BOOST_FUSION_MAP_BEGIN_IMPL_02042013_0857
 #define BOOST_FUSION_MAP_BEGIN_IMPL_02042013_0857
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/build_map.hpp b/include/boost/fusion/container/map/detail/build_map.hpp
index d8f3f33f..ee74cffc 100644
--- a/include/boost/fusion/container/map/detail/build_map.hpp
+++ b/include/boost/fusion/container/map/detail/build_map.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BUILD_MAP_02042013_1448)
+#ifndef BOOST_FUSION_BUILD_MAP_02042013_1448
 #define BOOST_FUSION_BUILD_MAP_02042013_1448
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/cpp03/as_map.hpp b/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
index 442c350c..f345d23f 100644
--- a/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_AS_MAP_0932005_1339)
+#ifndef FUSION_AS_MAP_0932005_1339
 #define FUSION_AS_MAP_0932005_1339
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/map/detail/cpp03/at_impl.hpp b/include/boost/fusion/container/map/detail/cpp03/at_impl.hpp
index b1044d7d..88a3dda6 100644
--- a/include/boost/fusion/container/map/detail/cpp03/at_impl.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MAP_DETAIL_AT_IMPL_HPP)
+#ifndef BOOST_FUSION_MAP_DETAIL_AT_IMPL_HPP
 #define BOOST_FUSION_MAP_DETAIL_AT_IMPL_HPP
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/cpp03/convert.hpp b/include/boost/fusion/container/map/detail/cpp03/convert.hpp
index c5cc3bd6..f08a7ed8 100644
--- a/include/boost/fusion/container/map/detail/cpp03/convert.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/convert.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_09232005_1340)
+#ifndef FUSION_CONVERT_09232005_1340
 #define FUSION_CONVERT_09232005_1340
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/cpp03/convert_impl.hpp b/include/boost/fusion/container/map/detail/cpp03/convert_impl.hpp
index 3a773d74..a6d23d42 100644
--- a/include/boost/fusion/container/map/detail/cpp03/convert_impl.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/convert_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_IMPL_09232005_1340)
+#ifndef FUSION_CONVERT_IMPL_09232005_1340
 #define FUSION_CONVERT_IMPL_09232005_1340
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/cpp03/limits.hpp b/include/boost/fusion/container/map/detail/cpp03/limits.hpp
index 1eaa528c..9b558013 100644
--- a/include/boost/fusion/container/map/detail/cpp03/limits.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/limits.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MAP_LIMITS_07212005_1104)
+#ifndef FUSION_MAP_LIMITS_07212005_1104
 #define FUSION_MAP_LIMITS_07212005_1104
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/cpp03/map.hpp b/include/boost/fusion/container/map/detail/cpp03/map.hpp
index 3ff1d05d..8c11e22e 100644
--- a/include/boost/fusion/container/map/detail/cpp03/map.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/map.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MAP_07212005_1106)
+#ifndef FUSION_MAP_07212005_1106
 #define FUSION_MAP_07212005_1106
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp b/include/boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp
index 18864e87..8e42e53c 100644
--- a/include/boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/map_forward_ctor.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_MAP_FORWARD_CTOR_07222005_0106)
+#ifndef FUSION_MAP_FORWARD_CTOR_07222005_0106
 #define FUSION_MAP_FORWARD_CTOR_07222005_0106
 
 #define FUSION_FORWARD_CTOR_FORWARD(z, n, _)    BOOST_FUSION_FWD_ELEM(U##n, _##n)
diff --git a/include/boost/fusion/container/map/detail/cpp03/map_fwd.hpp b/include/boost/fusion/container/map/detail/cpp03/map_fwd.hpp
index cf26fddd..90f537a9 100644
--- a/include/boost/fusion/container/map/detail/cpp03/map_fwd.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/map_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MAP_FORWARD_07212005_1105)
+#ifndef FUSION_MAP_FORWARD_07212005_1105
 #define FUSION_MAP_FORWARD_07212005_1105
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/cpp03/value_at_impl.hpp b/include/boost/fusion/container/map/detail/cpp03/value_at_impl.hpp
index 2af55396..4915a5cf 100644
--- a/include/boost/fusion/container/map/detail/cpp03/value_at_impl.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/value_at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MAP_DETAIL_VALUE_AT_IMPL_HPP)
+#ifndef BOOST_FUSION_MAP_DETAIL_VALUE_AT_IMPL_HPP
 #define BOOST_FUSION_MAP_DETAIL_VALUE_AT_IMPL_HPP
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/end_impl.hpp b/include/boost/fusion/container/map/detail/end_impl.hpp
index 50dec8ef..8378d817 100644
--- a/include/boost/fusion/container/map/detail/end_impl.hpp
+++ b/include/boost/fusion/container/map/detail/end_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MAP_END_IMPL_02042013_0857)
+#ifndef BOOST_FUSION_MAP_END_IMPL_02042013_0857
 #define BOOST_FUSION_MAP_END_IMPL_02042013_0857
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/map_impl.hpp b/include/boost/fusion/container/map/detail/map_impl.hpp
index 360c5d09..0e85901b 100644
--- a/include/boost/fusion/container/map/detail/map_impl.hpp
+++ b/include/boost/fusion/container/map/detail/map_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MAP_IMPL_02032013_2233)
+#ifndef BOOST_FUSION_MAP_IMPL_02032013_2233
 #define BOOST_FUSION_MAP_IMPL_02032013_2233
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/map_index.hpp b/include/boost/fusion/container/map/detail/map_index.hpp
index 9326cded..b6eafad3 100644
--- a/include/boost/fusion/container/map/detail/map_index.hpp
+++ b/include/boost/fusion/container/map/detail/map_index.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MAP_INDEX_02032013_2233)
+#ifndef BOOST_FUSION_MAP_INDEX_02032013_2233
 #define BOOST_FUSION_MAP_INDEX_02032013_2233
 
 namespace boost { namespace fusion { namespace detail
diff --git a/include/boost/fusion/container/map/detail/value_at_impl.hpp b/include/boost/fusion/container/map/detail/value_at_impl.hpp
index c51cc125..c1a9b04e 100644
--- a/include/boost/fusion/container/map/detail/value_at_impl.hpp
+++ b/include/boost/fusion/container/map/detail/value_at_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MAP_DETAIL_VALUE_AT_IMPL_02042013_0821)
+#ifndef BOOST_FUSION_MAP_DETAIL_VALUE_AT_IMPL_02042013_0821
 #define BOOST_FUSION_MAP_DETAIL_VALUE_AT_IMPL_02042013_0821
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/detail/value_at_key_impl.hpp b/include/boost/fusion/container/map/detail/value_at_key_impl.hpp
index d53a8f02..09cb343a 100644
--- a/include/boost/fusion/container/map/detail/value_at_key_impl.hpp
+++ b/include/boost/fusion/container/map/detail/value_at_key_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MAP_DETAIL_VALUE_AT_KEY_IMPL_02042013_0821)
+#ifndef BOOST_FUSION_MAP_DETAIL_VALUE_AT_KEY_IMPL_02042013_0821
 #define BOOST_FUSION_MAP_DETAIL_VALUE_AT_KEY_IMPL_02042013_0821
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/map.hpp b/include/boost/fusion/container/map/map.hpp
index 6704dbe4..45673a5f 100644
--- a/include/boost/fusion/container/map/map.hpp
+++ b/include/boost/fusion/container/map/map.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MAP_MAIN_07212005_1106)
+#ifndef FUSION_MAP_MAIN_07212005_1106
 #define FUSION_MAP_MAIN_07212005_1106
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/map_fwd.hpp b/include/boost/fusion/container/map/map_fwd.hpp
index 614ea249..ca41e97c 100644
--- a/include/boost/fusion/container/map/map_fwd.hpp
+++ b/include/boost/fusion/container/map/map_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MAP_FORWARD_MAIN_07212005_1105)
+#ifndef FUSION_MAP_FORWARD_MAIN_07212005_1105
 #define FUSION_MAP_FORWARD_MAIN_07212005_1105
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/map/map_iterator.hpp b/include/boost/fusion/container/map/map_iterator.hpp
index 3ae0decd..1ef86a7b 100644
--- a/include/boost/fusion/container/map/map_iterator.hpp
+++ b/include/boost/fusion/container/map/map_iterator.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MAP_ITERATOR_02042013_0835)
+#ifndef BOOST_FUSION_MAP_ITERATOR_02042013_0835
 #define BOOST_FUSION_MAP_ITERATOR_02042013_0835
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/set.hpp b/include/boost/fusion/container/set.hpp
index c9aa6241..1dcc8f2f 100644
--- a/include/boost/fusion/container/set.hpp
+++ b/include/boost/fusion/container/set.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_CLASS_SET_10022005_0607)
+#ifndef FUSION_SEQUENCE_CLASS_SET_10022005_0607
 #define FUSION_SEQUENCE_CLASS_SET_10022005_0607
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/set/convert.hpp b/include/boost/fusion/container/set/convert.hpp
index 81e064cd..09f78a6c 100644
--- a/include/boost/fusion/container/set/convert.hpp
+++ b/include/boost/fusion/container/set/convert.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_09232005_1341)
+#ifndef FUSION_CONVERT_09232005_1341
 #define FUSION_CONVERT_09232005_1341
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/set/detail/convert_impl.hpp b/include/boost/fusion/container/set/detail/convert_impl.hpp
index 0b4cb22f..47592f83 100644
--- a/include/boost/fusion/container/set/detail/convert_impl.hpp
+++ b/include/boost/fusion/container/set/detail/convert_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_IMPL_09232005_1341)
+#ifndef FUSION_CONVERT_IMPL_09232005_1341
 #define FUSION_CONVERT_IMPL_09232005_1341
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/set/detail/cpp03/as_set.hpp b/include/boost/fusion/container/set/detail/cpp03/as_set.hpp
index ec73a158..9d10b7f7 100644
--- a/include/boost/fusion/container/set/detail/cpp03/as_set.hpp
+++ b/include/boost/fusion/container/set/detail/cpp03/as_set.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_AS_SET_0932005_1341)
+#ifndef FUSION_AS_SET_0932005_1341
 #define FUSION_AS_SET_0932005_1341
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/set/detail/cpp03/limits.hpp b/include/boost/fusion/container/set/detail/cpp03/limits.hpp
index 2b800abf..f5778a4f 100644
--- a/include/boost/fusion/container/set/detail/cpp03/limits.hpp
+++ b/include/boost/fusion/container/set/detail/cpp03/limits.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SET_LIMITS_09162005_1103)
+#ifndef FUSION_SET_LIMITS_09162005_1103
 #define FUSION_SET_LIMITS_09162005_1103
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/set/detail/cpp03/set.hpp b/include/boost/fusion/container/set/detail/cpp03/set.hpp
index 274a36eb..4f264c42 100644
--- a/include/boost/fusion/container/set/detail/cpp03/set.hpp
+++ b/include/boost/fusion/container/set/detail/cpp03/set.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SET_09162005_1104)
+#ifndef FUSION_SET_09162005_1104
 #define FUSION_SET_09162005_1104
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/set/detail/cpp03/set_forward_ctor.hpp b/include/boost/fusion/container/set/detail/cpp03/set_forward_ctor.hpp
index aa90b601..396ec457 100644
--- a/include/boost/fusion/container/set/detail/cpp03/set_forward_ctor.hpp
+++ b/include/boost/fusion/container/set/detail/cpp03/set_forward_ctor.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_SET_FORWARD_CTOR_09162005_1115)
+#ifndef FUSION_SET_FORWARD_CTOR_09162005_1115
 #define FUSION_SET_FORWARD_CTOR_09162005_1115
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/set/detail/cpp03/set_fwd.hpp b/include/boost/fusion/container/set/detail/cpp03/set_fwd.hpp
index f50f6083..da6773ae 100644
--- a/include/boost/fusion/container/set/detail/cpp03/set_fwd.hpp
+++ b/include/boost/fusion/container/set/detail/cpp03/set_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SET_FORWARD_09162005_1102)
+#ifndef FUSION_SET_FORWARD_09162005_1102
 #define FUSION_SET_FORWARD_09162005_1102
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector.hpp b/include/boost/fusion/container/vector.hpp
index 41c98033..36e864d5 100644
--- a/include/boost/fusion/container/vector.hpp
+++ b/include/boost/fusion/container/vector.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602)
+#ifndef FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602
 #define FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/convert.hpp b/include/boost/fusion/container/vector/convert.hpp
index adc7f478..1de86118 100644
--- a/include/boost/fusion/container/vector/convert.hpp
+++ b/include/boost/fusion/container/vector/convert.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_09222005_1104)
+#ifndef FUSION_CONVERT_09222005_1104
 #define FUSION_CONVERT_09222005_1104
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/advance_impl.hpp b/include/boost/fusion/container/vector/detail/advance_impl.hpp
index 3bf26a59..a1a6ef58 100644
--- a/include/boost/fusion/container/vector/detail/advance_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/advance_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ADVANCE_IMPL_09172005_1156)
+#ifndef FUSION_ADVANCE_IMPL_09172005_1156
 #define FUSION_ADVANCE_IMPL_09172005_1156
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/container/vector/detail/at_impl.hpp b/include/boost/fusion/container/vector/detail/at_impl.hpp
index a2900d79..2bc80f7d 100644
--- a/include/boost/fusion/container/vector/detail/at_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/at_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_AT_IMPL_05042005_0741)
+#ifndef FUSION_AT_IMPL_05042005_0741
 #define FUSION_AT_IMPL_05042005_0741
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/begin_impl.hpp b/include/boost/fusion/container/vector/detail/begin_impl.hpp
index ef24cd74..96812c5d 100644
--- a/include/boost/fusion/container/vector/detail/begin_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/begin_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BEGIN_IMPL_05042005_1136)
+#ifndef FUSION_BEGIN_IMPL_05042005_1136
 #define FUSION_BEGIN_IMPL_05042005_1136
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/convert_impl.hpp b/include/boost/fusion/container/vector/detail/convert_impl.hpp
index 63bfb7c7..bbfa3fc9 100644
--- a/include/boost/fusion/container/vector/detail/convert_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/convert_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_IMPL_09222005_1104)
+#ifndef FUSION_CONVERT_IMPL_09222005_1104
 #define FUSION_CONVERT_IMPL_09222005_1104
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/as_vector.hpp b/include/boost/fusion/container/vector/detail/cpp03/as_vector.hpp
index 471f7840..16aaf214 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/as_vector.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/as_vector.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_AS_VECTOR_09222005_0950)
+#ifndef FUSION_AS_VECTOR_09222005_0950
 #define FUSION_AS_VECTOR_09222005_0950
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/limits.hpp b/include/boost/fusion/container/vector/detail/cpp03/limits.hpp
index 74a05102..5dbf349b 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/limits.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/limits.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VECTOR_LIMITS_07072005_1246)
+#ifndef FUSION_VECTOR_LIMITS_07072005_1246
 #define FUSION_VECTOR_LIMITS_07072005_1246
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/value_at_impl.hpp b/include/boost/fusion/container/vector/detail/cpp03/value_at_impl.hpp
index 44feb600..44f35165 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/value_at_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/value_at_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_AT_IMPL_05052005_0232)
+#ifndef FUSION_VALUE_AT_IMPL_05052005_0232
 #define FUSION_VALUE_AT_IMPL_05052005_0232
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector.hpp
index f5c3024e..71a837f7 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VECTOR_07072005_1244)
+#ifndef FUSION_VECTOR_07072005_1244
 #define FUSION_VECTOR_07072005_1244
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector10.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector10.hpp
index 58a31dde..e1ed8cf9 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector10.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector10.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VECTOR10_05042005_0257)
+#ifndef FUSION_VECTOR10_05042005_0257
 #define FUSION_VECTOR10_05042005_0257
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector10_fwd.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector10_fwd.hpp
index d221faec..bf812e5f 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector10_fwd.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector10_fwd.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VECTOR10_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_VECTOR10_FWD_HPP_INCLUDED
 #define BOOST_FUSION_VECTOR10_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector20.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector20.hpp
index 89f644c5..ca79e8bb 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector20.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector20.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VECTOR20_05052005_0205)
+#ifndef FUSION_VECTOR20_05052005_0205
 #define FUSION_VECTOR20_05052005_0205
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector20_fwd.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector20_fwd.hpp
index e69b59f4..388f62d1 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector20_fwd.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector20_fwd.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VECTOR20_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_VECTOR20_FWD_HPP_INCLUDED
 #define BOOST_FUSION_VECTOR20_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector30.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector30.hpp
index ad838c9a..2f818dc8 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector30.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector30.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VECTOR30_05052005_0206)
+#ifndef FUSION_VECTOR30_05052005_0206
 #define FUSION_VECTOR30_05052005_0206
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector30_fwd.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector30_fwd.hpp
index e799b096..3261724e 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector30_fwd.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector30_fwd.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VECTOR30_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_VECTOR30_FWD_HPP_INCLUDED
 #define BOOST_FUSION_VECTOR30_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector40.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector40.hpp
index 10770907..7a64b8af 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector40.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector40.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VECTOR40_05052005_0208)
+#ifndef FUSION_VECTOR40_05052005_0208
 #define FUSION_VECTOR40_05052005_0208
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector40_fwd.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector40_fwd.hpp
index 790dd761..cce01ed3 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector40_fwd.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector40_fwd.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VECTOR40_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_VECTOR40_FWD_HPP_INCLUDED
 #define BOOST_FUSION_VECTOR40_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector50.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector50.hpp
index 6c0b48bb..76b88462 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector50.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector50.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VECTOR50_05052005_0207)
+#ifndef FUSION_VECTOR50_05052005_0207
 #define FUSION_VECTOR50_05052005_0207
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector50_fwd.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector50_fwd.hpp
index 4ec5e281..535cbafe 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector50_fwd.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector50_fwd.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VECTOR50_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_VECTOR50_FWD_HPP_INCLUDED
 #define BOOST_FUSION_VECTOR50_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector_forward_ctor.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector_forward_ctor.hpp
index 3422e4b9..2cc64560 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector_forward_ctor.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector_forward_ctor.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_VECTOR_FORWARD_CTOR_07122005_1123)
+#ifndef FUSION_VECTOR_FORWARD_CTOR_07122005_1123
 #define FUSION_VECTOR_FORWARD_CTOR_07122005_1123
 
 #define FUSION_FORWARD_CTOR_FORWARD(z, n, _)    BOOST_FUSION_FWD_ELEM(U##n, _##n)
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector_fwd.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector_fwd.hpp
index f894b1a6..889bc588 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector_fwd.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector_fwd.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VECTOR_FORWARD_07072005_0125)
+#ifndef FUSION_VECTOR_FORWARD_07072005_0125
 #define FUSION_VECTOR_FORWARD_07072005_0125
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector_n.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector_n.hpp
index 932ce36c..f29a2af7 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector_n.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector_n.hpp
@@ -6,7 +6,7 @@
 ==============================================================================*/
 // No include guard. This file is meant to be included many times
 
-#if !defined(FUSION_MACRO_05042005)
+#ifndef FUSION_MACRO_05042005
 #define FUSION_MACRO_05042005
 
 #define FUSION_VECTOR_CTOR_DEFAULT_INIT(z, n, _)                                \
diff --git a/include/boost/fusion/container/vector/detail/cpp03/vector_n_chooser.hpp b/include/boost/fusion/container/vector/detail/cpp03/vector_n_chooser.hpp
index 002889ce..6d8950e6 100644
--- a/include/boost/fusion/container/vector/detail/cpp03/vector_n_chooser.hpp
+++ b/include/boost/fusion/container/vector/detail/cpp03/vector_n_chooser.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_VECTOR_N_CHOOSER_07072005_1248)
+#ifndef FUSION_VECTOR_N_CHOOSER_07072005_1248
 #define FUSION_VECTOR_N_CHOOSER_07072005_1248
 
 #include <boost/fusion/container/vector/detail/cpp03/limits.hpp>
diff --git a/include/boost/fusion/container/vector/detail/deref_impl.hpp b/include/boost/fusion/container/vector/detail/deref_impl.hpp
index c85bb82b..20d84985 100644
--- a/include/boost/fusion/container/vector/detail/deref_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/deref_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DEREF_IMPL_05042005_1037)
+#ifndef FUSION_DEREF_IMPL_05042005_1037
 #define FUSION_DEREF_IMPL_05042005_1037
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/distance_impl.hpp b/include/boost/fusion/container/vector/detail/distance_impl.hpp
index 4c2a1226..52870231 100644
--- a/include/boost/fusion/container/vector/detail/distance_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/distance_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DISTANCE_IMPL_09172005_0751)
+#ifndef FUSION_DISTANCE_IMPL_09172005_0751
 #define FUSION_DISTANCE_IMPL_09172005_0751
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/end_impl.hpp b/include/boost/fusion/container/vector/detail/end_impl.hpp
index a77ef644..cbca9793 100644
--- a/include/boost/fusion/container/vector/detail/end_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/end_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_END_IMPL_05042005_1142)
+#ifndef FUSION_END_IMPL_05042005_1142
 #define FUSION_END_IMPL_05042005_1142
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/equal_to_impl.hpp b/include/boost/fusion/container/vector/detail/equal_to_impl.hpp
index 18b3e4a3..5df812ae 100644
--- a/include/boost/fusion/container/vector/detail/equal_to_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/equal_to_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_EQUAL_TO_IMPL_05052005_1215)
+#ifndef FUSION_EQUAL_TO_IMPL_05052005_1215
 #define FUSION_EQUAL_TO_IMPL_05052005_1215
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/next_impl.hpp b/include/boost/fusion/container/vector/detail/next_impl.hpp
index 28408205..18d9a2da 100644
--- a/include/boost/fusion/container/vector/detail/next_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/next_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NEXT_IMPL_05042005_1058)
+#ifndef FUSION_NEXT_IMPL_05042005_1058
 #define FUSION_NEXT_IMPL_05042005_1058
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/prior_impl.hpp b/include/boost/fusion/container/vector/detail/prior_impl.hpp
index 4d040d39..16b55887 100644
--- a/include/boost/fusion/container/vector/detail/prior_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/prior_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_PRIOR_IMPL_05042005_1145)
+#ifndef FUSION_PRIOR_IMPL_05042005_1145
 #define FUSION_PRIOR_IMPL_05042005_1145
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/detail/value_of_impl.hpp b/include/boost/fusion/container/vector/detail/value_of_impl.hpp
index d67ab3fc..2477e05b 100644
--- a/include/boost/fusion/container/vector/detail/value_of_impl.hpp
+++ b/include/boost/fusion/container/vector/detail/value_of_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_OF_IMPL_05052005_1128)
+#ifndef FUSION_VALUE_OF_IMPL_05052005_1128
 #define FUSION_VALUE_OF_IMPL_05052005_1128
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/container/vector/vector_iterator.hpp b/include/boost/fusion/container/vector/vector_iterator.hpp
index 62219766..83af503e 100644
--- a/include/boost/fusion/container/vector/vector_iterator.hpp
+++ b/include/boost/fusion/container/vector/vector_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VECTOR_ITERATOR_05042005_0635)
+#ifndef FUSION_VECTOR_ITERATOR_05042005_0635
 #define FUSION_VECTOR_ITERATOR_05042005_0635
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional.hpp b/include/boost/fusion/functional.hpp
index 56b25cff..a6dc1d93 100644
--- a/include/boost/fusion/functional.hpp
+++ b/include/boost/fusion/functional.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional/adapter.hpp b/include/boost/fusion/functional/adapter.hpp
index a4ddc7a3..3df641d5 100644
--- a/include/boost/fusion/functional/adapter.hpp
+++ b/include/boost/fusion/functional/adapter.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_ADAPTER_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_ADAPTER_HPP_INCLUDED
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/functional/adapter/fused.hpp>
diff --git a/include/boost/fusion/functional/adapter/detail/access.hpp b/include/boost/fusion/functional/adapter/detail/access.hpp
index ee03ffd0..429a6f34 100644
--- a/include/boost/fusion/functional/adapter/detail/access.hpp
+++ b/include/boost/fusion/functional/adapter/detail/access.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_DETAIL_ACCESS_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_ADAPTER_DETAIL_ACCESS_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_ADAPTER_DETAIL_ACCESS_HPP_INCLUDED
 
 namespace boost { namespace fusion { namespace detail
diff --git a/include/boost/fusion/functional/adapter/fused.hpp b/include/boost/fusion/functional/adapter/fused.hpp
index c27d0acc..e853ea29 100644
--- a/include/boost/fusion/functional/adapter/fused.hpp
+++ b/include/boost/fusion/functional/adapter/fused.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional/adapter/fused_function_object.hpp b/include/boost/fusion/functional/adapter/fused_function_object.hpp
index cdb9c24b..f0f63f5f 100644
--- a/include/boost/fusion/functional/adapter/fused_function_object.hpp
+++ b/include/boost/fusion/functional/adapter/fused_function_object.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_FUNCTION_OBJECT_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_FUNCTION_OBJECT_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_FUNCTION_OBJECT_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional/adapter/fused_procedure.hpp b/include/boost/fusion/functional/adapter/fused_procedure.hpp
index 79be2176..27a90c02 100644
--- a/include/boost/fusion/functional/adapter/fused_procedure.hpp
+++ b/include/boost/fusion/functional/adapter/fused_procedure.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_PROCEDURE_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_PROCEDURE_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_ADAPTER_FUSED_PROCEDURE_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional/adapter/limits.hpp b/include/boost/fusion/functional/adapter/limits.hpp
index 9fb5a2a2..5e75788e 100644
--- a/include/boost/fusion/functional/adapter/limits.hpp
+++ b/include/boost/fusion/functional/adapter/limits.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_LIMITS_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_ADAPTER_LIMITS_HPP_INCLUDED
 #   define BOOST_FUSION_FUNCTIONAL_ADAPTER_LIMITS_HPP_INCLUDED
 
 #   include <boost/fusion/container/vector/detail/config.hpp>
diff --git a/include/boost/fusion/functional/adapter/unfused.hpp b/include/boost/fusion/functional/adapter/unfused.hpp
index 9d85869d..ac1dfe55 100644
--- a/include/boost/fusion/functional/adapter/unfused.hpp
+++ b/include/boost/fusion/functional/adapter/unfused.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_UNFUSED_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_ADAPTER_UNFUSED_HPP_INCLUDED
 #if !defined(BOOST_PP_IS_ITERATING)
 
 #include <boost/preprocessor/cat.hpp>
diff --git a/include/boost/fusion/functional/adapter/unfused_typed.hpp b/include/boost/fusion/functional/adapter/unfused_typed.hpp
index 23faf153..3d94e8d9 100644
--- a/include/boost/fusion/functional/adapter/unfused_typed.hpp
+++ b/include/boost/fusion/functional/adapter/unfused_typed.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_UNFUSED_TYPED_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_ADAPTER_UNFUSED_TYPED_HPP_INCLUDED
 #if !defined(BOOST_PP_IS_ITERATING)
 
 #include <boost/preprocessor/cat.hpp>
diff --git a/include/boost/fusion/functional/generation.hpp b/include/boost/fusion/functional/generation.hpp
index b97fd6c0..0e3a700e 100644
--- a/include/boost/fusion/functional/generation.hpp
+++ b/include/boost/fusion/functional/generation.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_GENERATION_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_GENERATION_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_GENERATION_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional/generation/make_fused.hpp b/include/boost/fusion/functional/generation/make_fused.hpp
index 13ed807e..fdb9d0c4 100644
--- a/include/boost/fusion/functional/generation/make_fused.hpp
+++ b/include/boost/fusion/functional/generation/make_fused.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_FUSED_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_FUSED_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_FUSED_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional/generation/make_fused_function_object.hpp b/include/boost/fusion/functional/generation/make_fused_function_object.hpp
index f3169e6e..0c4de861 100644
--- a/include/boost/fusion/functional/generation/make_fused_function_object.hpp
+++ b/include/boost/fusion/functional/generation/make_fused_function_object.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_FUSED_FUNCTION_OBJECT_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_FUSED_FUNCTION_OBJECT_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_FUSED_FUNCTION_OBJECT_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional/generation/make_fused_procedure.hpp b/include/boost/fusion/functional/generation/make_fused_procedure.hpp
index f8ca1254..37634c5c 100644
--- a/include/boost/fusion/functional/generation/make_fused_procedure.hpp
+++ b/include/boost/fusion/functional/generation/make_fused_procedure.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_FUSED_PROCEDURE_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_FUSED_PROCEDURE_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_FUSED_PROCEDURE_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional/generation/make_unfused.hpp b/include/boost/fusion/functional/generation/make_unfused.hpp
index 6e7f9e00..7c3885ae 100644
--- a/include/boost/fusion/functional/generation/make_unfused.hpp
+++ b/include/boost/fusion/functional/generation/make_unfused.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_UNFUSED_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_UNFUSED_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_GENERATION_MAKE_UNFUSED_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional/invocation.hpp b/include/boost/fusion/functional/invocation.hpp
index fe881bfb..8c6f271b 100644
--- a/include/boost/fusion/functional/invocation.hpp
+++ b/include/boost/fusion/functional/invocation.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_INVOCATION_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_INVOCATION_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_INVOCATION_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional/invocation/detail/that_ptr.hpp b/include/boost/fusion/functional/invocation/detail/that_ptr.hpp
index 5ffc3439..e6f99ce6 100644
--- a/include/boost/fusion/functional/invocation/detail/that_ptr.hpp
+++ b/include/boost/fusion/functional/invocation/detail/that_ptr.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_INVOCATION_DETAIL_THAT_PTR_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_INVOCATION_DETAIL_THAT_PTR_HPP_INCLUDED
 #define BOOST_FUSION_FUNCTIONAL_INVOCATION_DETAIL_THAT_PTR_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/functional/invocation/invoke.hpp b/include/boost/fusion/functional/invocation/invoke.hpp
index 09f3ead8..f1b50e3c 100644
--- a/include/boost/fusion/functional/invocation/invoke.hpp
+++ b/include/boost/fusion/functional/invocation/invoke.hpp
@@ -7,7 +7,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_INVOCATION_INVOKE_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_INVOCATION_INVOKE_HPP_INCLUDED
 #if !defined(BOOST_PP_IS_ITERATING)
 
 #include <boost/preprocessor/cat.hpp>
diff --git a/include/boost/fusion/functional/invocation/invoke_function_object.hpp b/include/boost/fusion/functional/invocation/invoke_function_object.hpp
index 2a88eaec..61c29c74 100644
--- a/include/boost/fusion/functional/invocation/invoke_function_object.hpp
+++ b/include/boost/fusion/functional/invocation/invoke_function_object.hpp
@@ -7,7 +7,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_INVOCATION_INVOKE_FUNCTION_OBJECT_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_INVOCATION_INVOKE_FUNCTION_OBJECT_HPP_INCLUDED
 #if !defined(BOOST_PP_IS_ITERATING)
 
 #include <boost/preprocessor/cat.hpp>
diff --git a/include/boost/fusion/functional/invocation/invoke_procedure.hpp b/include/boost/fusion/functional/invocation/invoke_procedure.hpp
index 971ddbfd..d5a57d79 100644
--- a/include/boost/fusion/functional/invocation/invoke_procedure.hpp
+++ b/include/boost/fusion/functional/invocation/invoke_procedure.hpp
@@ -7,7 +7,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_INVOCATION_INVOKE_PROCEDURE_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_INVOCATION_INVOKE_PROCEDURE_HPP_INCLUDED
 #if !defined(BOOST_PP_IS_ITERATING)
 
 #include <boost/preprocessor/cat.hpp>
diff --git a/include/boost/fusion/functional/invocation/limits.hpp b/include/boost/fusion/functional/invocation/limits.hpp
index 9cb5a04a..709098e8 100644
--- a/include/boost/fusion/functional/invocation/limits.hpp
+++ b/include/boost/fusion/functional/invocation/limits.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_FUNCTIONAL_INVOCATION_LIMITS_HPP_INCLUDED)
+#ifndef BOOST_FUSION_FUNCTIONAL_INVOCATION_LIMITS_HPP_INCLUDED
 #   define BOOST_FUSION_FUNCTIONAL_INVOCATION_LIMITS_HPP_INCLUDED
 
 #   if !defined(BOOST_FUSION_INVOKE_MAX_ARITY)
diff --git a/include/boost/fusion/include/accumulate.hpp b/include/boost/fusion/include/accumulate.hpp
index b2cbc189..f327b620 100644
--- a/include/boost/fusion/include/accumulate.hpp
+++ b/include/boost/fusion/include/accumulate.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ACCUMULATE)
+#ifndef FUSION_INCLUDE_ACCUMULATE
 #define FUSION_INCLUDE_ACCUMULATE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/adapted.hpp b/include/boost/fusion/include/adapted.hpp
index da68f5b2..8a8dbf32 100644
--- a/include/boost/fusion/include/adapted.hpp
+++ b/include/boost/fusion/include/adapted.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ADAPTED)
+#ifndef FUSION_INCLUDE_ADAPTED
 #define FUSION_INCLUDE_ADAPTED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/adapter.hpp b/include/boost/fusion/include/adapter.hpp
index 53ff0796..59ae3930 100644
--- a/include/boost/fusion/include/adapter.hpp
+++ b/include/boost/fusion/include/adapter.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ADAPTER)
+#ifndef FUSION_INCLUDE_ADAPTER
 #define FUSION_INCLUDE_ADAPTER
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/advance.hpp b/include/boost/fusion/include/advance.hpp
index 011c3b8b..0607047d 100644
--- a/include/boost/fusion/include/advance.hpp
+++ b/include/boost/fusion/include/advance.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ADVANCE)
+#ifndef FUSION_INCLUDE_ADVANCE
 #define FUSION_INCLUDE_ADVANCE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/algorithm.hpp b/include/boost/fusion/include/algorithm.hpp
index df33a54a..cc7796f2 100644
--- a/include/boost/fusion/include/algorithm.hpp
+++ b/include/boost/fusion/include/algorithm.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ALGORITHM)
+#ifndef FUSION_INCLUDE_ALGORITHM
 #define FUSION_INCLUDE_ALGORITHM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/all.hpp b/include/boost/fusion/include/all.hpp
index 1848e754..adff48f9 100644
--- a/include/boost/fusion/include/all.hpp
+++ b/include/boost/fusion/include/all.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ALL)
+#ifndef FUSION_INCLUDE_ALL
 #define FUSION_INCLUDE_ALL
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/any.hpp b/include/boost/fusion/include/any.hpp
index c76d6b69..91ee90b5 100644
--- a/include/boost/fusion/include/any.hpp
+++ b/include/boost/fusion/include/any.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ANY)
+#ifndef FUSION_INCLUDE_ANY
 #define FUSION_INCLUDE_ANY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/array.hpp b/include/boost/fusion/include/array.hpp
index b0e53a7b..df1138c1 100644
--- a/include/boost/fusion/include/array.hpp
+++ b/include/boost/fusion/include/array.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ARRAY)
+#ifndef FUSION_INCLUDE_ARRAY
 #define FUSION_INCLUDE_ARRAY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/as_deque.hpp b/include/boost/fusion/include/as_deque.hpp
index 77f90fd3..ae7ddd86 100644
--- a/include/boost/fusion/include/as_deque.hpp
+++ b/include/boost/fusion/include/as_deque.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_AS_DEQUE)
+#ifndef FUSION_INCLUDE_AS_DEQUE
 #define FUSION_INCLUDE_AS_DEQUE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/as_list.hpp b/include/boost/fusion/include/as_list.hpp
index 9a4072eb..051127f8 100644
--- a/include/boost/fusion/include/as_list.hpp
+++ b/include/boost/fusion/include/as_list.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_AS_LIST)
+#ifndef FUSION_INCLUDE_AS_LIST
 #define FUSION_INCLUDE_AS_LIST
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/as_map.hpp b/include/boost/fusion/include/as_map.hpp
index 3a6db913..4c711571 100644
--- a/include/boost/fusion/include/as_map.hpp
+++ b/include/boost/fusion/include/as_map.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_AS_MAP)
+#ifndef FUSION_INCLUDE_AS_MAP
 #define FUSION_INCLUDE_AS_MAP
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/as_set.hpp b/include/boost/fusion/include/as_set.hpp
index 697f86c7..9163c221 100644
--- a/include/boost/fusion/include/as_set.hpp
+++ b/include/boost/fusion/include/as_set.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_AS_SET)
+#ifndef FUSION_INCLUDE_AS_SET
 #define FUSION_INCLUDE_AS_SET
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/as_vector.hpp b/include/boost/fusion/include/as_vector.hpp
index 35aecd8f..0353841f 100644
--- a/include/boost/fusion/include/as_vector.hpp
+++ b/include/boost/fusion/include/as_vector.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_AS_VECTOR)
+#ifndef FUSION_INCLUDE_AS_VECTOR
 #define FUSION_INCLUDE_AS_VECTOR
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/at.hpp b/include/boost/fusion/include/at.hpp
index 99b70d6d..6573b9fb 100644
--- a/include/boost/fusion/include/at.hpp
+++ b/include/boost/fusion/include/at.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_AT)
+#ifndef FUSION_INCLUDE_AT
 #define FUSION_INCLUDE_AT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/at_c.hpp b/include/boost/fusion/include/at_c.hpp
index 053a5962..a47c3f03 100644
--- a/include/boost/fusion/include/at_c.hpp
+++ b/include/boost/fusion/include/at_c.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_AT_C)
+#ifndef FUSION_INCLUDE_AT_C
 #define FUSION_INCLUDE_AT_C
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/at_key.hpp b/include/boost/fusion/include/at_key.hpp
index 17331b91..190abf13 100644
--- a/include/boost/fusion/include/at_key.hpp
+++ b/include/boost/fusion/include/at_key.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_AT_KEY)
+#ifndef FUSION_INCLUDE_AT_KEY
 #define FUSION_INCLUDE_AT_KEY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/auxiliary.hpp b/include/boost/fusion/include/auxiliary.hpp
index af36d6d2..f7094d26 100644
--- a/include/boost/fusion/include/auxiliary.hpp
+++ b/include/boost/fusion/include/auxiliary.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_AUXILIARY)
+#ifndef FUSION_INCLUDE_AUXILIARY
 #define FUSION_INCLUDE_AUXILIARY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/back.hpp b/include/boost/fusion/include/back.hpp
index 9e2e9770..e0eb2222 100644
--- a/include/boost/fusion/include/back.hpp
+++ b/include/boost/fusion/include/back.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_BACK)
+#ifndef FUSION_INCLUDE_BACK
 #define FUSION_INCLUDE_BACK
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/begin.hpp b/include/boost/fusion/include/begin.hpp
index 88a449f2..2009ed68 100644
--- a/include/boost/fusion/include/begin.hpp
+++ b/include/boost/fusion/include/begin.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_BEGIN)
+#ifndef FUSION_INCLUDE_BEGIN
 #define FUSION_INCLUDE_BEGIN
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/boost_array.hpp b/include/boost/fusion/include/boost_array.hpp
index b85fa53f..0411087c 100644
--- a/include/boost/fusion/include/boost_array.hpp
+++ b/include/boost/fusion/include/boost_array.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_BOOST_ARRAY)
+#ifndef FUSION_INCLUDE_BOOST_ARRAY
 #define FUSION_INCLUDE_BOOST_ARRAY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/boost_tuple.hpp b/include/boost/fusion/include/boost_tuple.hpp
index 3f5fc8c3..678f60fc 100644
--- a/include/boost/fusion/include/boost_tuple.hpp
+++ b/include/boost/fusion/include/boost_tuple.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_BOOST_TUPLE)
+#ifndef FUSION_INCLUDE_BOOST_TUPLE
 #define FUSION_INCLUDE_BOOST_TUPLE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/category_of.hpp b/include/boost/fusion/include/category_of.hpp
index 0b75369f..4d7b869a 100644
--- a/include/boost/fusion/include/category_of.hpp
+++ b/include/boost/fusion/include/category_of.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_CATEGORY_OF)
+#ifndef FUSION_INCLUDE_CATEGORY_OF
 #define FUSION_INCLUDE_CATEGORY_OF
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/clear.hpp b/include/boost/fusion/include/clear.hpp
index 0c742fd5..5fbdc24a 100644
--- a/include/boost/fusion/include/clear.hpp
+++ b/include/boost/fusion/include/clear.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_CLEAR)
+#ifndef FUSION_INCLUDE_CLEAR
 #define FUSION_INCLUDE_CLEAR
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/comparison.hpp b/include/boost/fusion/include/comparison.hpp
index 07e7cd80..6a8ca048 100644
--- a/include/boost/fusion/include/comparison.hpp
+++ b/include/boost/fusion/include/comparison.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_COMPARISON)
+#ifndef FUSION_INCLUDE_COMPARISON
 #define FUSION_INCLUDE_COMPARISON
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/cons.hpp b/include/boost/fusion/include/cons.hpp
index 498e9407..69ee2bc7 100644
--- a/include/boost/fusion/include/cons.hpp
+++ b/include/boost/fusion/include/cons.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_CONS)
+#ifndef FUSION_INCLUDE_CONS
 #define FUSION_INCLUDE_CONS
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/cons_tie.hpp b/include/boost/fusion/include/cons_tie.hpp
index 7467ee47..b2106136 100644
--- a/include/boost/fusion/include/cons_tie.hpp
+++ b/include/boost/fusion/include/cons_tie.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_CONS_TIE)
+#ifndef FUSION_INCLUDE_CONS_TIE
 #define FUSION_INCLUDE_CONS_TIE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/container.hpp b/include/boost/fusion/include/container.hpp
index 4e6886f8..8b202a7d 100644
--- a/include/boost/fusion/include/container.hpp
+++ b/include/boost/fusion/include/container.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_CONTAINER)
+#ifndef FUSION_INCLUDE_CONTAINER
 #define FUSION_INCLUDE_CONTAINER
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/convert.hpp b/include/boost/fusion/include/convert.hpp
index 10fff22e..12401ce2 100644
--- a/include/boost/fusion/include/convert.hpp
+++ b/include/boost/fusion/include/convert.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_CONVERT)
+#ifndef FUSION_INCLUDE_CONVERT
 #define FUSION_INCLUDE_CONVERT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/copy.hpp b/include/boost/fusion/include/copy.hpp
index e44f58bf..4ed6bbab 100644
--- a/include/boost/fusion/include/copy.hpp
+++ b/include/boost/fusion/include/copy.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_COPY)
+#ifndef FUSION_INCLUDE_COPY
 #define FUSION_INCLUDE_COPY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/count.hpp b/include/boost/fusion/include/count.hpp
index 3e5b8fca..0de0d907 100644
--- a/include/boost/fusion/include/count.hpp
+++ b/include/boost/fusion/include/count.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_COUNT)
+#ifndef FUSION_INCLUDE_COUNT
 #define FUSION_INCLUDE_COUNT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/count_if.hpp b/include/boost/fusion/include/count_if.hpp
index 524af8ab..f87fa5ea 100644
--- a/include/boost/fusion/include/count_if.hpp
+++ b/include/boost/fusion/include/count_if.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_COUNT_IF)
+#ifndef FUSION_INCLUDE_COUNT_IF
 #define FUSION_INCLUDE_COUNT_IF
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/deduce.hpp b/include/boost/fusion/include/deduce.hpp
index 572e0d52..3afed3df 100644
--- a/include/boost/fusion/include/deduce.hpp
+++ b/include/boost/fusion/include/deduce.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_DEDUCE)
+#ifndef FUSION_INCLUDE_DEDUCE
 #define FUSION_INCLUDE_DEDUCE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/deduce_sequence.hpp b/include/boost/fusion/include/deduce_sequence.hpp
index 153fac54..f4b3089a 100644
--- a/include/boost/fusion/include/deduce_sequence.hpp
+++ b/include/boost/fusion/include/deduce_sequence.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_DEDUCE_SEQUENCE)
+#ifndef FUSION_INCLUDE_DEDUCE_SEQUENCE
 #define FUSION_INCLUDE_DEDUCE_SEQUENCE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/deque.hpp b/include/boost/fusion/include/deque.hpp
index bbbdfe80..c63a3c5c 100644
--- a/include/boost/fusion/include/deque.hpp
+++ b/include/boost/fusion/include/deque.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_DEQUE)
+#ifndef FUSION_INCLUDE_DEQUE
 #define FUSION_INCLUDE_DEQUE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/deque_fwd.hpp b/include/boost/fusion/include/deque_fwd.hpp
index 8a41121a..41c13e03 100644
--- a/include/boost/fusion/include/deque_fwd.hpp
+++ b/include/boost/fusion/include/deque_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_DEQUE)
+#ifndef FUSION_INCLUDE_DEQUE
 #define FUSION_INCLUDE_DEQUE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/deque_tie.hpp b/include/boost/fusion/include/deque_tie.hpp
index 400e9803..7cbbbe9c 100644
--- a/include/boost/fusion/include/deque_tie.hpp
+++ b/include/boost/fusion/include/deque_tie.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_GENERATION)
+#ifndef FUSION_INCLUDE_GENERATION
 #define FUSION_INCLUDE_GENERATION
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/deref.hpp b/include/boost/fusion/include/deref.hpp
index 64dbe697..f28c26f8 100644
--- a/include/boost/fusion/include/deref.hpp
+++ b/include/boost/fusion/include/deref.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_DEREF)
+#ifndef FUSION_INCLUDE_DEREF
 #define FUSION_INCLUDE_DEREF
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/distance.hpp b/include/boost/fusion/include/distance.hpp
index f76bad11..c3a0673b 100644
--- a/include/boost/fusion/include/distance.hpp
+++ b/include/boost/fusion/include/distance.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_DISTANCE)
+#ifndef FUSION_INCLUDE_DISTANCE
 #define FUSION_INCLUDE_DISTANCE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/empty.hpp b/include/boost/fusion/include/empty.hpp
index 8e6ed931..b430fa76 100644
--- a/include/boost/fusion/include/empty.hpp
+++ b/include/boost/fusion/include/empty.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_EMPTY)
+#ifndef FUSION_INCLUDE_EMPTY
 #define FUSION_INCLUDE_EMPTY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/end.hpp b/include/boost/fusion/include/end.hpp
index 255d05f0..e1203ce7 100644
--- a/include/boost/fusion/include/end.hpp
+++ b/include/boost/fusion/include/end.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_END)
+#ifndef FUSION_INCLUDE_END
 #define FUSION_INCLUDE_END
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/equal_to.hpp b/include/boost/fusion/include/equal_to.hpp
index 24499a90..93618c6a 100644
--- a/include/boost/fusion/include/equal_to.hpp
+++ b/include/boost/fusion/include/equal_to.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_EQUAL_TO)
+#ifndef FUSION_INCLUDE_EQUAL_TO
 #define FUSION_INCLUDE_EQUAL_TO
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/erase.hpp b/include/boost/fusion/include/erase.hpp
index 07e75654..1f92cda3 100644
--- a/include/boost/fusion/include/erase.hpp
+++ b/include/boost/fusion/include/erase.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ERASE)
+#ifndef FUSION_INCLUDE_ERASE
 #define FUSION_INCLUDE_ERASE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/erase_key.hpp b/include/boost/fusion/include/erase_key.hpp
index 11c342c4..0228e7c6 100644
--- a/include/boost/fusion/include/erase_key.hpp
+++ b/include/boost/fusion/include/erase_key.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ERASE_KEY)
+#ifndef FUSION_INCLUDE_ERASE_KEY
 #define FUSION_INCLUDE_ERASE_KEY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/filter.hpp b/include/boost/fusion/include/filter.hpp
index 96c8bd6c..a2deac6a 100644
--- a/include/boost/fusion/include/filter.hpp
+++ b/include/boost/fusion/include/filter.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FILTER)
+#ifndef FUSION_INCLUDE_FILTER
 #define FUSION_INCLUDE_FILTER
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/filter_if.hpp b/include/boost/fusion/include/filter_if.hpp
index 081541b0..9372d4eb 100644
--- a/include/boost/fusion/include/filter_if.hpp
+++ b/include/boost/fusion/include/filter_if.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FILTER_IF)
+#ifndef FUSION_INCLUDE_FILTER_IF
 #define FUSION_INCLUDE_FILTER_IF
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/filter_view.hpp b/include/boost/fusion/include/filter_view.hpp
index 6ba64fe1..af6fb18a 100644
--- a/include/boost/fusion/include/filter_view.hpp
+++ b/include/boost/fusion/include/filter_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FILTER_VIEW)
+#ifndef FUSION_INCLUDE_FILTER_VIEW
 #define FUSION_INCLUDE_FILTER_VIEW
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/find.hpp b/include/boost/fusion/include/find.hpp
index 47167d85..eafaf596 100644
--- a/include/boost/fusion/include/find.hpp
+++ b/include/boost/fusion/include/find.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FIND)
+#ifndef FUSION_INCLUDE_FIND
 #define FUSION_INCLUDE_FIND
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/find_if.hpp b/include/boost/fusion/include/find_if.hpp
index a864d801..89a1939d 100644
--- a/include/boost/fusion/include/find_if.hpp
+++ b/include/boost/fusion/include/find_if.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FIND_IF)
+#ifndef FUSION_INCLUDE_FIND_IF
 #define FUSION_INCLUDE_FIND_IF
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/fold.hpp b/include/boost/fusion/include/fold.hpp
index 04a18580..d72e9b53 100644
--- a/include/boost/fusion/include/fold.hpp
+++ b/include/boost/fusion/include/fold.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FOLD)
+#ifndef FUSION_INCLUDE_FOLD
 #define FUSION_INCLUDE_FOLD
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/for_each.hpp b/include/boost/fusion/include/for_each.hpp
index b4a96ae0..c2f8f034 100644
--- a/include/boost/fusion/include/for_each.hpp
+++ b/include/boost/fusion/include/for_each.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FOR_EACH)
+#ifndef FUSION_INCLUDE_FOR_EACH
 #define FUSION_INCLUDE_FOR_EACH
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/front.hpp b/include/boost/fusion/include/front.hpp
index b080fe56..3c5381ff 100644
--- a/include/boost/fusion/include/front.hpp
+++ b/include/boost/fusion/include/front.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FRONT)
+#ifndef FUSION_INCLUDE_FRONT
 #define FUSION_INCLUDE_FRONT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/functional.hpp b/include/boost/fusion/include/functional.hpp
index 01e7439a..9bf790f5 100644
--- a/include/boost/fusion/include/functional.hpp
+++ b/include/boost/fusion/include/functional.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FUNCTIONAL)
+#ifndef FUSION_INCLUDE_FUNCTIONAL
 #define FUSION_INCLUDE_FUNCTIONAL
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/fused.hpp b/include/boost/fusion/include/fused.hpp
index f27094f1..23fc1b50 100644
--- a/include/boost/fusion/include/fused.hpp
+++ b/include/boost/fusion/include/fused.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FUSED)
+#ifndef FUSION_INCLUDE_FUSED
 #define FUSION_INCLUDE_FUSED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/fused_function_object.hpp b/include/boost/fusion/include/fused_function_object.hpp
index 4196410d..fc5c55f2 100644
--- a/include/boost/fusion/include/fused_function_object.hpp
+++ b/include/boost/fusion/include/fused_function_object.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FUSED_FUNCTION_OBJECT)
+#ifndef FUSION_INCLUDE_FUSED_FUNCTION_OBJECT
 #define FUSION_INCLUDE_FUSED_FUNCTION_OBJECT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/fused_procedure.hpp b/include/boost/fusion/include/fused_procedure.hpp
index f6c3a01d..968b05d9 100644
--- a/include/boost/fusion/include/fused_procedure.hpp
+++ b/include/boost/fusion/include/fused_procedure.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_FUSED_PROCEDURE)
+#ifndef FUSION_INCLUDE_FUSED_PROCEDURE
 #define FUSION_INCLUDE_FUSED_PROCEDURE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/generation.hpp b/include/boost/fusion/include/generation.hpp
index 400e9803..7cbbbe9c 100644
--- a/include/boost/fusion/include/generation.hpp
+++ b/include/boost/fusion/include/generation.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_GENERATION)
+#ifndef FUSION_INCLUDE_GENERATION
 #define FUSION_INCLUDE_GENERATION
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/greater.hpp b/include/boost/fusion/include/greater.hpp
index e70550ce..434905d3 100644
--- a/include/boost/fusion/include/greater.hpp
+++ b/include/boost/fusion/include/greater.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_NOT_GREATER)
+#ifndef FUSION_INCLUDE_NOT_GREATER
 #define FUSION_INCLUDE_NOT_GREATER
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/greater_equal.hpp b/include/boost/fusion/include/greater_equal.hpp
index efd462c5..86b8eb3d 100644
--- a/include/boost/fusion/include/greater_equal.hpp
+++ b/include/boost/fusion/include/greater_equal.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_GREATER_EQUAL)
+#ifndef FUSION_INCLUDE_GREATER_EQUAL
 #define FUSION_INCLUDE_GREATER_EQUAL
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/has_key.hpp b/include/boost/fusion/include/has_key.hpp
index ee192cf0..47167db0 100644
--- a/include/boost/fusion/include/has_key.hpp
+++ b/include/boost/fusion/include/has_key.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_HAS_KEY)
+#ifndef FUSION_INCLUDE_HAS_KEY
 #define FUSION_INCLUDE_HAS_KEY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/hash.hpp b/include/boost/fusion/include/hash.hpp
index 8f483fc6..4cf8ebc1 100644
--- a/include/boost/fusion/include/hash.hpp
+++ b/include/boost/fusion/include/hash.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_HASH)
+#ifndef FUSION_INCLUDE_HASH
 #define FUSION_INCLUDE_HASH
 
 #include <boost/fusion/sequence/hash.hpp>
diff --git a/include/boost/fusion/include/identity_view.hpp b/include/boost/fusion/include/identity_view.hpp
index bb27d27b..946826ac 100644
--- a/include/boost/fusion/include/identity_view.hpp
+++ b/include/boost/fusion/include/identity_view.hpp
@@ -3,7 +3,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_IDENTITY_VIEW)
+#ifndef FUSION_INCLUDE_IDENTITY_VIEW
 #define FUSION_INCLUDE_IDENTITY_VIEW
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/ignore.hpp b/include/boost/fusion/include/ignore.hpp
index 400e9803..7cbbbe9c 100644
--- a/include/boost/fusion/include/ignore.hpp
+++ b/include/boost/fusion/include/ignore.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_GENERATION)
+#ifndef FUSION_INCLUDE_GENERATION
 #define FUSION_INCLUDE_GENERATION
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/in.hpp b/include/boost/fusion/include/in.hpp
index 4ceb928c..3a0ba3e7 100644
--- a/include/boost/fusion/include/in.hpp
+++ b/include/boost/fusion/include/in.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_IN)
+#ifndef FUSION_INCLUDE_IN
 #define FUSION_INCLUDE_IN
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/insert.hpp b/include/boost/fusion/include/insert.hpp
index 389333d4..c83c8fb6 100644
--- a/include/boost/fusion/include/insert.hpp
+++ b/include/boost/fusion/include/insert.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_INSERT)
+#ifndef FUSION_INCLUDE_INSERT
 #define FUSION_INCLUDE_INSERT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/insert_range.hpp b/include/boost/fusion/include/insert_range.hpp
index 9f280e4e..a7dfa1bf 100644
--- a/include/boost/fusion/include/insert_range.hpp
+++ b/include/boost/fusion/include/insert_range.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_INSERT_RANGE)
+#ifndef FUSION_INCLUDE_INSERT_RANGE
 #define FUSION_INCLUDE_INSERT_RANGE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/intrinsic.hpp b/include/boost/fusion/include/intrinsic.hpp
index dcceea54..fe4f3dc3 100644
--- a/include/boost/fusion/include/intrinsic.hpp
+++ b/include/boost/fusion/include/intrinsic.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_INTRINSIC)
+#ifndef FUSION_INCLUDE_INTRINSIC
 #define FUSION_INCLUDE_INTRINSIC
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/invocation.hpp b/include/boost/fusion/include/invocation.hpp
index fbb4061f..d5564ea5 100644
--- a/include/boost/fusion/include/invocation.hpp
+++ b/include/boost/fusion/include/invocation.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_INVOCATION)
+#ifndef FUSION_INCLUDE_INVOCATION
 #define FUSION_INCLUDE_INVOCATION
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/invoke.hpp b/include/boost/fusion/include/invoke.hpp
index 2565f1fa..c6dc9af3 100644
--- a/include/boost/fusion/include/invoke.hpp
+++ b/include/boost/fusion/include/invoke.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_INVOKE)
+#ifndef FUSION_INCLUDE_INVOKE
 #define FUSION_INCLUDE_INVOKE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/invoke_function_object.hpp b/include/boost/fusion/include/invoke_function_object.hpp
index f0ca0a98..088e4c94 100644
--- a/include/boost/fusion/include/invoke_function_object.hpp
+++ b/include/boost/fusion/include/invoke_function_object.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_INVOKE_FUNCTION_OBJECT)
+#ifndef FUSION_INCLUDE_INVOKE_FUNCTION_OBJECT
 #define FUSION_INCLUDE_INVOKE_FUNCTION_OBJECT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/invoke_procedure.hpp b/include/boost/fusion/include/invoke_procedure.hpp
index 28bd35d3..786fe795 100644
--- a/include/boost/fusion/include/invoke_procedure.hpp
+++ b/include/boost/fusion/include/invoke_procedure.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_INVOKE_PROCEDURE)
+#ifndef FUSION_INCLUDE_INVOKE_PROCEDURE
 #define FUSION_INCLUDE_INVOKE_PROCEDURE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/io.hpp b/include/boost/fusion/include/io.hpp
index 992e0be2..9e5451db 100644
--- a/include/boost/fusion/include/io.hpp
+++ b/include/boost/fusion/include/io.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_IO)
+#ifndef FUSION_INCLUDE_IO
 #define FUSION_INCLUDE_IO
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/is_iterator.hpp b/include/boost/fusion/include/is_iterator.hpp
index 83dc1484..9f6af9e4 100644
--- a/include/boost/fusion/include/is_iterator.hpp
+++ b/include/boost/fusion/include/is_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_IS_ITERATOR)
+#ifndef FUSION_INCLUDE_IS_ITERATOR
 #define FUSION_INCLUDE_IS_ITERATOR
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/is_segmented.hpp b/include/boost/fusion/include/is_segmented.hpp
index b13be3f0..021e4993 100644
--- a/include/boost/fusion/include/is_segmented.hpp
+++ b/include/boost/fusion/include/is_segmented.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_INCLUDE_IS_SEGMENTED)
+#ifndef BOOST_FUSION_INCLUDE_IS_SEGMENTED
 #define BOOST_FUSION_INCLUDE_IS_SEGMENTED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/is_sequence.hpp b/include/boost/fusion/include/is_sequence.hpp
index d3d820fc..a1da9da9 100644
--- a/include/boost/fusion/include/is_sequence.hpp
+++ b/include/boost/fusion/include/is_sequence.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_IS_SEQUENCE)
+#ifndef FUSION_INCLUDE_IS_SEQUENCE
 #define FUSION_INCLUDE_IS_SEQUENCE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/is_view.hpp b/include/boost/fusion/include/is_view.hpp
index 1f886f4d..b3cc1a11 100644
--- a/include/boost/fusion/include/is_view.hpp
+++ b/include/boost/fusion/include/is_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_IS_VIEW)
+#ifndef FUSION_INCLUDE_IS_VIEW
 #define FUSION_INCLUDE_IS_VIEW
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/iteration.hpp b/include/boost/fusion/include/iteration.hpp
index 612f00c4..bfd32ddf 100644
--- a/include/boost/fusion/include/iteration.hpp
+++ b/include/boost/fusion/include/iteration.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ITERATION)
+#ifndef FUSION_INCLUDE_ITERATION
 #define FUSION_INCLUDE_ITERATION
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/iterator.hpp b/include/boost/fusion/include/iterator.hpp
index a69be640..ca7dd0c7 100644
--- a/include/boost/fusion/include/iterator.hpp
+++ b/include/boost/fusion/include/iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ITERATOR)
+#ifndef FUSION_INCLUDE_ITERATOR
 #define FUSION_INCLUDE_ITERATOR
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/iterator_adapter.hpp b/include/boost/fusion/include/iterator_adapter.hpp
index 95de7cfb..45495b72 100644
--- a/include/boost/fusion/include/iterator_adapter.hpp
+++ b/include/boost/fusion/include/iterator_adapter.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ITERATOR_ADAPTER)
+#ifndef FUSION_INCLUDE_ITERATOR_ADAPTER
 #define FUSION_INCLUDE_ITERATOR_ADAPTER
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/iterator_base.hpp b/include/boost/fusion/include/iterator_base.hpp
index 41223c58..60095a65 100644
--- a/include/boost/fusion/include/iterator_base.hpp
+++ b/include/boost/fusion/include/iterator_base.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ITERATOR_BASE)
+#ifndef FUSION_INCLUDE_ITERATOR_BASE
 #define FUSION_INCLUDE_ITERATOR_BASE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/iterator_facade.hpp b/include/boost/fusion/include/iterator_facade.hpp
index a137414b..22cd2d13 100644
--- a/include/boost/fusion/include/iterator_facade.hpp
+++ b/include/boost/fusion/include/iterator_facade.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ITERATOR_FACADE)
+#ifndef FUSION_INCLUDE_ITERATOR_FACADE
 #define FUSION_INCLUDE_ITERATOR_FACADE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/iterator_range.hpp b/include/boost/fusion/include/iterator_range.hpp
index 1f5d1ed6..d254b564 100644
--- a/include/boost/fusion/include/iterator_range.hpp
+++ b/include/boost/fusion/include/iterator_range.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ITERATOR_RANGE)
+#ifndef FUSION_INCLUDE_ITERATOR_RANGE
 #define FUSION_INCLUDE_ITERATOR_RANGE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/join.hpp b/include/boost/fusion/include/join.hpp
index 419caabf..ea404ec3 100644
--- a/include/boost/fusion/include/join.hpp
+++ b/include/boost/fusion/include/join.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_JOIN)
+#ifndef FUSION_INCLUDE_JOIN
 #define FUSION_INCLUDE_JOIN
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/joint_view.hpp b/include/boost/fusion/include/joint_view.hpp
index 94b2d071..5da1bb01 100644
--- a/include/boost/fusion/include/joint_view.hpp
+++ b/include/boost/fusion/include/joint_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_JOINT_VIEW)
+#ifndef FUSION_INCLUDE_JOINT_VIEW
 #define FUSION_INCLUDE_JOINT_VIEW
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/less.hpp b/include/boost/fusion/include/less.hpp
index 463b91a6..839920ef 100644
--- a/include/boost/fusion/include/less.hpp
+++ b/include/boost/fusion/include/less.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_LESS)
+#ifndef FUSION_INCLUDE_LESS
 #define FUSION_INCLUDE_LESS
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/less_equal.hpp b/include/boost/fusion/include/less_equal.hpp
index 48de2a37..fb6a2f9f 100644
--- a/include/boost/fusion/include/less_equal.hpp
+++ b/include/boost/fusion/include/less_equal.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_LESS_EQUAL)
+#ifndef FUSION_INCLUDE_LESS_EQUAL
 #define FUSION_INCLUDE_LESS_EQUAL
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/list.hpp b/include/boost/fusion/include/list.hpp
index 9d8e33c1..a9b9ac84 100644
--- a/include/boost/fusion/include/list.hpp
+++ b/include/boost/fusion/include/list.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_LIST)
+#ifndef FUSION_INCLUDE_LIST
 #define FUSION_INCLUDE_LIST
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/list_fwd.hpp b/include/boost/fusion/include/list_fwd.hpp
index 8f7216d1..887a4e5f 100644
--- a/include/boost/fusion/include/list_fwd.hpp
+++ b/include/boost/fusion/include/list_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_LIST_FWD)
+#ifndef FUSION_INCLUDE_LIST_FWD
 #define FUSION_INCLUDE_LIST_FWD
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/list_tie.hpp b/include/boost/fusion/include/list_tie.hpp
index 400e9803..7cbbbe9c 100644
--- a/include/boost/fusion/include/list_tie.hpp
+++ b/include/boost/fusion/include/list_tie.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_GENERATION)
+#ifndef FUSION_INCLUDE_GENERATION
 #define FUSION_INCLUDE_GENERATION
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/make_cons.hpp b/include/boost/fusion/include/make_cons.hpp
index 89d3a26b..769c818f 100644
--- a/include/boost/fusion/include/make_cons.hpp
+++ b/include/boost/fusion/include/make_cons.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_CONS)
+#ifndef FUSION_INCLUDE_MAKE_CONS
 #define FUSION_INCLUDE_MAKE_CONS
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/make_deque.hpp b/include/boost/fusion/include/make_deque.hpp
index d16b3785..fa8ee61e 100644
--- a/include/boost/fusion/include/make_deque.hpp
+++ b/include/boost/fusion/include/make_deque.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_DEQUE)
+#ifndef FUSION_INCLUDE_MAKE_DEQUE
 #define FUSION_INCLUDE_MAKE_DEQUE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/make_fused.hpp b/include/boost/fusion/include/make_fused.hpp
index 82b7ed7e..2c282b4e 100644
--- a/include/boost/fusion/include/make_fused.hpp
+++ b/include/boost/fusion/include/make_fused.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_FUSED)
+#ifndef FUSION_INCLUDE_MAKE_FUSED
 #define FUSION_INCLUDE_MAKE_FUSED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/make_fused_function_object.hpp b/include/boost/fusion/include/make_fused_function_object.hpp
index 68667c77..69ccd439 100644
--- a/include/boost/fusion/include/make_fused_function_object.hpp
+++ b/include/boost/fusion/include/make_fused_function_object.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_FUSED_FUNCTION_OBJECT)
+#ifndef FUSION_INCLUDE_MAKE_FUSED_FUNCTION_OBJECT
 #define FUSION_INCLUDE_MAKE_FUSED_FUNCTION_OBJECT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/make_fused_procedure.hpp b/include/boost/fusion/include/make_fused_procedure.hpp
index b6ac3339..daf090ed 100644
--- a/include/boost/fusion/include/make_fused_procedure.hpp
+++ b/include/boost/fusion/include/make_fused_procedure.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_FUSED_PROCEDURE)
+#ifndef FUSION_INCLUDE_MAKE_FUSED_PROCEDURE
 #define FUSION_INCLUDE_MAKE_FUSED_PROCEDURE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/make_list.hpp b/include/boost/fusion/include/make_list.hpp
index affee721..18d8f0fd 100644
--- a/include/boost/fusion/include/make_list.hpp
+++ b/include/boost/fusion/include/make_list.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_LIST)
+#ifndef FUSION_INCLUDE_MAKE_LIST
 #define FUSION_INCLUDE_MAKE_LIST
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/make_map.hpp b/include/boost/fusion/include/make_map.hpp
index 9492eaef..072d8ff0 100644
--- a/include/boost/fusion/include/make_map.hpp
+++ b/include/boost/fusion/include/make_map.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_MAP)
+#ifndef FUSION_INCLUDE_MAKE_MAP
 #define FUSION_INCLUDE_MAKE_MAP
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/make_set.hpp b/include/boost/fusion/include/make_set.hpp
index c87b3998..02480498 100644
--- a/include/boost/fusion/include/make_set.hpp
+++ b/include/boost/fusion/include/make_set.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_SET)
+#ifndef FUSION_INCLUDE_MAKE_SET
 #define FUSION_INCLUDE_MAKE_SET
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/make_tuple.hpp b/include/boost/fusion/include/make_tuple.hpp
index 82f3447d..d3df688e 100644
--- a/include/boost/fusion/include/make_tuple.hpp
+++ b/include/boost/fusion/include/make_tuple.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_TUPLE)
+#ifndef FUSION_INCLUDE_MAKE_TUPLE
 #define FUSION_INCLUDE_MAKE_TUPLE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/make_vector.hpp b/include/boost/fusion/include/make_vector.hpp
index 9d9a70a3..ab0d7b76 100644
--- a/include/boost/fusion/include/make_vector.hpp
+++ b/include/boost/fusion/include/make_vector.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAKE_VECTOR)
+#ifndef FUSION_INCLUDE_MAKE_VECTOR
 #define FUSION_INCLUDE_MAKE_VECTOR
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/map.hpp b/include/boost/fusion/include/map.hpp
index 17c4e762..dcc2f310 100644
--- a/include/boost/fusion/include/map.hpp
+++ b/include/boost/fusion/include/map.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAP)
+#ifndef FUSION_INCLUDE_MAP
 #define FUSION_INCLUDE_MAP
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/map_fwd.hpp b/include/boost/fusion/include/map_fwd.hpp
index 86fa7caf..a850ee4d 100644
--- a/include/boost/fusion/include/map_fwd.hpp
+++ b/include/boost/fusion/include/map_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAP_FWD)
+#ifndef FUSION_INCLUDE_MAP_FWD
 #define FUSION_INCLUDE_MAP_FWD
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/map_tie.hpp b/include/boost/fusion/include/map_tie.hpp
index 58afafba..618edf1b 100644
--- a/include/boost/fusion/include/map_tie.hpp
+++ b/include/boost/fusion/include/map_tie.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MAP_TIE)
+#ifndef FUSION_INCLUDE_MAP_TIE
 #define FUSION_INCLUDE_MAP_TIE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/move.hpp b/include/boost/fusion/include/move.hpp
index 8042db48..0bc5b7cd 100644
--- a/include/boost/fusion/include/move.hpp
+++ b/include/boost/fusion/include/move.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MOVE)
+#ifndef FUSION_INCLUDE_MOVE
 #define FUSION_INCLUDE_MOVE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/mpl.hpp b/include/boost/fusion/include/mpl.hpp
index cf7fff2f..2a379d61 100644
--- a/include/boost/fusion/include/mpl.hpp
+++ b/include/boost/fusion/include/mpl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_MPL)
+#ifndef FUSION_INCLUDE_MPL
 #define FUSION_INCLUDE_MPL
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/next.hpp b/include/boost/fusion/include/next.hpp
index 266b6ecb..a2aa5998 100644
--- a/include/boost/fusion/include/next.hpp
+++ b/include/boost/fusion/include/next.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_NEXT)
+#ifndef FUSION_INCLUDE_NEXT
 #define FUSION_INCLUDE_NEXT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/nil.hpp b/include/boost/fusion/include/nil.hpp
index 3efde4e9..c7d7f63f 100644
--- a/include/boost/fusion/include/nil.hpp
+++ b/include/boost/fusion/include/nil.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_NIL)
+#ifndef FUSION_INCLUDE_NIL
 #define FUSION_INCLUDE_NIL
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/none.hpp b/include/boost/fusion/include/none.hpp
index 3870b398..42f18437 100644
--- a/include/boost/fusion/include/none.hpp
+++ b/include/boost/fusion/include/none.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_NONE)
+#ifndef FUSION_INCLUDE_NONE
 #define FUSION_INCLUDE_NONE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/not_equal_to.hpp b/include/boost/fusion/include/not_equal_to.hpp
index e11f2d6a..79593795 100644
--- a/include/boost/fusion/include/not_equal_to.hpp
+++ b/include/boost/fusion/include/not_equal_to.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_NOT_EQUAL_TO)
+#ifndef FUSION_INCLUDE_NOT_EQUAL_TO
 #define FUSION_INCLUDE_NOT_EQUAL_TO
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/nview.hpp b/include/boost/fusion/include/nview.hpp
index f1309ca5..a6f10bab 100644
--- a/include/boost/fusion/include/nview.hpp
+++ b/include/boost/fusion/include/nview.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_NVIEW)
+#ifndef FUSION_INCLUDE_NVIEW
 #define FUSION_INCLUDE_NVIEW
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/out.hpp b/include/boost/fusion/include/out.hpp
index 85d26dda..4a5c6ed8 100644
--- a/include/boost/fusion/include/out.hpp
+++ b/include/boost/fusion/include/out.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_OUT)
+#ifndef FUSION_INCLUDE_OUT
 #define FUSION_INCLUDE_OUT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/pair.hpp b/include/boost/fusion/include/pair.hpp
index bf0897d0..dce65b2c 100644
--- a/include/boost/fusion/include/pair.hpp
+++ b/include/boost/fusion/include/pair.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_PAIR)
+#ifndef FUSION_INCLUDE_PAIR
 #define FUSION_INCLUDE_PAIR
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/pair_tie.hpp b/include/boost/fusion/include/pair_tie.hpp
index 3a783f33..6936a213 100644
--- a/include/boost/fusion/include/pair_tie.hpp
+++ b/include/boost/fusion/include/pair_tie.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_PAIR_TIE)
+#ifndef FUSION_INCLUDE_PAIR_TIE
 #define FUSION_INCLUDE_PAIR_TIE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/pop_back.hpp b/include/boost/fusion/include/pop_back.hpp
index 213fb3b2..6b9a5093 100644
--- a/include/boost/fusion/include/pop_back.hpp
+++ b/include/boost/fusion/include/pop_back.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_POP_BACK)
+#ifndef FUSION_INCLUDE_POP_BACK
 #define FUSION_INCLUDE_POP_BACK
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/pop_front.hpp b/include/boost/fusion/include/pop_front.hpp
index d52d6122..59c4d28b 100644
--- a/include/boost/fusion/include/pop_front.hpp
+++ b/include/boost/fusion/include/pop_front.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_POP_FRONT)
+#ifndef FUSION_INCLUDE_POP_FRONT
 #define FUSION_INCLUDE_POP_FRONT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/prior.hpp b/include/boost/fusion/include/prior.hpp
index 605b3b39..1b88c7b3 100644
--- a/include/boost/fusion/include/prior.hpp
+++ b/include/boost/fusion/include/prior.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_PRIOR)
+#ifndef FUSION_INCLUDE_PRIOR
 #define FUSION_INCLUDE_PRIOR
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/push_back.hpp b/include/boost/fusion/include/push_back.hpp
index 6e74b3fa..df35fa58 100644
--- a/include/boost/fusion/include/push_back.hpp
+++ b/include/boost/fusion/include/push_back.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_PUSH_BACK)
+#ifndef FUSION_INCLUDE_PUSH_BACK
 #define FUSION_INCLUDE_PUSH_BACK
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/push_front.hpp b/include/boost/fusion/include/push_front.hpp
index 8c4b0357..2d27818e 100644
--- a/include/boost/fusion/include/push_front.hpp
+++ b/include/boost/fusion/include/push_front.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_PUSH_FRONT)
+#ifndef FUSION_INCLUDE_PUSH_FRONT
 #define FUSION_INCLUDE_PUSH_FRONT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/query.hpp b/include/boost/fusion/include/query.hpp
index edfbd1e2..acc66ebc 100644
--- a/include/boost/fusion/include/query.hpp
+++ b/include/boost/fusion/include/query.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_QUERY)
+#ifndef FUSION_INCLUDE_QUERY
 #define FUSION_INCLUDE_QUERY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/remove.hpp b/include/boost/fusion/include/remove.hpp
index 269d86f2..714cf419 100644
--- a/include/boost/fusion/include/remove.hpp
+++ b/include/boost/fusion/include/remove.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_REMOVE)
+#ifndef FUSION_INCLUDE_REMOVE
 #define FUSION_INCLUDE_REMOVE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/remove_if.hpp b/include/boost/fusion/include/remove_if.hpp
index 6e6266d3..ad20417c 100644
--- a/include/boost/fusion/include/remove_if.hpp
+++ b/include/boost/fusion/include/remove_if.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_REMOVE_IF)
+#ifndef FUSION_INCLUDE_REMOVE_IF
 #define FUSION_INCLUDE_REMOVE_IF
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/repetitive_view.hpp b/include/boost/fusion/include/repetitive_view.hpp
index b57c997d..f85603fd 100644
--- a/include/boost/fusion/include/repetitive_view.hpp
+++ b/include/boost/fusion/include/repetitive_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_REPETETIVE_VIEW)
+#ifndef FUSION_INCLUDE_REPETETIVE_VIEW
 #define FUSION_INCLUDE_REPETETIVE_VIEW
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/replace.hpp b/include/boost/fusion/include/replace.hpp
index 3ff05a67..a7f87744 100644
--- a/include/boost/fusion/include/replace.hpp
+++ b/include/boost/fusion/include/replace.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_REPLACE)
+#ifndef FUSION_INCLUDE_REPLACE
 #define FUSION_INCLUDE_REPLACE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/replace_if.hpp b/include/boost/fusion/include/replace_if.hpp
index 9bc9931d..413a650f 100644
--- a/include/boost/fusion/include/replace_if.hpp
+++ b/include/boost/fusion/include/replace_if.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_REPLACE_IF)
+#ifndef FUSION_INCLUDE_REPLACE_IF
 #define FUSION_INCLUDE_REPLACE_IF
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/reverse.hpp b/include/boost/fusion/include/reverse.hpp
index 4f147b98..01e42c8d 100644
--- a/include/boost/fusion/include/reverse.hpp
+++ b/include/boost/fusion/include/reverse.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_REVERSE)
+#ifndef FUSION_INCLUDE_REVERSE
 #define FUSION_INCLUDE_REVERSE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/reverse_view.hpp b/include/boost/fusion/include/reverse_view.hpp
index 6652d060..3eb06225 100644
--- a/include/boost/fusion/include/reverse_view.hpp
+++ b/include/boost/fusion/include/reverse_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_REVERSE_VIEW)
+#ifndef FUSION_INCLUDE_REVERSE_VIEW
 #define FUSION_INCLUDE_REVERSE_VIEW
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/segmented_fold_until.hpp b/include/boost/fusion/include/segmented_fold_until.hpp
index 7a5cc62d..f9ec6620 100644
--- a/include/boost/fusion/include/segmented_fold_until.hpp
+++ b/include/boost/fusion/include/segmented_fold_until.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_INCLUDE_SEGMENTED_FOLD_UNTIL)
+#ifndef BOOST_FUSION_INCLUDE_SEGMENTED_FOLD_UNTIL
 #define BOOST_FUSION_INCLUDE_SEGMENTED_FOLD_UNTIL
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/segmented_iterator.hpp b/include/boost/fusion/include/segmented_iterator.hpp
index 18d0a65e..5e92b387 100644
--- a/include/boost/fusion/include/segmented_iterator.hpp
+++ b/include/boost/fusion/include/segmented_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_INCLUDE_SEGMENTED_ITERATOR)
+#ifndef BOOST_FUSION_INCLUDE_SEGMENTED_ITERATOR
 #define BOOST_FUSION_INCLUDE_SEGMENTED_ITERATOR
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/segments.hpp b/include/boost/fusion/include/segments.hpp
index c0a4c50c..030a7769 100644
--- a/include/boost/fusion/include/segments.hpp
+++ b/include/boost/fusion/include/segments.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_INCLUDE_SEGMENTS)
+#ifndef BOOST_FUSION_INCLUDE_SEGMENTS
 #define BOOST_FUSION_INCLUDE_SEGMENTS
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/sequence.hpp b/include/boost/fusion/include/sequence.hpp
index ff36266b..dc01be72 100644
--- a/include/boost/fusion/include/sequence.hpp
+++ b/include/boost/fusion/include/sequence.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_SEQUENCE)
+#ifndef FUSION_INCLUDE_SEQUENCE
 #define FUSION_INCLUDE_SEQUENCE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/sequence_base.hpp b/include/boost/fusion/include/sequence_base.hpp
index fc68090e..6a6e4b60 100644
--- a/include/boost/fusion/include/sequence_base.hpp
+++ b/include/boost/fusion/include/sequence_base.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_SEQUENCE_BASE)
+#ifndef FUSION_INCLUDE_SEQUENCE_BASE
 #define FUSION_INCLUDE_SEQUENCE_BASE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/sequence_facade.hpp b/include/boost/fusion/include/sequence_facade.hpp
index ef989b4c..05a759a5 100644
--- a/include/boost/fusion/include/sequence_facade.hpp
+++ b/include/boost/fusion/include/sequence_facade.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_SEQUENCE_FACADE)
+#ifndef FUSION_INCLUDE_SEQUENCE_FACADE
 #define FUSION_INCLUDE_SEQUENCE_FACADE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/set.hpp b/include/boost/fusion/include/set.hpp
index 370ae655..e874a770 100644
--- a/include/boost/fusion/include/set.hpp
+++ b/include/boost/fusion/include/set.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_SET)
+#ifndef FUSION_INCLUDE_SET
 #define FUSION_INCLUDE_SET
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/single_view.hpp b/include/boost/fusion/include/single_view.hpp
index 306fac6c..c2b5e26b 100644
--- a/include/boost/fusion/include/single_view.hpp
+++ b/include/boost/fusion/include/single_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_SINGLE_VIEW)
+#ifndef FUSION_INCLUDE_SINGLE_VIEW
 #define FUSION_INCLUDE_SINGLE_VIEW
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/size.hpp b/include/boost/fusion/include/size.hpp
index 5131116d..73a2bce8 100644
--- a/include/boost/fusion/include/size.hpp
+++ b/include/boost/fusion/include/size.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_SIZE)
+#ifndef FUSION_INCLUDE_SIZE
 #define FUSION_INCLUDE_SIZE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/std_array.hpp b/include/boost/fusion/include/std_array.hpp
index ceb815ba..8f41121f 100644
--- a/include/boost/fusion/include/std_array.hpp
+++ b/include/boost/fusion/include/std_array.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_STD_ARRAY)
+#ifndef FUSION_INCLUDE_STD_ARRAY
 #define FUSION_INCLUDE_STD_ARRAY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/std_pair.hpp b/include/boost/fusion/include/std_pair.hpp
index 7a882a97..513bb19f 100644
--- a/include/boost/fusion/include/std_pair.hpp
+++ b/include/boost/fusion/include/std_pair.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_STD_PAIR)
+#ifndef FUSION_INCLUDE_STD_PAIR
 #define FUSION_INCLUDE_STD_PAIR
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/struct.hpp b/include/boost/fusion/include/struct.hpp
index fc4366fd..60c35661 100644
--- a/include/boost/fusion/include/struct.hpp
+++ b/include/boost/fusion/include/struct.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_STRUCT)
+#ifndef FUSION_INCLUDE_STRUCT
 #define FUSION_INCLUDE_STRUCT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/support.hpp b/include/boost/fusion/include/support.hpp
index 8762517f..e5da74e3 100644
--- a/include/boost/fusion/include/support.hpp
+++ b/include/boost/fusion/include/support.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_SUPPORT)
+#ifndef FUSION_INCLUDE_SUPPORT
 #define FUSION_INCLUDE_SUPPORT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/swap.hpp b/include/boost/fusion/include/swap.hpp
index c25d557f..e58f90b7 100644
--- a/include/boost/fusion/include/swap.hpp
+++ b/include/boost/fusion/include/swap.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_SWAP)
+#ifndef FUSION_INCLUDE_SWAP
 #define FUSION_INCLUDE_SWAP
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/tag_of.hpp b/include/boost/fusion/include/tag_of.hpp
index dc583eeb..a42c93c9 100644
--- a/include/boost/fusion/include/tag_of.hpp
+++ b/include/boost/fusion/include/tag_of.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_TAG_OF)
+#ifndef FUSION_INCLUDE_TAG_OF
 #define FUSION_INCLUDE_TAG_OF
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/tag_of_fwd.hpp b/include/boost/fusion/include/tag_of_fwd.hpp
index 287dc338..255f6a53 100644
--- a/include/boost/fusion/include/tag_of_fwd.hpp
+++ b/include/boost/fusion/include/tag_of_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_TAG_OF_FWD)
+#ifndef FUSION_INCLUDE_TAG_OF_FWD
 #define FUSION_INCLUDE_TAG_OF_FWD
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/transform.hpp b/include/boost/fusion/include/transform.hpp
index 04fdc384..51c7fe72 100644
--- a/include/boost/fusion/include/transform.hpp
+++ b/include/boost/fusion/include/transform.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_TRANSFORM)
+#ifndef FUSION_INCLUDE_TRANSFORM
 #define FUSION_INCLUDE_TRANSFORM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/transform_view.hpp b/include/boost/fusion/include/transform_view.hpp
index b07a7979..5059ed1c 100644
--- a/include/boost/fusion/include/transform_view.hpp
+++ b/include/boost/fusion/include/transform_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_TRANSFORM_VIEW)
+#ifndef FUSION_INCLUDE_TRANSFORM_VIEW
 #define FUSION_INCLUDE_TRANSFORM_VIEW
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/transformation.hpp b/include/boost/fusion/include/transformation.hpp
index 195b3eb2..3f8e6835 100644
--- a/include/boost/fusion/include/transformation.hpp
+++ b/include/boost/fusion/include/transformation.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_TRANSFORMATION)
+#ifndef FUSION_INCLUDE_TRANSFORMATION
 #define FUSION_INCLUDE_TRANSFORMATION
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/tuple.hpp b/include/boost/fusion/include/tuple.hpp
index 5d167f4f..9ed0f3bc 100644
--- a/include/boost/fusion/include/tuple.hpp
+++ b/include/boost/fusion/include/tuple.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_TUPLE)
+#ifndef FUSION_INCLUDE_TUPLE
 #define FUSION_INCLUDE_TUPLE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/tuple_fwd.hpp b/include/boost/fusion/include/tuple_fwd.hpp
index d95ce2be..cc0fd75d 100644
--- a/include/boost/fusion/include/tuple_fwd.hpp
+++ b/include/boost/fusion/include/tuple_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_TUPLE_FWD)
+#ifndef FUSION_INCLUDE_TUPLE_FWD
 #define FUSION_INCLUDE_TUPLE_FWD
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/tuple_tie.hpp b/include/boost/fusion/include/tuple_tie.hpp
index c61451a0..eb0e46ea 100644
--- a/include/boost/fusion/include/tuple_tie.hpp
+++ b/include/boost/fusion/include/tuple_tie.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_TUPLE_TIE)
+#ifndef FUSION_INCLUDE_TUPLE_TIE
 #define FUSION_INCLUDE_TUPLE_TIE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/unfused_typed.hpp b/include/boost/fusion/include/unfused_typed.hpp
index c14c5153..cdba447e 100644
--- a/include/boost/fusion/include/unfused_typed.hpp
+++ b/include/boost/fusion/include/unfused_typed.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_UNFUSED_TYPED)
+#ifndef FUSION_INCLUDE_UNFUSED_TYPED
 #define FUSION_INCLUDE_UNFUSED_TYPED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/unused.hpp b/include/boost/fusion/include/unused.hpp
index 6114f282..675b5f3c 100644
--- a/include/boost/fusion/include/unused.hpp
+++ b/include/boost/fusion/include/unused.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_UNUSED)
+#ifndef FUSION_INCLUDE_UNUSED
 #define FUSION_INCLUDE_UNUSED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/value_at.hpp b/include/boost/fusion/include/value_at.hpp
index d40a9f08..c3bd4e34 100644
--- a/include/boost/fusion/include/value_at.hpp
+++ b/include/boost/fusion/include/value_at.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VALUE_AT)
+#ifndef FUSION_INCLUDE_VALUE_AT
 #define FUSION_INCLUDE_VALUE_AT
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/value_at_key.hpp b/include/boost/fusion/include/value_at_key.hpp
index 22921009..58c04f10 100644
--- a/include/boost/fusion/include/value_at_key.hpp
+++ b/include/boost/fusion/include/value_at_key.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VALUE_AT_KEY)
+#ifndef FUSION_INCLUDE_VALUE_AT_KEY
 #define FUSION_INCLUDE_VALUE_AT_KEY
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/value_of.hpp b/include/boost/fusion/include/value_of.hpp
index 33e49d8f..8ee41f8b 100644
--- a/include/boost/fusion/include/value_of.hpp
+++ b/include/boost/fusion/include/value_of.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VALUE_OF)
+#ifndef FUSION_INCLUDE_VALUE_OF
 #define FUSION_INCLUDE_VALUE_OF
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/vector.hpp b/include/boost/fusion/include/vector.hpp
index 83aa7444..c516c9f0 100644
--- a/include/boost/fusion/include/vector.hpp
+++ b/include/boost/fusion/include/vector.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VECTOR)
+#ifndef FUSION_INCLUDE_VECTOR
 #define FUSION_INCLUDE_VECTOR
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/vector10.hpp b/include/boost/fusion/include/vector10.hpp
index 50e5f182..a10e31df 100644
--- a/include/boost/fusion/include/vector10.hpp
+++ b/include/boost/fusion/include/vector10.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VECTOR10)
+#ifndef FUSION_INCLUDE_VECTOR10
 #define FUSION_INCLUDE_VECTOR10
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/vector20.hpp b/include/boost/fusion/include/vector20.hpp
index 5d1f1fe6..67be03ef 100644
--- a/include/boost/fusion/include/vector20.hpp
+++ b/include/boost/fusion/include/vector20.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VECTOR20)
+#ifndef FUSION_INCLUDE_VECTOR20
 #define FUSION_INCLUDE_VECTOR20
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/vector30.hpp b/include/boost/fusion/include/vector30.hpp
index 243f2bb9..332c9817 100644
--- a/include/boost/fusion/include/vector30.hpp
+++ b/include/boost/fusion/include/vector30.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VECTOR30)
+#ifndef FUSION_INCLUDE_VECTOR30
 #define FUSION_INCLUDE_VECTOR30
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/vector40.hpp b/include/boost/fusion/include/vector40.hpp
index 8dd800a8..d28fdcd6 100644
--- a/include/boost/fusion/include/vector40.hpp
+++ b/include/boost/fusion/include/vector40.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VECTOR40)
+#ifndef FUSION_INCLUDE_VECTOR40
 #define FUSION_INCLUDE_VECTOR40
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/vector50.hpp b/include/boost/fusion/include/vector50.hpp
index d3e89968..39240410 100644
--- a/include/boost/fusion/include/vector50.hpp
+++ b/include/boost/fusion/include/vector50.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VECTOR50)
+#ifndef FUSION_INCLUDE_VECTOR50
 #define FUSION_INCLUDE_VECTOR50
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/vector_fwd.hpp b/include/boost/fusion/include/vector_fwd.hpp
index f9c71a6f..d8eefba9 100644
--- a/include/boost/fusion/include/vector_fwd.hpp
+++ b/include/boost/fusion/include/vector_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VECTOR_FWD)
+#ifndef FUSION_INCLUDE_VECTOR_FWD
 #define FUSION_INCLUDE_VECTOR_FWD
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/vector_tie.hpp b/include/boost/fusion/include/vector_tie.hpp
index 390e3bfe..f7cd2f4b 100644
--- a/include/boost/fusion/include/vector_tie.hpp
+++ b/include/boost/fusion/include/vector_tie.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VECTOR_TIE)
+#ifndef FUSION_INCLUDE_VECTOR_TIE
 #define FUSION_INCLUDE_VECTOR_TIE
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/view.hpp b/include/boost/fusion/include/view.hpp
index 66ffa74e..38484b91 100644
--- a/include/boost/fusion/include/view.hpp
+++ b/include/boost/fusion/include/view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VIEW)
+#ifndef FUSION_INCLUDE_VIEW
 #define FUSION_INCLUDE_VIEW
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/void.hpp b/include/boost/fusion/include/void.hpp
index ee358fb1..6f8b8820 100644
--- a/include/boost/fusion/include/void.hpp
+++ b/include/boost/fusion/include/void.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_VOID)
+#ifndef FUSION_INCLUDE_VOID
 #define FUSION_INCLUDE_VOID
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/zip.hpp b/include/boost/fusion/include/zip.hpp
index 87b04bc3..1bb188e3 100644
--- a/include/boost/fusion/include/zip.hpp
+++ b/include/boost/fusion/include/zip.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ZIP)
+#ifndef FUSION_INCLUDE_ZIP
 #define FUSION_INCLUDE_ZIP
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/include/zip_view.hpp b/include/boost/fusion/include/zip_view.hpp
index bf0e9cfb..d6ee586f 100644
--- a/include/boost/fusion/include/zip_view.hpp
+++ b/include/boost/fusion/include/zip_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INCLUDE_ZIP_VIEW)
+#ifndef FUSION_INCLUDE_ZIP_VIEW
 #define FUSION_INCLUDE_ZIP_VIEW
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator.hpp b/include/boost/fusion/iterator.hpp
index 8aa15a39..a8abfe03 100644
--- a/include/boost/fusion/iterator.hpp
+++ b/include/boost/fusion/iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ITERATOR_10022005_0559)
+#ifndef FUSION_ITERATOR_10022005_0559
 #define FUSION_ITERATOR_10022005_0559
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/advance.hpp b/include/boost/fusion/iterator/advance.hpp
index f81596a7..90d6d7aa 100644
--- a/include/boost/fusion/iterator/advance.hpp
+++ b/include/boost/fusion/iterator/advance.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ADVANCE_09172005_1146)
+#ifndef FUSION_ADVANCE_09172005_1146
 #define FUSION_ADVANCE_09172005_1146
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/deref.hpp b/include/boost/fusion/iterator/deref.hpp
index c31962cb..79a66857 100644
--- a/include/boost/fusion/iterator/deref.hpp
+++ b/include/boost/fusion/iterator/deref.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DEREF_05042005_1019)
+#ifndef FUSION_DEREF_05042005_1019
 #define FUSION_DEREF_05042005_1019
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/detail/adapt_deref_traits.hpp b/include/boost/fusion/iterator/detail/adapt_deref_traits.hpp
index bee0934f..6a965409 100644
--- a/include/boost/fusion/iterator/detail/adapt_deref_traits.hpp
+++ b/include/boost/fusion/iterator/detail/adapt_deref_traits.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ADAPT_DEREF_TRAITS_05062005_0900)
+#ifndef FUSION_ADAPT_DEREF_TRAITS_05062005_0900
 #define FUSION_ADAPT_DEREF_TRAITS_05062005_0900
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/detail/adapt_value_traits.hpp b/include/boost/fusion/iterator/detail/adapt_value_traits.hpp
index e27a2f90..42d9915a 100644
--- a/include/boost/fusion/iterator/detail/adapt_value_traits.hpp
+++ b/include/boost/fusion/iterator/detail/adapt_value_traits.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ADAPT_VALUE_TRAITS_05062005_0859)
+#ifndef FUSION_ADAPT_VALUE_TRAITS_05062005_0859
 #define FUSION_ADAPT_VALUE_TRAITS_05062005_0859
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/detail/advance.hpp b/include/boost/fusion/iterator/detail/advance.hpp
index 7eb3bbbd..363c394e 100644
--- a/include/boost/fusion/iterator/detail/advance.hpp
+++ b/include/boost/fusion/iterator/detail/advance.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ADVANCE_09172005_1149)
+#ifndef FUSION_ADVANCE_09172005_1149
 #define FUSION_ADVANCE_09172005_1149
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/detail/distance.hpp b/include/boost/fusion/iterator/detail/distance.hpp
index 69849026..f2e86a44 100644
--- a/include/boost/fusion/iterator/detail/distance.hpp
+++ b/include/boost/fusion/iterator/detail/distance.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DISTANCE_09172005_0730)
+#ifndef FUSION_DISTANCE_09172005_0730
 #define FUSION_DISTANCE_09172005_0730
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/detail/segment_sequence.hpp b/include/boost/fusion/iterator/detail/segment_sequence.hpp
index 8b45cc13..5f98c497 100644
--- a/include/boost/fusion/iterator/detail/segment_sequence.hpp
+++ b/include/boost/fusion/iterator/detail/segment_sequence.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_SEQUENCE_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_SEQUENCE_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_SEQUENCE_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/detail/segmented_equal_to.hpp b/include/boost/fusion/iterator/detail/segmented_equal_to.hpp
index 77a080f2..802f72c5 100644
--- a/include/boost/fusion/iterator/detail/segmented_equal_to.hpp
+++ b/include/boost/fusion/iterator/detail/segmented_equal_to.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_EQUAL_TO_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_ITERATOR_EQUAL_TO_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_ITERATOR_EQUAL_TO_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/detail/segmented_iterator.hpp b/include/boost/fusion/iterator/detail/segmented_iterator.hpp
index 9e114155..e73e9399 100644
--- a/include/boost/fusion/iterator/detail/segmented_iterator.hpp
+++ b/include/boost/fusion/iterator/detail/segmented_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_SEGMENTED_ITERATOR_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_ITERATOR_SEGMENTED_ITERATOR_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_ITERATOR_SEGMENTED_ITERATOR_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/detail/segmented_next_impl.hpp b/include/boost/fusion/iterator/detail/segmented_next_impl.hpp
index 62502cee..4db2e022 100644
--- a/include/boost/fusion/iterator/detail/segmented_next_impl.hpp
+++ b/include/boost/fusion/iterator/detail/segmented_next_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_NEXT_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_ITERATOR_NEXT_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_ITERATOR_NEXT_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/distance.hpp b/include/boost/fusion/iterator/distance.hpp
index 7f993c0d..24470f2f 100644
--- a/include/boost/fusion/iterator/distance.hpp
+++ b/include/boost/fusion/iterator/distance.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DISTANCE_09172005_0721)
+#ifndef FUSION_DISTANCE_09172005_0721
 #define FUSION_DISTANCE_09172005_0721
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/equal_to.hpp b/include/boost/fusion/iterator/equal_to.hpp
index 191795e1..eb86c781 100644
--- a/include/boost/fusion/iterator/equal_to.hpp
+++ b/include/boost/fusion/iterator/equal_to.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_EQUAL_TO_05052005_1208)
+#ifndef FUSION_EQUAL_TO_05052005_1208
 #define FUSION_EQUAL_TO_05052005_1208
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/iterator_adapter.hpp b/include/boost/fusion/iterator/iterator_adapter.hpp
index 999d57b2..78707948 100644
--- a/include/boost/fusion/iterator/iterator_adapter.hpp
+++ b/include/boost/fusion/iterator/iterator_adapter.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ITERATOR_ADAPTER_08112011_0942)
+#ifndef FUSION_ITERATOR_ADAPTER_08112011_0942
 #define FUSION_ITERATOR_ADAPTER_08112011_0942
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/iterator_facade.hpp b/include/boost/fusion/iterator/iterator_facade.hpp
index 1760957e..890dcc09 100644
--- a/include/boost/fusion/iterator/iterator_facade.hpp
+++ b/include/boost/fusion/iterator/iterator_facade.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ITERATOR_FACADE_09252006_1011)
+#ifndef FUSION_ITERATOR_FACADE_09252006_1011
 #define FUSION_ITERATOR_FACADE_09252006_1011
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/mpl.hpp b/include/boost/fusion/iterator/mpl.hpp
index fdaf749c..c4b38766 100644
--- a/include/boost/fusion/iterator/mpl.hpp
+++ b/include/boost/fusion/iterator/mpl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ITERATOR_MPL_10022005_0557)
+#ifndef FUSION_ITERATOR_MPL_10022005_0557
 #define FUSION_ITERATOR_MPL_10022005_0557
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/mpl/convert_iterator.hpp b/include/boost/fusion/iterator/mpl/convert_iterator.hpp
index 3e17478e..086a86a9 100644
--- a/include/boost/fusion/iterator/mpl/convert_iterator.hpp
+++ b/include/boost/fusion/iterator/mpl/convert_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_ITERATOR_05062005_1218)
+#ifndef FUSION_CONVERT_ITERATOR_05062005_1218
 #define FUSION_CONVERT_ITERATOR_05062005_1218
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/mpl/fusion_iterator.hpp b/include/boost/fusion/iterator/mpl/fusion_iterator.hpp
index f8feacf6..7afdf535 100644
--- a/include/boost/fusion/iterator/mpl/fusion_iterator.hpp
+++ b/include/boost/fusion/iterator/mpl/fusion_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_FUSION_ITERATOR_10012005_1551)
+#ifndef FUSION_FUSION_ITERATOR_10012005_1551
 #define FUSION_FUSION_ITERATOR_10012005_1551
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/next.hpp b/include/boost/fusion/iterator/next.hpp
index d6ca3d66..b3f473af 100644
--- a/include/boost/fusion/iterator/next.hpp
+++ b/include/boost/fusion/iterator/next.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NEXT_05042005_1101)
+#ifndef FUSION_NEXT_05042005_1101
 #define FUSION_NEXT_05042005_1101
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/prior.hpp b/include/boost/fusion/iterator/prior.hpp
index 80e891c7..08a25a5b 100644
--- a/include/boost/fusion/iterator/prior.hpp
+++ b/include/boost/fusion/iterator/prior.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_PRIOR_05042005_1144)
+#ifndef FUSION_PRIOR_05042005_1144
 #define FUSION_PRIOR_05042005_1144
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/segmented_iterator.hpp b/include/boost/fusion/iterator/segmented_iterator.hpp
index b9aac07c..5a09e0c0 100644
--- a/include/boost/fusion/iterator/segmented_iterator.hpp
+++ b/include/boost/fusion/iterator/segmented_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_ITERATOR_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_ITERATOR_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/iterator/value_of.hpp b/include/boost/fusion/iterator/value_of.hpp
index 1408dc7a..0199946c 100644
--- a/include/boost/fusion/iterator/value_of.hpp
+++ b/include/boost/fusion/iterator/value_of.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_OF_05052005_1126)
+#ifndef FUSION_VALUE_OF_05052005_1126
 #define FUSION_VALUE_OF_05052005_1126
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl.hpp b/include/boost/fusion/mpl.hpp
index 705f0db7..cb5961b3 100644
--- a/include/boost/fusion/mpl.hpp
+++ b/include/boost/fusion/mpl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MPL_09172006_2049)
+#ifndef FUSION_MPL_09172006_2049
 #define FUSION_MPL_09172006_2049
 
 // The fusion <--> MPL link headers
diff --git a/include/boost/fusion/mpl/at.hpp b/include/boost/fusion/mpl/at.hpp
index ec4b257d..ea687f2a 100644
--- a/include/boost/fusion/mpl/at.hpp
+++ b/include/boost/fusion/mpl/at.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_AT_10022005_1616)
+#ifndef FUSION_AT_10022005_1616
 #define FUSION_AT_10022005_1616
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/back.hpp b/include/boost/fusion/mpl/back.hpp
index 631b4ea6..203c7413 100644
--- a/include/boost/fusion/mpl/back.hpp
+++ b/include/boost/fusion/mpl/back.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BACK_10022005_1620)
+#ifndef FUSION_BACK_10022005_1620
 #define FUSION_BACK_10022005_1620
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/begin.hpp b/include/boost/fusion/mpl/begin.hpp
index f97e82ce..a5dd450a 100644
--- a/include/boost/fusion/mpl/begin.hpp
+++ b/include/boost/fusion/mpl/begin.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BEGIN_10022005_1620)
+#ifndef FUSION_BEGIN_10022005_1620
 #define FUSION_BEGIN_10022005_1620
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/clear.hpp b/include/boost/fusion/mpl/clear.hpp
index 745ca0f9..832ab78e 100644
--- a/include/boost/fusion/mpl/clear.hpp
+++ b/include/boost/fusion/mpl/clear.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CLEAR_10022005_1817)
+#ifndef FUSION_CLEAR_10022005_1817
 #define FUSION_CLEAR_10022005_1817
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/detail/clear.hpp b/include/boost/fusion/mpl/detail/clear.hpp
index 9e640daa..65e8a172 100644
--- a/include/boost/fusion/mpl/detail/clear.hpp
+++ b/include/boost/fusion/mpl/detail/clear.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CLEAR_10022005_1442)
+#ifndef FUSION_CLEAR_10022005_1442
 #define FUSION_CLEAR_10022005_1442
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/empty.hpp b/include/boost/fusion/mpl/empty.hpp
index b058ae95..d3ac7ff3 100644
--- a/include/boost/fusion/mpl/empty.hpp
+++ b/include/boost/fusion/mpl/empty.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_EMPTY_10022005_1619)
+#ifndef FUSION_EMPTY_10022005_1619
 #define FUSION_EMPTY_10022005_1619
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/end.hpp b/include/boost/fusion/mpl/end.hpp
index e5aa8b96..caae6dcc 100644
--- a/include/boost/fusion/mpl/end.hpp
+++ b/include/boost/fusion/mpl/end.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_END_10022005_1619)
+#ifndef FUSION_END_10022005_1619
 #define FUSION_END_10022005_1619
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/erase.hpp b/include/boost/fusion/mpl/erase.hpp
index 82d4260f..b86f741c 100644
--- a/include/boost/fusion/mpl/erase.hpp
+++ b/include/boost/fusion/mpl/erase.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ERASE_10022005_1835)
+#ifndef FUSION_ERASE_10022005_1835
 #define FUSION_ERASE_10022005_1835
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/erase_key.hpp b/include/boost/fusion/mpl/erase_key.hpp
index 4dabf042..0868fd58 100644
--- a/include/boost/fusion/mpl/erase_key.hpp
+++ b/include/boost/fusion/mpl/erase_key.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ERASE_KEY_10022005_1907)
+#ifndef FUSION_ERASE_KEY_10022005_1907
 #define FUSION_ERASE_KEY_10022005_1907
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/front.hpp b/include/boost/fusion/mpl/front.hpp
index 45672a6d..549596c1 100644
--- a/include/boost/fusion/mpl/front.hpp
+++ b/include/boost/fusion/mpl/front.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_FRONT_10022005_1618)
+#ifndef FUSION_FRONT_10022005_1618
 #define FUSION_FRONT_10022005_1618
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/has_key.hpp b/include/boost/fusion/mpl/has_key.hpp
index f1e3359f..8f13db93 100644
--- a/include/boost/fusion/mpl/has_key.hpp
+++ b/include/boost/fusion/mpl/has_key.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_HAS_KEY_10022005_1617)
+#ifndef FUSION_HAS_KEY_10022005_1617
 #define FUSION_HAS_KEY_10022005_1617
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/insert.hpp b/include/boost/fusion/mpl/insert.hpp
index 45b5d87d..7096d7af 100644
--- a/include/boost/fusion/mpl/insert.hpp
+++ b/include/boost/fusion/mpl/insert.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INSERT_10022005_1837)
+#ifndef FUSION_INSERT_10022005_1837
 #define FUSION_INSERT_10022005_1837
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/insert_range.hpp b/include/boost/fusion/mpl/insert_range.hpp
index 31389ffc..2b2d49c9 100644
--- a/include/boost/fusion/mpl/insert_range.hpp
+++ b/include/boost/fusion/mpl/insert_range.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_INSERT_RANGE_10022005_1838)
+#ifndef FUSION_INSERT_RANGE_10022005_1838
 #define FUSION_INSERT_RANGE_10022005_1838
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/pop_back.hpp b/include/boost/fusion/mpl/pop_back.hpp
index d91ca8aa..a3947695 100644
--- a/include/boost/fusion/mpl/pop_back.hpp
+++ b/include/boost/fusion/mpl/pop_back.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_POP_BACK_10022005_1801)
+#ifndef FUSION_POP_BACK_10022005_1801
 #define FUSION_POP_BACK_10022005_1801
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/pop_front.hpp b/include/boost/fusion/mpl/pop_front.hpp
index 5f6533bc..87ee8430 100644
--- a/include/boost/fusion/mpl/pop_front.hpp
+++ b/include/boost/fusion/mpl/pop_front.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_POP_FRONT_10022005_1800)
+#ifndef FUSION_POP_FRONT_10022005_1800
 #define FUSION_POP_FRONT_10022005_1800
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/push_back.hpp b/include/boost/fusion/mpl/push_back.hpp
index 8af5456b..337421fe 100644
--- a/include/boost/fusion/mpl/push_back.hpp
+++ b/include/boost/fusion/mpl/push_back.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_PUSH_BACK_10022005_1647)
+#ifndef FUSION_PUSH_BACK_10022005_1647
 #define FUSION_PUSH_BACK_10022005_1647
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/push_front.hpp b/include/boost/fusion/mpl/push_front.hpp
index 5978fd6e..37e4c76d 100644
--- a/include/boost/fusion/mpl/push_front.hpp
+++ b/include/boost/fusion/mpl/push_front.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_PUSH_FRONT_10022005_1720)
+#ifndef FUSION_PUSH_FRONT_10022005_1720
 #define FUSION_PUSH_FRONT_10022005_1720
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/mpl/size.hpp b/include/boost/fusion/mpl/size.hpp
index c77e55fb..3e0380ac 100644
--- a/include/boost/fusion/mpl/size.hpp
+++ b/include/boost/fusion/mpl/size.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SIZE_10022005_1617)
+#ifndef FUSION_SIZE_10022005_1617
 #define FUSION_SIZE_10022005_1617
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence.hpp b/include/boost/fusion/sequence.hpp
index 4d5d8a2b..645d4f92 100644
--- a/include/boost/fusion/sequence.hpp
+++ b/include/boost/fusion/sequence.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_10022005_0559)
+#ifndef FUSION_SEQUENCE_10022005_0559
 #define FUSION_SEQUENCE_10022005_0559
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison.hpp b/include/boost/fusion/sequence/comparison.hpp
index d319f9e0..d474691c 100644
--- a/include/boost/fusion/sequence/comparison.hpp
+++ b/include/boost/fusion/sequence/comparison.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_COMPARISON_10022005_0615)
+#ifndef FUSION_SEQUENCE_COMPARISON_10022005_0615
 #define FUSION_SEQUENCE_COMPARISON_10022005_0615
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/detail/equal_to.hpp b/include/boost/fusion/sequence/comparison/detail/equal_to.hpp
index cffed6c3..1f039d13 100644
--- a/include/boost/fusion/sequence/comparison/detail/equal_to.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/equal_to.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_EQUAL_TO_05052005_1142)
+#ifndef FUSION_EQUAL_TO_05052005_1142
 #define FUSION_EQUAL_TO_05052005_1142
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/detail/greater.hpp b/include/boost/fusion/sequence/comparison/detail/greater.hpp
index d7626529..b36e2855 100644
--- a/include/boost/fusion/sequence/comparison/detail/greater.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/greater.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_GREATER_05052005_1142)
+#ifndef FUSION_GREATER_05052005_1142
 #define FUSION_GREATER_05052005_1142
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/detail/greater_equal.hpp b/include/boost/fusion/sequence/comparison/detail/greater_equal.hpp
index d15d88c4..ff2fda42 100644
--- a/include/boost/fusion/sequence/comparison/detail/greater_equal.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/greater_equal.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_GREATER_EQUAL_05052005_1142)
+#ifndef FUSION_GREATER_EQUAL_05052005_1142
 #define FUSION_GREATER_EQUAL_05052005_1142
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/detail/less.hpp b/include/boost/fusion/sequence/comparison/detail/less.hpp
index 04377d69..35665c57 100644
--- a/include/boost/fusion/sequence/comparison/detail/less.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/less.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_LESS_05052005_1141)
+#ifndef FUSION_LESS_05052005_1141
 #define FUSION_LESS_05052005_1141
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/detail/less_equal.hpp b/include/boost/fusion/sequence/comparison/detail/less_equal.hpp
index e61d33c4..bc6176e3 100644
--- a/include/boost/fusion/sequence/comparison/detail/less_equal.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/less_equal.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_LESS_EQUAL_05052005_1141)
+#ifndef FUSION_LESS_EQUAL_05052005_1141
 #define FUSION_LESS_EQUAL_05052005_1141
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/detail/not_equal_to.hpp b/include/boost/fusion/sequence/comparison/detail/not_equal_to.hpp
index 323b2ac9..c73d9fa9 100644
--- a/include/boost/fusion/sequence/comparison/detail/not_equal_to.hpp
+++ b/include/boost/fusion/sequence/comparison/detail/not_equal_to.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NOT_EQUAL_TO_05052005_1141)
+#ifndef FUSION_NOT_EQUAL_TO_05052005_1141
 #define FUSION_NOT_EQUAL_TO_05052005_1141
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/enable_comparison.hpp b/include/boost/fusion/sequence/comparison/enable_comparison.hpp
index b65c7552..55782c02 100644
--- a/include/boost/fusion/sequence/comparison/enable_comparison.hpp
+++ b/include/boost/fusion/sequence/comparison/enable_comparison.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ENABLE_COMPARISON_09232005_1958)
+#ifndef FUSION_ENABLE_COMPARISON_09232005_1958
 #define FUSION_ENABLE_COMPARISON_09232005_1958
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/equal_to.hpp b/include/boost/fusion/sequence/comparison/equal_to.hpp
index 283ffefc..6ab74a40 100644
--- a/include/boost/fusion/sequence/comparison/equal_to.hpp
+++ b/include/boost/fusion/sequence/comparison/equal_to.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_EQUAL_TO_05052005_0431)
+#ifndef FUSION_EQUAL_TO_05052005_0431
 #define FUSION_EQUAL_TO_05052005_0431
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/greater.hpp b/include/boost/fusion/sequence/comparison/greater.hpp
index fbbb7bfa..a38e4d85 100644
--- a/include/boost/fusion/sequence/comparison/greater.hpp
+++ b/include/boost/fusion/sequence/comparison/greater.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_GREATER_05052005_0432)
+#ifndef FUSION_GREATER_05052005_0432
 #define FUSION_GREATER_05052005_0432
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/greater_equal.hpp b/include/boost/fusion/sequence/comparison/greater_equal.hpp
index 7b91a888..792e3434 100644
--- a/include/boost/fusion/sequence/comparison/greater_equal.hpp
+++ b/include/boost/fusion/sequence/comparison/greater_equal.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_GREATER_EQUAL_05052005_0432)
+#ifndef FUSION_GREATER_EQUAL_05052005_0432
 #define FUSION_GREATER_EQUAL_05052005_0432
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/less.hpp b/include/boost/fusion/sequence/comparison/less.hpp
index b056552a..bfb3f8cd 100644
--- a/include/boost/fusion/sequence/comparison/less.hpp
+++ b/include/boost/fusion/sequence/comparison/less.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_LESS_05052005_0432)
+#ifndef FUSION_LESS_05052005_0432
 #define FUSION_LESS_05052005_0432
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/less_equal.hpp b/include/boost/fusion/sequence/comparison/less_equal.hpp
index c5dfa8d5..a9cc1965 100644
--- a/include/boost/fusion/sequence/comparison/less_equal.hpp
+++ b/include/boost/fusion/sequence/comparison/less_equal.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_LESS_EQUAL_05052005_0432)
+#ifndef FUSION_LESS_EQUAL_05052005_0432
 #define FUSION_LESS_EQUAL_05052005_0432
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/comparison/not_equal_to.hpp b/include/boost/fusion/sequence/comparison/not_equal_to.hpp
index fc2fef33..5b8a6d5c 100644
--- a/include/boost/fusion/sequence/comparison/not_equal_to.hpp
+++ b/include/boost/fusion/sequence/comparison/not_equal_to.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NOT_EQUAL_TO_05052005_0431)
+#ifndef FUSION_NOT_EQUAL_TO_05052005_0431
 #define FUSION_NOT_EQUAL_TO_05052005_0431
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/convert.hpp b/include/boost/fusion/sequence/convert.hpp
index 534d991a..5c297632 100644
--- a/include/boost/fusion/sequence/convert.hpp
+++ b/include/boost/fusion/sequence/convert.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CONVERT_10022005_1442)
+#ifndef FUSION_CONVERT_10022005_1442
 #define FUSION_CONVERT_10022005_1442
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/hash.hpp b/include/boost/fusion/sequence/hash.hpp
index bc5b1499..b3095543 100644
--- a/include/boost/fusion/sequence/hash.hpp
+++ b/include/boost/fusion/sequence/hash.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_HASH_23072014_1017)
+#ifndef FUSION_HASH_23072014_1017
 #define FUSION_HASH_23072014_1017
 
 #include <boost/functional/hash.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic.hpp b/include/boost/fusion/sequence/intrinsic.hpp
index d3e5af0b..fca44cf2 100644
--- a/include/boost/fusion/sequence/intrinsic.hpp
+++ b/include/boost/fusion/sequence/intrinsic.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_INTRINSIC_10022005_0618)
+#ifndef FUSION_SEQUENCE_INTRINSIC_10022005_0618
 #define FUSION_SEQUENCE_INTRINSIC_10022005_0618
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/at.hpp b/include/boost/fusion/sequence/intrinsic/at.hpp
index 348a2e5f..0da0e006 100644
--- a/include/boost/fusion/sequence/intrinsic/at.hpp
+++ b/include/boost/fusion/sequence/intrinsic/at.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_AT_05042005_0722)
+#ifndef FUSION_AT_05042005_0722
 #define FUSION_AT_05042005_0722
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/at_c.hpp b/include/boost/fusion/sequence/intrinsic/at_c.hpp
index 327798c0..364c60ee 100644
--- a/include/boost/fusion/sequence/intrinsic/at_c.hpp
+++ b/include/boost/fusion/sequence/intrinsic/at_c.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_AT_C_08252008_0308)
+#ifndef FUSION_AT_C_08252008_0308
 #define FUSION_AT_C_08252008_0308
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/at_key.hpp b/include/boost/fusion/sequence/intrinsic/at_key.hpp
index 9454cb56..a02d0b2d 100644
--- a/include/boost/fusion/sequence/intrinsic/at_key.hpp
+++ b/include/boost/fusion/sequence/intrinsic/at_key.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_KEY_20060304_1755)
+#ifndef BOOST_FUSION_AT_KEY_20060304_1755
 #define BOOST_FUSION_AT_KEY_20060304_1755
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/back.hpp b/include/boost/fusion/sequence/intrinsic/back.hpp
index 3f998a7d..bf7d105c 100644
--- a/include/boost/fusion/sequence/intrinsic/back.hpp
+++ b/include/boost/fusion/sequence/intrinsic/back.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BACK_09162005_0350)
+#ifndef FUSION_BACK_09162005_0350
 #define FUSION_BACK_09162005_0350
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/begin.hpp b/include/boost/fusion/sequence/intrinsic/begin.hpp
index 79c14d74..722b9d5b 100644
--- a/include/boost/fusion/sequence/intrinsic/begin.hpp
+++ b/include/boost/fusion/sequence/intrinsic/begin.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BEGIN_04052005_1132)
+#ifndef FUSION_BEGIN_04052005_1132
 #define FUSION_BEGIN_04052005_1132
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp b/include/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp
index ec20ac41..03fd13e8 100644
--- a/include/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp
+++ b/include/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_BEGIN_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_BEGIN_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_BEGIN_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp b/include/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp
index 12d9e24c..cc2c38b4 100644
--- a/include/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp
+++ b/include/boost/fusion/sequence/intrinsic/detail/segmented_begin_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_BEGIN_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_BEGIN_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_BEGIN_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp b/include/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
index 55419ed8..75ebde02 100644
--- a/include/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
+++ b/include/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_END_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_END_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_END_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp b/include/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp
index da48649a..644c270f 100644
--- a/include/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp
+++ b/include/boost/fusion/sequence/intrinsic/detail/segmented_end_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_END_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_END_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_END_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp b/include/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp
index 4defcedd..512b01cb 100644
--- a/include/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp
+++ b/include/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_SIZE_08112006_1141)
+#ifndef BOOST_FUSION_SEGMENTED_SIZE_08112006_1141
 #define BOOST_FUSION_SEGMENTED_SIZE_08112006_1141
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/empty.hpp b/include/boost/fusion/sequence/intrinsic/empty.hpp
index 6a0dbe74..10bda5f9 100644
--- a/include/boost/fusion/sequence/intrinsic/empty.hpp
+++ b/include/boost/fusion/sequence/intrinsic/empty.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_EMPTY_09162005_0335)
+#ifndef FUSION_EMPTY_09162005_0335
 #define FUSION_EMPTY_09162005_0335
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/end.hpp b/include/boost/fusion/sequence/intrinsic/end.hpp
index b342468f..9cf386a3 100644
--- a/include/boost/fusion/sequence/intrinsic/end.hpp
+++ b/include/boost/fusion/sequence/intrinsic/end.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_END_04052005_1141)
+#ifndef FUSION_END_04052005_1141
 #define FUSION_END_04052005_1141
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/front.hpp b/include/boost/fusion/sequence/intrinsic/front.hpp
index 8971298a..a9b6e883 100644
--- a/include/boost/fusion/sequence/intrinsic/front.hpp
+++ b/include/boost/fusion/sequence/intrinsic/front.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_FRONT_09162005_0343)
+#ifndef FUSION_FRONT_09162005_0343
 #define FUSION_FRONT_09162005_0343
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/has_key.hpp b/include/boost/fusion/sequence/intrinsic/has_key.hpp
index d69a82fb..2f3e5287 100644
--- a/include/boost/fusion/sequence/intrinsic/has_key.hpp
+++ b/include/boost/fusion/sequence/intrinsic/has_key.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_HAS_KEY_09232005_1454)
+#ifndef FUSION_HAS_KEY_09232005_1454
 #define FUSION_HAS_KEY_09232005_1454
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/segments.hpp b/include/boost/fusion/sequence/intrinsic/segments.hpp
index 41501a96..9ad403d9 100644
--- a/include/boost/fusion/sequence/intrinsic/segments.hpp
+++ b/include/boost/fusion/sequence/intrinsic/segments.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTS_04052005_1141)
+#ifndef BOOST_FUSION_SEGMENTS_04052005_1141
 #define BOOST_FUSION_SEGMENTS_04052005_1141
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/size.hpp b/include/boost/fusion/sequence/intrinsic/size.hpp
index 97aa3ef9..b19a5ec6 100644
--- a/include/boost/fusion/sequence/intrinsic/size.hpp
+++ b/include/boost/fusion/sequence/intrinsic/size.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SIZE_05052005_0214)
+#ifndef FUSION_SIZE_05052005_0214
 #define FUSION_SIZE_05052005_0214
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/swap.hpp b/include/boost/fusion/sequence/intrinsic/swap.hpp
index 8c49dc48..e697ba06 100644
--- a/include/boost/fusion/sequence/intrinsic/swap.hpp
+++ b/include/boost/fusion/sequence/intrinsic/swap.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SWAP_20070501_1956)
+#ifndef BOOST_FUSION_SWAP_20070501_1956
 #define BOOST_FUSION_SWAP_20070501_1956
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/value_at.hpp b/include/boost/fusion/sequence/intrinsic/value_at.hpp
index 152f0c94..09933e67 100644
--- a/include/boost/fusion/sequence/intrinsic/value_at.hpp
+++ b/include/boost/fusion/sequence/intrinsic/value_at.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_AT_05052005_0229)
+#ifndef FUSION_VALUE_AT_05052005_0229
 #define FUSION_VALUE_AT_05052005_0229
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic/value_at_key.hpp b/include/boost/fusion/sequence/intrinsic/value_at_key.hpp
index 76baf1b8..741d3446 100644
--- a/include/boost/fusion/sequence/intrinsic/value_at_key.hpp
+++ b/include/boost/fusion/sequence/intrinsic/value_at_key.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_AT_KEY_05052005_0229)
+#ifndef FUSION_VALUE_AT_KEY_05052005_0229
 #define FUSION_VALUE_AT_KEY_05052005_0229
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/intrinsic_fwd.hpp b/include/boost/fusion/sequence/intrinsic_fwd.hpp
index a6354ea3..0ded1e00 100644
--- a/include/boost/fusion/sequence/intrinsic_fwd.hpp
+++ b/include/boost/fusion/sequence/intrinsic_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEQUENCE_INTRINSIC_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEQUENCE_INTRINSIC_FWD_HPP_INCLUDED
 #define BOOST_FUSION_SEQUENCE_INTRINSIC_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/io.hpp b/include/boost/fusion/sequence/io.hpp
index b0baf426..80cb795b 100644
--- a/include/boost/fusion/sequence/io.hpp
+++ b/include/boost/fusion/sequence/io.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_IO_10032005_0836)
+#ifndef FUSION_SEQUENCE_IO_10032005_0836
 #define FUSION_SEQUENCE_IO_10032005_0836
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/io/detail/in.hpp b/include/boost/fusion/sequence/io/detail/in.hpp
index d409a406..610300fb 100644
--- a/include/boost/fusion/sequence/io/detail/in.hpp
+++ b/include/boost/fusion/sequence/io/detail/in.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_IN_05052005_0121)
+#ifndef FUSION_IN_05052005_0121
 #define FUSION_IN_05052005_0121
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/io/detail/manip.hpp b/include/boost/fusion/sequence/io/detail/manip.hpp
index 3cda2ea9..df0b282b 100644
--- a/include/boost/fusion/sequence/io/detail/manip.hpp
+++ b/include/boost/fusion/sequence/io/detail/manip.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MANIP_05052005_1200)
+#ifndef FUSION_MANIP_05052005_1200
 #define FUSION_MANIP_05052005_1200
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/io/detail/out.hpp b/include/boost/fusion/sequence/io/detail/out.hpp
index 43eb2bf2..8043c6fb 100644
--- a/include/boost/fusion/sequence/io/detail/out.hpp
+++ b/include/boost/fusion/sequence/io/detail/out.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_OUT_05052005_0121)
+#ifndef FUSION_OUT_05052005_0121
 #define FUSION_OUT_05052005_0121
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/io/in.hpp b/include/boost/fusion/sequence/io/in.hpp
index 98e24122..489f82cc 100644
--- a/include/boost/fusion/sequence/io/in.hpp
+++ b/include/boost/fusion/sequence/io/in.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_IN_05042005_0120)
+#ifndef BOOST_IN_05042005_0120
 #define BOOST_IN_05042005_0120
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/io/out.hpp b/include/boost/fusion/sequence/io/out.hpp
index edb6be38..6b701a6c 100644
--- a/include/boost/fusion/sequence/io/out.hpp
+++ b/include/boost/fusion/sequence/io/out.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_OUT_05042005_0120)
+#ifndef BOOST_OUT_05042005_0120
 #define BOOST_OUT_05042005_0120
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/sequence/sequence_facade.hpp b/include/boost/fusion/sequence/sequence_facade.hpp
index ff578a00..bc90ea5c 100644
--- a/include/boost/fusion/sequence/sequence_facade.hpp
+++ b/include/boost/fusion/sequence/sequence_facade.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_FACADE_09252006_1044)
+#ifndef FUSION_SEQUENCE_FACADE_09252006_1044
 #define FUSION_SEQUENCE_FACADE_09252006_1044
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support.hpp b/include/boost/fusion/support.hpp
index 11e17eb5..e0528461 100644
--- a/include/boost/fusion/support.hpp
+++ b/include/boost/fusion/support.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SUPPORT_10022005_0545)
+#ifndef FUSION_SUPPORT_10022005_0545
 #define FUSION_SUPPORT_10022005_0545
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/category_of.hpp b/include/boost/fusion/support/category_of.hpp
index 7397c45a..274b2e01 100644
--- a/include/boost/fusion/support/category_of.hpp
+++ b/include/boost/fusion/support/category_of.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_CATEGORY_OF_07202005_0308)
+#ifndef FUSION_CATEGORY_OF_07202005_0308
 #define FUSION_CATEGORY_OF_07202005_0308
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/config.hpp b/include/boost/fusion/support/config.hpp
index 7c87adeb..0c1dd884 100644
--- a/include/boost/fusion/support/config.hpp
+++ b/include/boost/fusion/support/config.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SUPPORT_CONFIG_01092014_1718)
+#ifndef FUSION_SUPPORT_CONFIG_01092014_1718
 #define FUSION_SUPPORT_CONFIG_01092014_1718
 
 #include <boost/config.hpp>
diff --git a/include/boost/fusion/support/deduce.hpp b/include/boost/fusion/support/deduce.hpp
index ee7e3dc9..c60d26dc 100644
--- a/include/boost/fusion/support/deduce.hpp
+++ b/include/boost/fusion/support/deduce.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_SUPPORT_DEDUCE_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SUPPORT_DEDUCE_HPP_INCLUDED
 #define BOOST_FUSION_SUPPORT_DEDUCE_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/deduce_sequence.hpp b/include/boost/fusion/support/deduce_sequence.hpp
index 24f4e2d8..10285542 100644
--- a/include/boost/fusion/support/deduce_sequence.hpp
+++ b/include/boost/fusion/support/deduce_sequence.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_SUPPORT_DEDUCE_SEQUENCE_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SUPPORT_DEDUCE_SEQUENCE_HPP_INCLUDED
 #define BOOST_FUSION_SUPPORT_DEDUCE_SEQUENCE_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/detail/access.hpp b/include/boost/fusion/support/detail/access.hpp
index ab885383..8c83f8c9 100644
--- a/include/boost/fusion/support/detail/access.hpp
+++ b/include/boost/fusion/support/detail/access.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ACCESS_04182005_0737)
+#ifndef FUSION_ACCESS_04182005_0737
 #define FUSION_ACCESS_04182005_0737
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/detail/as_fusion_element.hpp b/include/boost/fusion/support/detail/as_fusion_element.hpp
index 08f4db92..4d3cd855 100644
--- a/include/boost/fusion/support/detail/as_fusion_element.hpp
+++ b/include/boost/fusion/support/detail/as_fusion_element.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_AS_FUSION_ELEMENT_05052005_0338)
+#ifndef FUSION_AS_FUSION_ELEMENT_05052005_0338
 #define FUSION_AS_FUSION_ELEMENT_05052005_0338
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/detail/is_mpl_sequence.hpp b/include/boost/fusion/support/detail/is_mpl_sequence.hpp
index 16b6db12..a7e74e8d 100644
--- a/include/boost/fusion/support/detail/is_mpl_sequence.hpp
+++ b/include/boost/fusion/support/detail/is_mpl_sequence.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DETAIL_IS_MPL_SEQUENCE_29122006_1105)
+#ifndef FUSION_DETAIL_IS_MPL_SEQUENCE_29122006_1105
 #define FUSION_DETAIL_IS_MPL_SEQUENCE_29122006_1105
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/detail/mpl_iterator_category.hpp b/include/boost/fusion/support/detail/mpl_iterator_category.hpp
index fcb00a01..9dfe8bcb 100644
--- a/include/boost/fusion/support/detail/mpl_iterator_category.hpp
+++ b/include/boost/fusion/support/detail/mpl_iterator_category.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_MPL_ITERATOR_CATEGORY_07212005_0923)
+#ifndef FUSION_MPL_ITERATOR_CATEGORY_07212005_0923
 #define FUSION_MPL_ITERATOR_CATEGORY_07212005_0923
 
 namespace boost { namespace mpl 
diff --git a/include/boost/fusion/support/detail/segmented_fold_until_impl.hpp b/include/boost/fusion/support/detail/segmented_fold_until_impl.hpp
index 6a388bf8..724ffe1b 100644
--- a/include/boost/fusion/support/detail/segmented_fold_until_impl.hpp
+++ b/include/boost/fusion/support/detail/segmented_fold_until_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_FOLD_UNTIL_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_FOLD_UNTIL_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_FOLD_UNTIL_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/is_iterator.hpp b/include/boost/fusion/support/is_iterator.hpp
index b48aab8c..49e893ba 100644
--- a/include/boost/fusion/support/is_iterator.hpp
+++ b/include/boost/fusion/support/is_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_IS_ITERATOR_05062005_1219)
+#ifndef FUSION_IS_ITERATOR_05062005_1219
 #define FUSION_IS_ITERATOR_05062005_1219
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/is_segmented.hpp b/include/boost/fusion/support/is_segmented.hpp
index 1326feb3..7a5bfe26 100644
--- a/include/boost/fusion/support/is_segmented.hpp
+++ b/include/boost/fusion/support/is_segmented.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_IS_SEGMENTED_03202006_0015)
+#ifndef FUSION_IS_SEGMENTED_03202006_0015
 #define FUSION_IS_SEGMENTED_03202006_0015
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/is_sequence.hpp b/include/boost/fusion/support/is_sequence.hpp
index 95a9423f..ffb1959c 100644
--- a/include/boost/fusion/support/is_sequence.hpp
+++ b/include/boost/fusion/support/is_sequence.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_IS_SEQUENCE_05052005_1002)
+#ifndef FUSION_IS_SEQUENCE_05052005_1002
 #define FUSION_IS_SEQUENCE_05052005_1002
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/is_view.hpp b/include/boost/fusion/support/is_view.hpp
index b2b52c42..07bdc3ad 100644
--- a/include/boost/fusion/support/is_view.hpp
+++ b/include/boost/fusion/support/is_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_IS_VIEW_03202006_0015)
+#ifndef FUSION_IS_VIEW_03202006_0015
 #define FUSION_IS_VIEW_03202006_0015
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/iterator_base.hpp b/include/boost/fusion/support/iterator_base.hpp
index 5d8ce3ab..ad7bc180 100644
--- a/include/boost/fusion/support/iterator_base.hpp
+++ b/include/boost/fusion/support/iterator_base.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ITERATOR_BASE_05042005_1008)
+#ifndef FUSION_ITERATOR_BASE_05042005_1008
 #define FUSION_ITERATOR_BASE_05042005_1008
 
 #include <boost/config.hpp>
diff --git a/include/boost/fusion/support/pair.hpp b/include/boost/fusion/support/pair.hpp
index 7d406c63..a4fd89ad 100644
--- a/include/boost/fusion/support/pair.hpp
+++ b/include/boost/fusion/support/pair.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_PAIR_07222005_1203)
+#ifndef FUSION_PAIR_07222005_1203
 #define FUSION_PAIR_07222005_1203
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/segmented_fold_until.hpp b/include/boost/fusion/support/segmented_fold_until.hpp
index 8fb09ee3..aa6c7056 100644
--- a/include/boost/fusion/support/segmented_fold_until.hpp
+++ b/include/boost/fusion/support/segmented_fold_until.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_FOLD_UNTIL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_FOLD_UNTIL_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_FOLD_UNTIL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/sequence_base.hpp b/include/boost/fusion/support/sequence_base.hpp
index 2f9320e6..ed4761e2 100644
--- a/include/boost/fusion/support/sequence_base.hpp
+++ b/include/boost/fusion/support/sequence_base.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_BASE_04182005_0737)
+#ifndef FUSION_SEQUENCE_BASE_04182005_0737
 #define FUSION_SEQUENCE_BASE_04182005_0737
 
 #include <boost/config.hpp>
diff --git a/include/boost/fusion/support/tag_of.hpp b/include/boost/fusion/support/tag_of.hpp
index f9e57856..26097cf3 100644
--- a/include/boost/fusion/support/tag_of.hpp
+++ b/include/boost/fusion/support/tag_of.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_TAG_OF_09232005_0845)
+#ifndef FUSION_TAG_OF_09232005_0845
 #define FUSION_TAG_OF_09232005_0845
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/tag_of_fwd.hpp b/include/boost/fusion/support/tag_of_fwd.hpp
index ba434d93..7a9859b5 100644
--- a/include/boost/fusion/support/tag_of_fwd.hpp
+++ b/include/boost/fusion/support/tag_of_fwd.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_TAG_OF_FWD_31122005_1445)
+#ifndef BOOST_FUSION_TAG_OF_FWD_31122005_1445
 #define BOOST_FUSION_TAG_OF_FWD_31122005_1445
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/support/unused.hpp b/include/boost/fusion/support/unused.hpp
index 8947adea..70aabb07 100644
--- a/include/boost/fusion/support/unused.hpp
+++ b/include/boost/fusion/support/unused.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SUPPORT_UNUSED_20070305_1038)
+#ifndef BOOST_FUSION_SUPPORT_UNUSED_20070305_1038
 #define BOOST_FUSION_SUPPORT_UNUSED_20070305_1038
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/support/void.hpp b/include/boost/fusion/support/void.hpp
index 76505190..9800e2d1 100644
--- a/include/boost/fusion/support/void.hpp
+++ b/include/boost/fusion/support/void.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SUPPORT_VOID_20070706_2125)
+#ifndef BOOST_FUSION_SUPPORT_VOID_20070706_2125
 #define BOOST_FUSION_SUPPORT_VOID_20070706_2125
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/tuple.hpp b/include/boost/fusion/tuple.hpp
index 49dac1d7..94465fb9 100644
--- a/include/boost/fusion/tuple.hpp
+++ b/include/boost/fusion/tuple.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_TUPLE_10032005_0806)
+#ifndef FUSION_TUPLE_10032005_0806
 #define FUSION_TUPLE_10032005_0806
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/tuple/detail/make_tuple.hpp b/include/boost/fusion/tuple/detail/make_tuple.hpp
index f87ea5a2..2e7e9008 100644
--- a/include/boost/fusion/tuple/detail/make_tuple.hpp
+++ b/include/boost/fusion/tuple/detail/make_tuple.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_MAKE_TUPLE_10032005_0843)
+#ifndef FUSION_MAKE_TUPLE_10032005_0843
 #define FUSION_MAKE_TUPLE_10032005_0843
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/tuple/detail/tuple.hpp b/include/boost/fusion/tuple/detail/tuple.hpp
index 45408f06..122d41fe 100644
--- a/include/boost/fusion/tuple/detail/tuple.hpp
+++ b/include/boost/fusion/tuple/detail/tuple.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_TUPLE_10032005_0810)
+#ifndef FUSION_TUPLE_10032005_0810
 #define FUSION_TUPLE_10032005_0810
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/tuple/detail/tuple_expand.hpp b/include/boost/fusion/tuple/detail/tuple_expand.hpp
index 3909f647..d8da227e 100644
--- a/include/boost/fusion/tuple/detail/tuple_expand.hpp
+++ b/include/boost/fusion/tuple/detail/tuple_expand.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_TUPLE_EXPAND_10032005_0815)
+#ifndef FUSION_TUPLE_EXPAND_10032005_0815
 #define FUSION_TUPLE_EXPAND_10032005_0815
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/tuple/detail/tuple_fwd.hpp b/include/boost/fusion/tuple/detail/tuple_fwd.hpp
index ef6bdfe8..3d88be48 100644
--- a/include/boost/fusion/tuple/detail/tuple_fwd.hpp
+++ b/include/boost/fusion/tuple/detail/tuple_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_TUPLE_FORWARD_10032005_0956)
+#ifndef FUSION_TUPLE_FORWARD_10032005_0956
 #define FUSION_TUPLE_FORWARD_10032005_0956
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/tuple/detail/tuple_tie.hpp b/include/boost/fusion/tuple/detail/tuple_tie.hpp
index b650d1cc..0d15e5a6 100644
--- a/include/boost/fusion/tuple/detail/tuple_tie.hpp
+++ b/include/boost/fusion/tuple/detail/tuple_tie.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #ifndef BOOST_PP_IS_ITERATING
-#if !defined(FUSION_TUPLE_TIE_10032005_0846)
+#ifndef FUSION_TUPLE_TIE_10032005_0846
 #define FUSION_TUPLE_TIE_10032005_0846
 
 #include <boost/preprocessor/iterate.hpp>
diff --git a/include/boost/fusion/view.hpp b/include/boost/fusion/view.hpp
index 0d8ded42..91c72915 100644
--- a/include/boost/fusion/view.hpp
+++ b/include/boost/fusion/view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_VIEW_10022005_0620)
+#ifndef FUSION_SEQUENCE_VIEW_10022005_0620
 #define FUSION_SEQUENCE_VIEW_10022005_0620
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/detail/strictest_traversal.hpp b/include/boost/fusion/view/detail/strictest_traversal.hpp
index 4092ea4d..e800bed7 100644
--- a/include/boost/fusion/view/detail/strictest_traversal.hpp
+++ b/include/boost/fusion/view/detail/strictest_traversal.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_STRICTEST_TRAVERSAL_20060123_2101)
+#ifndef FUSION_STRICTEST_TRAVERSAL_20060123_2101
 #define FUSION_STRICTEST_TRAVERSAL_20060123_2101
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/filter_view.hpp b/include/boost/fusion/view/filter_view.hpp
index 2226026b..a773a15e 100644
--- a/include/boost/fusion/view/filter_view.hpp
+++ b/include/boost/fusion/view/filter_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_VIEW_FILTER_VIEW_10022005_0608)
+#ifndef FUSION_SEQUENCE_VIEW_FILTER_VIEW_10022005_0608
 #define FUSION_SEQUENCE_VIEW_FILTER_VIEW_10022005_0608
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/filter_view/detail/begin_impl.hpp b/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
index 3ce439a4..0eca59e6 100644
--- a/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/begin_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BEGIN_IMPL_05062005_0903)
+#ifndef FUSION_BEGIN_IMPL_05062005_0903
 #define FUSION_BEGIN_IMPL_05062005_0903
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/view/filter_view/detail/deref_impl.hpp b/include/boost/fusion/view/filter_view/detail/deref_impl.hpp
index d122dc53..53d03cf0 100644
--- a/include/boost/fusion/view/filter_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/deref_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DEREF_IMPL_05062005_0905)
+#ifndef FUSION_DEREF_IMPL_05062005_0905
 #define FUSION_DEREF_IMPL_05062005_0905
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/filter_view/detail/end_impl.hpp b/include/boost/fusion/view/filter_view/detail/end_impl.hpp
index 1a2a5ba4..e530123d 100644
--- a/include/boost/fusion/view/filter_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/end_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_END_IMPL_05062005_0906)
+#ifndef FUSION_END_IMPL_05062005_0906
 #define FUSION_END_IMPL_05062005_0906
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/view/filter_view/detail/equal_to_impl.hpp b/include/boost/fusion/view/filter_view/detail/equal_to_impl.hpp
index 2836a251..77705c49 100644
--- a/include/boost/fusion/view/filter_view/detail/equal_to_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/equal_to_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_EQUAL_TO_IMPL_02012005_2133)
+#ifndef BOOST_FUSION_EQUAL_TO_IMPL_02012005_2133
 #define BOOST_FUSION_EQUAL_TO_IMPL_02012005_2133
 
 namespace boost { namespace fusion 
diff --git a/include/boost/fusion/view/filter_view/detail/next_impl.hpp b/include/boost/fusion/view/filter_view/detail/next_impl.hpp
index bd1404b9..0fe23559 100644
--- a/include/boost/fusion/view/filter_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/next_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NEXT_IMPL_06052005_0900)
+#ifndef FUSION_NEXT_IMPL_06052005_0900
 #define FUSION_NEXT_IMPL_06052005_0900
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/filter_view/detail/size_impl.hpp b/include/boost/fusion/view/filter_view/detail/size_impl.hpp
index f6cf17cb..c137e223 100644
--- a/include/boost/fusion/view/filter_view/detail/size_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/size_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SIZE_IMPL_09232005_1058)
+#ifndef FUSION_SIZE_IMPL_09232005_1058
 #define FUSION_SIZE_IMPL_09232005_1058
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/filter_view/detail/value_of_impl.hpp b/include/boost/fusion/view/filter_view/detail/value_of_impl.hpp
index b460a48b..a847c604 100644
--- a/include/boost/fusion/view/filter_view/detail/value_of_impl.hpp
+++ b/include/boost/fusion/view/filter_view/detail/value_of_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_OF_IMPL_05062005_0857)
+#ifndef FUSION_VALUE_OF_IMPL_05062005_0857
 #define FUSION_VALUE_OF_IMPL_05062005_0857
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/filter_view/filter_view.hpp b/include/boost/fusion/view/filter_view/filter_view.hpp
index c4e05e8d..87dc2391 100644
--- a/include/boost/fusion/view/filter_view/filter_view.hpp
+++ b/include/boost/fusion/view/filter_view/filter_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_FILTER_VIEW_HPP)
+#ifndef FUSION_SEQUENCE_FILTER_VIEW_HPP
 #define FUSION_SEQUENCE_FILTER_VIEW_HPP
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/filter_view/filter_view_iterator.hpp b/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
index 7a907f50..b7253eab 100644
--- a/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
+++ b/include/boost/fusion/view/filter_view/filter_view_iterator.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_FILTER_VIEW_ITERATOR_05062005_0849)
+#ifndef FUSION_FILTER_VIEW_ITERATOR_05062005_0849
 #define FUSION_FILTER_VIEW_ITERATOR_05062005_0849
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/identity_view.hpp b/include/boost/fusion/view/identity_view.hpp
index 72414cbe..e2beb033 100644
--- a/include/boost/fusion/view/identity_view.hpp
+++ b/include/boost/fusion/view/identity_view.hpp
@@ -4,7 +4,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_SEQUENCE_IDENTITY_VIEW_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEQUENCE_IDENTITY_VIEW_HPP_INCLUDED
 #define BOOST_FUSION_SEQUENCE_IDENTITY_VIEW_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/identity_view/identity_view.hpp b/include/boost/fusion/view/identity_view/identity_view.hpp
index 4cd0c093..98410bc6 100644
--- a/include/boost/fusion/view/identity_view/identity_view.hpp
+++ b/include/boost/fusion/view/identity_view/identity_view.hpp
@@ -4,7 +4,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_IDENTITY_VIEW_HPP_INCLUDED)
+#ifndef BOOST_FUSION_IDENTITY_VIEW_HPP_INCLUDED
 #define BOOST_FUSION_IDENTITY_VIEW_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/iterator_range.hpp b/include/boost/fusion/view/iterator_range.hpp
index 78d6ffad..22a39ec8 100644
--- a/include/boost/fusion/view/iterator_range.hpp
+++ b/include/boost/fusion/view/iterator_range.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_VIEW_ITERATOR_RANGE_10022005_0610)
+#ifndef FUSION_SEQUENCE_VIEW_ITERATOR_RANGE_10022005_0610
 #define FUSION_SEQUENCE_VIEW_ITERATOR_RANGE_10022005_0610
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/iterator_range/detail/at_impl.hpp b/include/boost/fusion/view/iterator_range/detail/at_impl.hpp
index 20f17583..852853e6 100644
--- a/include/boost/fusion/view/iterator_range/detail/at_impl.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/at_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_ITERATOR_RANGE_AT_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_ITERATOR_RANGE_AT_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_ITERATOR_RANGE_AT_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp b/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp
index 7e00dec0..2edd2734 100644
--- a/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BEGIN_IMPL_05062005_1226)
+#ifndef FUSION_BEGIN_IMPL_05062005_1226
 #define FUSION_BEGIN_IMPL_05062005_1226
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/iterator_range/detail/end_impl.hpp b/include/boost/fusion/view/iterator_range/detail/end_impl.hpp
index b76aa91c..0042206e 100644
--- a/include/boost/fusion/view/iterator_range/detail/end_impl.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/end_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_END_IMPL_05062005_1226)
+#ifndef FUSION_END_IMPL_05062005_1226
 #define FUSION_END_IMPL_05062005_1226
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp b/include/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp
index 88f4358b..4527c9b2 100644
--- a/include/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/is_segmented_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ITERATOR_RANGE_IS_SEGMENTED_HPP_INCLUDED)
+#ifndef BOOST_FUSION_ITERATOR_RANGE_IS_SEGMENTED_HPP_INCLUDED
 #define BOOST_FUSION_ITERATOR_RANGE_IS_SEGMENTED_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp b/include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
index 4b2c11eb..4b1adc8a 100644
--- a/include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_RANGE_HPP_INCLUDED)
+#ifndef BOOST_FUSION_SEGMENTED_ITERATOR_RANGE_HPP_INCLUDED
 #define BOOST_FUSION_SEGMENTED_ITERATOR_RANGE_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/iterator_range/detail/segments_impl.hpp b/include/boost/fusion/view/iterator_range/detail/segments_impl.hpp
index bbf4c45a..223012eb 100644
--- a/include/boost/fusion/view/iterator_range/detail/segments_impl.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/segments_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ITERATOR_RANGE_SEGMENTS_HPP_INCLUDED)
+#ifndef BOOST_FUSION_ITERATOR_RANGE_SEGMENTS_HPP_INCLUDED
 #define BOOST_FUSION_ITERATOR_RANGE_SEGMENTS_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/iterator_range/detail/size_impl.hpp b/include/boost/fusion/view/iterator_range/detail/size_impl.hpp
index 0678e5dd..c8a0df8d 100644
--- a/include/boost/fusion/view/iterator_range/detail/size_impl.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/size_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_ITERATOR_RANGE_SIZE_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_ITERATOR_RANGE_SIZE_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_ITERATOR_RANGE_SIZE_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/iterator_range/detail/value_at_impl.hpp b/include/boost/fusion/view/iterator_range/detail/value_at_impl.hpp
index 652b8da1..e91b4d4b 100644
--- a/include/boost/fusion/view/iterator_range/detail/value_at_impl.hpp
+++ b/include/boost/fusion/view/iterator_range/detail/value_at_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_ITERATOR_RANGE_VALUE_AT_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_ITERATOR_RANGE_VALUE_AT_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_ITERATOR_RANGE_VALUE_AT_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/iterator_range/iterator_range.hpp b/include/boost/fusion/view/iterator_range/iterator_range.hpp
index 272abcd9..bd4e228b 100644
--- a/include/boost/fusion/view/iterator_range/iterator_range.hpp
+++ b/include/boost/fusion/view/iterator_range/iterator_range.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ITERATOR_RANGE_05062005_1224)
+#ifndef FUSION_ITERATOR_RANGE_05062005_1224
 #define FUSION_ITERATOR_RANGE_05062005_1224
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/joint_view.hpp b/include/boost/fusion/view/joint_view.hpp
index 58be4b86..8b78b36d 100644
--- a/include/boost/fusion/view/joint_view.hpp
+++ b/include/boost/fusion/view/joint_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_VIEW_JOINT_VIEW_10022005_0610)
+#ifndef FUSION_SEQUENCE_VIEW_JOINT_VIEW_10022005_0610
 #define FUSION_SEQUENCE_VIEW_JOINT_VIEW_10022005_0610
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/joint_view/detail/begin_impl.hpp b/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
index b7a961a7..097c3b78 100644
--- a/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/joint_view/detail/begin_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BEGIN_IMPL_07162005_0115)
+#ifndef FUSION_BEGIN_IMPL_07162005_0115
 #define FUSION_BEGIN_IMPL_07162005_0115
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/joint_view/detail/deref_impl.hpp b/include/boost/fusion/view/joint_view/detail/deref_impl.hpp
index 0e1e39ff..68c82d44 100644
--- a/include/boost/fusion/view/joint_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/joint_view/detail/deref_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DEREF_IMPL_07162005_0137)
+#ifndef FUSION_DEREF_IMPL_07162005_0137
 #define FUSION_DEREF_IMPL_07162005_0137
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/joint_view/detail/end_impl.hpp b/include/boost/fusion/view/joint_view/detail/end_impl.hpp
index 0b4b9b0a..0397cb0e 100644
--- a/include/boost/fusion/view/joint_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/joint_view/detail/end_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_END_IMPL_07162005_0128)
+#ifndef FUSION_END_IMPL_07162005_0128
 #define FUSION_END_IMPL_07162005_0128
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/joint_view/detail/next_impl.hpp b/include/boost/fusion/view/joint_view/detail/next_impl.hpp
index a7d18757..2e442e5f 100644
--- a/include/boost/fusion/view/joint_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/joint_view/detail/next_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NEXT_IMPL_07162005_0136)
+#ifndef FUSION_NEXT_IMPL_07162005_0136
 #define FUSION_NEXT_IMPL_07162005_0136
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/joint_view/detail/value_of_impl.hpp b/include/boost/fusion/view/joint_view/detail/value_of_impl.hpp
index f058a60c..00ef474a 100644
--- a/include/boost/fusion/view/joint_view/detail/value_of_impl.hpp
+++ b/include/boost/fusion/view/joint_view/detail/value_of_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_IMPL_07162005_0132)
+#ifndef FUSION_VALUE_IMPL_07162005_0132
 #define FUSION_VALUE_IMPL_07162005_0132
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/joint_view/joint_view.hpp b/include/boost/fusion/view/joint_view/joint_view.hpp
index 1cf6d0d5..8b85e62a 100644
--- a/include/boost/fusion/view/joint_view/joint_view.hpp
+++ b/include/boost/fusion/view/joint_view/joint_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_JOINT_VIEW_07162005_0140)
+#ifndef FUSION_JOINT_VIEW_07162005_0140
 #define FUSION_JOINT_VIEW_07162005_0140
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/joint_view/joint_view_fwd.hpp b/include/boost/fusion/view/joint_view/joint_view_fwd.hpp
index c3e3b45e..d330452c 100644
--- a/include/boost/fusion/view/joint_view/joint_view_fwd.hpp
+++ b/include/boost/fusion/view/joint_view/joint_view_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_JOINT_VIEW_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_JOINT_VIEW_FWD_HPP_INCLUDED
 #define BOOST_FUSION_JOINT_VIEW_FWD_HPP_INCLUDED
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/view/joint_view/joint_view_iterator.hpp b/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
index 1b446189..06005d18 100644
--- a/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
+++ b/include/boost/fusion/view/joint_view/joint_view_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_JOINT_VIEW_ITERATOR_07162005_0140)
+#ifndef FUSION_JOINT_VIEW_ITERATOR_07162005_0140
 #define FUSION_JOINT_VIEW_ITERATOR_07162005_0140
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview.hpp b/include/boost/fusion/view/nview.hpp
index b8b51cee..30ff4cd6 100644
--- a/include/boost/fusion/view/nview.hpp
+++ b/include/boost/fusion/view/nview.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NVIEW_SEP_23_2009_1107PM)
+#ifndef FUSION_NVIEW_SEP_23_2009_1107PM
 #define FUSION_NVIEW_SEP_23_2009_1107PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/advance_impl.hpp b/include/boost/fusion/view/nview/detail/advance_impl.hpp
index c4641433..aa6c6c14 100644
--- a/include/boost/fusion/view/nview/detail/advance_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/advance_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_NVIEW_ADVANCE_IMPL_SEP_24_2009_0212PM)
+#ifndef BOOST_FUSION_NVIEW_ADVANCE_IMPL_SEP_24_2009_0212PM
 #define BOOST_FUSION_NVIEW_ADVANCE_IMPL_SEP_24_2009_0212PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/at_impl.hpp b/include/boost/fusion/view/nview/detail/at_impl.hpp
index 9f8c1637..37606a38 100644
--- a/include/boost/fusion/view/nview/detail/at_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/at_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_NVIEW_AT_IMPL_SEP_24_2009_0225PM)
+#ifndef BOOST_FUSION_NVIEW_AT_IMPL_SEP_24_2009_0225PM
 #define BOOST_FUSION_NVIEW_AT_IMPL_SEP_24_2009_0225PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/begin_impl.hpp b/include/boost/fusion/view/nview/detail/begin_impl.hpp
index 99e6319e..23aca4cb 100644
--- a/include/boost/fusion/view/nview/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/begin_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_NVIEW_BEGIN_IMPL_SEP_23_2009_1036PM)
+#ifndef BOOST_FUSION_NVIEW_BEGIN_IMPL_SEP_23_2009_1036PM
 #define BOOST_FUSION_NVIEW_BEGIN_IMPL_SEP_23_2009_1036PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/cpp03/nview_impl.hpp b/include/boost/fusion/view/nview/detail/cpp03/nview_impl.hpp
index 0bcea9bb..5e5ef777 100644
--- a/include/boost/fusion/view/nview/detail/cpp03/nview_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/cpp03/nview_impl.hpp
@@ -7,7 +7,7 @@
 
 #ifndef BOOST_PP_IS_ITERATING
 
-#if !defined(BOOST_FUSION_NVIEW_IMPL_SEP_23_2009_1017PM)
+#ifndef BOOST_FUSION_NVIEW_IMPL_SEP_23_2009_1017PM
 #define BOOST_FUSION_NVIEW_IMPL_SEP_23_2009_1017PM
 
 #include <climits>
diff --git a/include/boost/fusion/view/nview/detail/deref_impl.hpp b/include/boost/fusion/view/nview/detail/deref_impl.hpp
index 57654aa0..808992d3 100644
--- a/include/boost/fusion/view/nview/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/deref_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_NVIEW_DEREF_IMPL_SEP_24_2009_0818AM)
+#ifndef BOOST_FUSION_NVIEW_DEREF_IMPL_SEP_24_2009_0818AM
 #define BOOST_FUSION_NVIEW_DEREF_IMPL_SEP_24_2009_0818AM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/distance_impl.hpp b/include/boost/fusion/view/nview/detail/distance_impl.hpp
index a036300f..7cc563dc 100644
--- a/include/boost/fusion/view/nview/detail/distance_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/distance_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_NVIEW_DISTANCE_IMPL_SEP_23_2009_0328PM)
+#ifndef BOOST_FUSION_NVIEW_DISTANCE_IMPL_SEP_23_2009_0328PM
 #define BOOST_FUSION_NVIEW_DISTANCE_IMPL_SEP_23_2009_0328PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/end_impl.hpp b/include/boost/fusion/view/nview/detail/end_impl.hpp
index 810aea91..43ad1cb0 100644
--- a/include/boost/fusion/view/nview/detail/end_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/end_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_NVIEW_END_IMPL_SEP_24_2009_0140PM)
+#ifndef BOOST_FUSION_NVIEW_END_IMPL_SEP_24_2009_0140PM
 #define BOOST_FUSION_NVIEW_END_IMPL_SEP_24_2009_0140PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/equal_to_impl.hpp b/include/boost/fusion/view/nview/detail/equal_to_impl.hpp
index 4b04788b..8bb3617e 100644
--- a/include/boost/fusion/view/nview/detail/equal_to_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/equal_to_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_NVIEW_ITERATOR_SEP_24_2009_0329PM)
+#ifndef BOOST_FUSION_NVIEW_ITERATOR_SEP_24_2009_0329PM
 #define BOOST_FUSION_NVIEW_ITERATOR_SEP_24_2009_0329PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/next_impl.hpp b/include/boost/fusion/view/nview/detail/next_impl.hpp
index 821d9c37..65f06db6 100644
--- a/include/boost/fusion/view/nview/detail/next_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/next_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_NVIEW_NEXT_IMPL_SEP_24_2009_0116PM)
+#ifndef BOOST_FUSION_NVIEW_NEXT_IMPL_SEP_24_2009_0116PM
 #define BOOST_FUSION_NVIEW_NEXT_IMPL_SEP_24_2009_0116PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/prior_impl.hpp b/include/boost/fusion/view/nview/detail/prior_impl.hpp
index 29b63f56..86c91a90 100644
--- a/include/boost/fusion/view/nview/detail/prior_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/prior_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_NVIEW_PRIOR_IMPL_SEP_24_2009_0142PM)
+#ifndef BOOST_FUSION_NVIEW_PRIOR_IMPL_SEP_24_2009_0142PM
 #define BOOST_FUSION_NVIEW_PRIOR_IMPL_SEP_24_2009_0142PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/size_impl.hpp b/include/boost/fusion/view/nview/detail/size_impl.hpp
index 57e67653..80abcc96 100644
--- a/include/boost/fusion/view/nview/detail/size_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/size_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NVIEW_SIZE_IMPL_OCT_06_2009_0525PM)
+#ifndef FUSION_NVIEW_SIZE_IMPL_OCT_06_2009_0525PM
 #define FUSION_NVIEW_SIZE_IMPL_OCT_06_2009_0525PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/value_at_impl.hpp b/include/boost/fusion/view/nview/detail/value_at_impl.hpp
index 2afe9bee..929ff949 100644
--- a/include/boost/fusion/view/nview/detail/value_at_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/value_at_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_NVIEW_VALUE_AT_IMPL_SEP_24_2009_0234PM)
+#ifndef BOOST_FUSION_NVIEW_VALUE_AT_IMPL_SEP_24_2009_0234PM
 #define BOOST_FUSION_NVIEW_VALUE_AT_IMPL_SEP_24_2009_0234PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/detail/value_of_impl.hpp b/include/boost/fusion/view/nview/detail/value_of_impl.hpp
index dc48e61f..a0deeede 100644
--- a/include/boost/fusion/view/nview/detail/value_of_impl.hpp
+++ b/include/boost/fusion/view/nview/detail/value_of_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_VALUE_OF_PRIOR_IMPL_SEP_24_2009_0158PM)
+#ifndef BOOST_FUSION_VALUE_OF_PRIOR_IMPL_SEP_24_2009_0158PM
 #define BOOST_FUSION_VALUE_OF_PRIOR_IMPL_SEP_24_2009_0158PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/nview.hpp b/include/boost/fusion/view/nview/nview.hpp
index e5a4be8a..06cbf008 100644
--- a/include/boost/fusion/view/nview/nview.hpp
+++ b/include/boost/fusion/view/nview/nview.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_NVIEW_SEP_23_2009_0948PM)
+#ifndef BOOST_FUSION_NVIEW_SEP_23_2009_0948PM
 #define BOOST_FUSION_NVIEW_SEP_23_2009_0948PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/nview/nview_iterator.hpp b/include/boost/fusion/view/nview/nview_iterator.hpp
index 5e5cea27..18baa206 100644
--- a/include/boost/fusion/view/nview/nview_iterator.hpp
+++ b/include/boost/fusion/view/nview/nview_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_NVIEW_ITERATOR_SEP_23_2009_0948PM)
+#ifndef BOOST_FUSION_NVIEW_ITERATOR_SEP_23_2009_0948PM
 #define BOOST_FUSION_NVIEW_ITERATOR_SEP_23_2009_0948PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/repetitive_view.hpp b/include/boost/fusion/view/repetitive_view.hpp
index abc2fda5..3737fe4f 100644
--- a/include/boost/fusion/view/repetitive_view.hpp
+++ b/include/boost/fusion/view/repetitive_view.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_REPETITIVE_VIEW_HPP_INCLUDED)
+#ifndef BOOST_FUSION_REPETITIVE_VIEW_HPP_INCLUDED
 #define BOOST_FUSION_REPETITIVE_VIEW_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
index 9a27156c..a82a2690 100644
--- a/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_REPETITIVE_VIEW_BEGIN_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_REPETITIVE_VIEW_BEGIN_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_REPETITIVE_VIEW_BEGIN_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
index c96ef5eb..4ae0f184 100644
--- a/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_REPETITIVE_VIEW_DEREF_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_REPETITIVE_VIEW_DEREF_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_REPETITIVE_VIEW_DEREF_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
index af1fa6ee..c5da389e 100644
--- a/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_REPETITIVE_VIEW_END_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_REPETITIVE_VIEW_END_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_REPETITIVE_VIEW_END_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp
index fab75408..cffb96a2 100644
--- a/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_REPETITIVE_VIEW_NEXT_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_REPETITIVE_VIEW_NEXT_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_REPETITIVE_VIEW_NEXT_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/repetitive_view/detail/value_of_impl.hpp b/include/boost/fusion/view/repetitive_view/detail/value_of_impl.hpp
index 234c9fb7..2bc73a6e 100644
--- a/include/boost/fusion/view/repetitive_view/detail/value_of_impl.hpp
+++ b/include/boost/fusion/view/repetitive_view/detail/value_of_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_REPETITIVE_VIEW_VALUE_OF_IMPL_HPP_INCLUDED)
+#ifndef BOOST_FUSION_REPETITIVE_VIEW_VALUE_OF_IMPL_HPP_INCLUDED
 #define BOOST_FUSION_REPETITIVE_VIEW_VALUE_OF_IMPL_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp b/include/boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp
index 24e146c0..fe262512 100644
--- a/include/boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp
+++ b/include/boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_REPETITIVE_VIEW_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_REPETITIVE_VIEW_FWD_HPP_INCLUDED
 #define BOOST_FUSION_REPETITIVE_VIEW_FWD_HPP_INCLUDED
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/view/reverse_view.hpp b/include/boost/fusion/view/reverse_view.hpp
index c0c1fd7c..5a2ca0f8 100644
--- a/include/boost/fusion/view/reverse_view.hpp
+++ b/include/boost/fusion/view/reverse_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_VIEW_REVERSE_VIEW_10022005_0612)
+#ifndef FUSION_SEQUENCE_VIEW_REVERSE_VIEW_10022005_0612
 #define FUSION_SEQUENCE_VIEW_REVERSE_VIEW_10022005_0612
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp b/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp
index 42b3bd19..0937db51 100644
--- a/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ADVANCE_IMPL_14122005_2015)
+#ifndef FUSION_ADVANCE_IMPL_14122005_2015
 #define FUSION_ADVANCE_IMPL_14122005_2015
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp b/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp
index 913725ed..7a2db5ab 100644
--- a/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BEGIN_IMPL_07202005_0849)
+#ifndef FUSION_BEGIN_IMPL_07202005_0849
 #define FUSION_BEGIN_IMPL_07202005_0849
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp b/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp
index 9ea60d81..5d8494e1 100644
--- a/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DEREF_IMPL_07202005_0851)
+#ifndef FUSION_DEREF_IMPL_07202005_0851
 #define FUSION_DEREF_IMPL_07202005_0851
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp b/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp
index 49436c26..972856ff 100644
--- a/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DISTANCE_IMPL_14122005_2104)
+#ifndef FUSION_DISTANCE_IMPL_14122005_2104
 #define FUSION_DISTANCE_IMPL_14122005_2104
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/reverse_view/detail/end_impl.hpp b/include/boost/fusion/view/reverse_view/detail/end_impl.hpp
index 06602c0e..7aefb531 100644
--- a/include/boost/fusion/view/reverse_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/end_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_END_IMPL_07202005_0851)
+#ifndef FUSION_END_IMPL_07202005_0851
 #define FUSION_END_IMPL_07202005_0851
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/view/reverse_view/detail/next_impl.hpp b/include/boost/fusion/view/reverse_view/detail/next_impl.hpp
index 58c1f5f7..5d85d8b3 100644
--- a/include/boost/fusion/view/reverse_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/next_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NEXT_IMPL_07202005_0856)
+#ifndef FUSION_NEXT_IMPL_07202005_0856
 #define FUSION_NEXT_IMPL_07202005_0856
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp b/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp
index 69d18501..5911610e 100644
--- a/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_PRIOR_IMPL_07202005_0857)
+#ifndef FUSION_PRIOR_IMPL_07202005_0857
 #define FUSION_PRIOR_IMPL_07202005_0857
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/reverse_view/detail/value_of_impl.hpp b/include/boost/fusion/view/reverse_view/detail/value_of_impl.hpp
index ea171ba9..323ef098 100644
--- a/include/boost/fusion/view/reverse_view/detail/value_of_impl.hpp
+++ b/include/boost/fusion/view/reverse_view/detail/value_of_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_OF_IMPL_07202005_0900)
+#ifndef FUSION_VALUE_OF_IMPL_07202005_0900
 #define FUSION_VALUE_OF_IMPL_07202005_0900
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/reverse_view/reverse_view.hpp b/include/boost/fusion/view/reverse_view/reverse_view.hpp
index cde4206f..e7b767df 100644
--- a/include/boost/fusion/view/reverse_view/reverse_view.hpp
+++ b/include/boost/fusion/view/reverse_view/reverse_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_REVERSE_VIEW_07202005_0836)
+#ifndef FUSION_REVERSE_VIEW_07202005_0836
 #define FUSION_REVERSE_VIEW_07202005_0836
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp b/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
index 02307f5a..83285308 100644
--- a/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
+++ b/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_REVERSE_VIEW_ITERATOR_07202005_0835)
+#ifndef FUSION_REVERSE_VIEW_ITERATOR_07202005_0835
 #define FUSION_REVERSE_VIEW_ITERATOR_07202005_0835
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view.hpp b/include/boost/fusion/view/single_view.hpp
index a3a3e918..cf485e50 100644
--- a/include/boost/fusion/view/single_view.hpp
+++ b/include/boost/fusion/view/single_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SINGLE_VIEW_03192006_2216)
+#ifndef FUSION_SINGLE_VIEW_03192006_2216
 #define FUSION_SINGLE_VIEW_03192006_2216
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/detail/advance_impl.hpp b/include/boost/fusion/view/single_view/detail/advance_impl.hpp
index 5af22321..865e15cb 100644
--- a/include/boost/fusion/view/single_view/detail/advance_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/advance_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_SINGLE_VIEW_ADVANCE_IMPL_JUL_07_2011_1348PM)
+#ifndef BOOST_FUSION_SINGLE_VIEW_ADVANCE_IMPL_JUL_07_2011_1348PM
 #define BOOST_FUSION_SINGLE_VIEW_ADVANCE_IMPL_JUL_07_2011_1348PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/detail/at_impl.hpp b/include/boost/fusion/view/single_view/detail/at_impl.hpp
index 6c4c7579..9958cab5 100644
--- a/include/boost/fusion/view/single_view/detail/at_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/at_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_SINGLE_VIEW_AT_IMPL_JUL_07_2011_1348PM)
+#ifndef BOOST_FUSION_SINGLE_VIEW_AT_IMPL_JUL_07_2011_1348PM
 #define BOOST_FUSION_SINGLE_VIEW_AT_IMPL_JUL_07_2011_1348PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/detail/begin_impl.hpp b/include/boost/fusion/view/single_view/detail/begin_impl.hpp
index d6bca8f6..d9b8daf5 100644
--- a/include/boost/fusion/view/single_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/begin_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SINGLE_VIEW_BEGIN_IMPL_05052005_0305)
+#ifndef BOOST_FUSION_SINGLE_VIEW_BEGIN_IMPL_05052005_0305
 #define BOOST_FUSION_SINGLE_VIEW_BEGIN_IMPL_05052005_0305
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/detail/deref_impl.hpp b/include/boost/fusion/view/single_view/detail/deref_impl.hpp
index acb90d83..e5ac12cb 100644
--- a/include/boost/fusion/view/single_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/deref_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SINGLE_VIEW_DEREF_IMPL_05052005_0258)
+#ifndef BOOST_FUSION_SINGLE_VIEW_DEREF_IMPL_05052005_0258
 #define BOOST_FUSION_SINGLE_VIEW_DEREF_IMPL_05052005_0258
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/detail/distance_impl.hpp b/include/boost/fusion/view/single_view/detail/distance_impl.hpp
index 9cd85fdc..ccde43fb 100644
--- a/include/boost/fusion/view/single_view/detail/distance_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/distance_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_SINGLE_VIEW_DISTANCE_IMPL_JUL_07_2011_1348PM)
+#ifndef BOOST_FUSION_SINGLE_VIEW_DISTANCE_IMPL_JUL_07_2011_1348PM
 #define BOOST_FUSION_SINGLE_VIEW_DISTANCE_IMPL_JUL_07_2011_1348PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/detail/end_impl.hpp b/include/boost/fusion/view/single_view/detail/end_impl.hpp
index d662ac24..904b5a01 100644
--- a/include/boost/fusion/view/single_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/end_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SINGLE_VIEW_END_IMPL_05052005_0332)
+#ifndef BOOST_FUSION_SINGLE_VIEW_END_IMPL_05052005_0332
 #define BOOST_FUSION_SINGLE_VIEW_END_IMPL_05052005_0332
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/detail/equal_to_impl.hpp b/include/boost/fusion/view/single_view/detail/equal_to_impl.hpp
index a14b4c51..1d480526 100644
--- a/include/boost/fusion/view/single_view/detail/equal_to_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/equal_to_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_SINGLE_VIEW_ITERATOR_JUL_07_2011_1348PM)
+#ifndef BOOST_FUSION_SINGLE_VIEW_ITERATOR_JUL_07_2011_1348PM
 #define BOOST_FUSION_SINGLE_VIEW_ITERATOR_JUL_07_2011_1348PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/detail/next_impl.hpp b/include/boost/fusion/view/single_view/detail/next_impl.hpp
index 55a4ff11..304a7ab2 100644
--- a/include/boost/fusion/view/single_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/next_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SINGLE_VIEW_NEXT_IMPL_05052005_0331)
+#ifndef BOOST_FUSION_SINGLE_VIEW_NEXT_IMPL_05052005_0331
 #define BOOST_FUSION_SINGLE_VIEW_NEXT_IMPL_05052005_0331
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/detail/prior_impl.hpp b/include/boost/fusion/view/single_view/detail/prior_impl.hpp
index 823f96e5..1ba73b5b 100644
--- a/include/boost/fusion/view/single_view/detail/prior_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/prior_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SINGLE_VIEW_PRIOR_IMPL_JUL_07_2011_1348PM)
+#ifndef BOOST_FUSION_SINGLE_VIEW_PRIOR_IMPL_JUL_07_2011_1348PM
 #define BOOST_FUSION_SINGLE_VIEW_PRIOR_IMPL_JUL_07_2011_1348PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/detail/size_impl.hpp b/include/boost/fusion/view/single_view/detail/size_impl.hpp
index eba89cdd..66bed2d8 100644
--- a/include/boost/fusion/view/single_view/detail/size_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/size_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SINGLE_VIEW_SIZE_IMPL_JUL_07_2011_1348PM)
+#ifndef FUSION_SINGLE_VIEW_SIZE_IMPL_JUL_07_2011_1348PM
 #define FUSION_SINGLE_VIEW_SIZE_IMPL_JUL_07_2011_1348PM
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/view/single_view/detail/value_at_impl.hpp b/include/boost/fusion/view/single_view/detail/value_at_impl.hpp
index b5721b84..78c8e677 100644
--- a/include/boost/fusion/view/single_view/detail/value_at_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/value_at_impl.hpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_SINGLE_VIEW_VALUE_AT_IMPL_JUL_07_2011_1348PM)
+#ifndef BOOST_FUSION_SINGLE_VIEW_VALUE_AT_IMPL_JUL_07_2011_1348PM
 #define BOOST_FUSION_SINGLE_VIEW_VALUE_AT_IMPL_JUL_07_2011_1348PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/detail/value_of_impl.hpp b/include/boost/fusion/view/single_view/detail/value_of_impl.hpp
index dfb345c8..97b51815 100644
--- a/include/boost/fusion/view/single_view/detail/value_of_impl.hpp
+++ b/include/boost/fusion/view/single_view/detail/value_of_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SINGLE_VIEW_VALUE_OF_IMPL_05052005_0324)
+#ifndef BOOST_FUSION_SINGLE_VIEW_VALUE_OF_IMPL_05052005_0324
 #define BOOST_FUSION_SINGLE_VIEW_VALUE_OF_IMPL_05052005_0324
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/single_view.hpp b/include/boost/fusion/view/single_view/single_view.hpp
index a4437902..d4374e51 100644
--- a/include/boost/fusion/view/single_view/single_view.hpp
+++ b/include/boost/fusion/view/single_view/single_view.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SINGLE_VIEW_05052005_0335)
+#ifndef BOOST_FUSION_SINGLE_VIEW_05052005_0335
 #define BOOST_FUSION_SINGLE_VIEW_05052005_0335
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/single_view/single_view_iterator.hpp b/include/boost/fusion/view/single_view/single_view_iterator.hpp
index 38c25ed5..a2fab34d 100644
--- a/include/boost/fusion/view/single_view/single_view_iterator.hpp
+++ b/include/boost/fusion/view/single_view/single_view_iterator.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SINGLE_VIEW_ITERATOR_05052005_0340)
+#ifndef BOOST_FUSION_SINGLE_VIEW_ITERATOR_05052005_0340
 #define BOOST_FUSION_SINGLE_VIEW_ITERATOR_05052005_0340
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view.hpp b/include/boost/fusion/view/transform_view.hpp
index 57ff612a..3698c73f 100644
--- a/include/boost/fusion/view/transform_view.hpp
+++ b/include/boost/fusion/view/transform_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_VIEW_TRANSFORM_VIEW_10022005_0612)
+#ifndef FUSION_SEQUENCE_VIEW_TRANSFORM_VIEW_10022005_0612
 #define FUSION_SEQUENCE_VIEW_TRANSFORM_VIEW_10022005_0612
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/advance_impl.hpp b/include/boost/fusion/view/transform_view/detail/advance_impl.hpp
index 12dfabec..3e142e01 100644
--- a/include/boost/fusion/view/transform_view/detail/advance_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/advance_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ADVANCE_IMPL_13122005_1906)
+#ifndef FUSION_ADVANCE_IMPL_13122005_1906
 #define FUSION_ADVANCE_IMPL_13122005_1906
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/at_impl.hpp b/include/boost/fusion/view/transform_view/detail/at_impl.hpp
index 3723e86a..6b1b8b33 100644
--- a/include/boost/fusion/view/transform_view/detail/at_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/at_impl.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_20061029_1946)
+#ifndef BOOST_FUSION_AT_IMPL_20061029_1946
 #define BOOST_FUSION_AT_IMPL_20061029_1946
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/begin_impl.hpp b/include/boost/fusion/view/transform_view/detail/begin_impl.hpp
index da3f763a..41825672 100644
--- a/include/boost/fusion/view/transform_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/begin_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BEGIN_IMPL_07162005_1031)
+#ifndef FUSION_BEGIN_IMPL_07162005_1031
 #define FUSION_BEGIN_IMPL_07162005_1031
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/deref_data_impl.hpp b/include/boost/fusion/view/transform_view/detail/deref_data_impl.hpp
index 95671ece..09709385 100644
--- a/include/boost/fusion/view/transform_view/detail/deref_data_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/deref_data_impl.hpp
@@ -4,7 +4,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_TRANSFORM_VIEW_DEREF_DATA_IMPL_JAN_9_2022_0354PM)
+#ifndef BOOST_FUSION_TRANSFORM_VIEW_DEREF_DATA_IMPL_JAN_9_2022_0354PM
 #define BOOST_FUSION_TRANSFORM_VIEW_DEREF_DATA_IMPL_JAN_9_2022_0354PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/deref_impl.hpp b/include/boost/fusion/view/transform_view/detail/deref_impl.hpp
index b94d4a80..a641a7b5 100644
--- a/include/boost/fusion/view/transform_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/deref_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DEREF_IMPL_07162005_1026)
+#ifndef FUSION_DEREF_IMPL_07162005_1026
 #define FUSION_DEREF_IMPL_07162005_1026
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/distance_impl.hpp b/include/boost/fusion/view/transform_view/detail/distance_impl.hpp
index 64443055..8e9352c2 100644
--- a/include/boost/fusion/view/transform_view/detail/distance_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/distance_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DISTANCE_IMPL_13122005_2139)
+#ifndef FUSION_DISTANCE_IMPL_13122005_2139
 #define FUSION_DISTANCE_IMPL_13122005_2139
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/end_impl.hpp b/include/boost/fusion/view/transform_view/detail/end_impl.hpp
index 3a84e040..6f8a1cbe 100644
--- a/include/boost/fusion/view/transform_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/end_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_END_IMPL_07162005_1028)
+#ifndef FUSION_END_IMPL_07162005_1028
 #define FUSION_END_IMPL_07162005_1028
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/equal_to_impl.hpp b/include/boost/fusion/view/transform_view/detail/equal_to_impl.hpp
index c4c6815e..1d72b11f 100644
--- a/include/boost/fusion/view/transform_view/detail/equal_to_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/equal_to_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_TRANSFORM_VIEW_ITERATOR_20070127_0957)
+#ifndef BOOST_FUSION_TRANSFORM_VIEW_ITERATOR_20070127_0957
 #define BOOST_FUSION_TRANSFORM_VIEW_ITERATOR_20070127_0957
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/key_of_impl.hpp b/include/boost/fusion/view/transform_view/detail/key_of_impl.hpp
index 2800e11d..9dca1b3a 100644
--- a/include/boost/fusion/view/transform_view/detail/key_of_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/key_of_impl.hpp
@@ -4,7 +4,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_TRANSFORM_VIEW_KEY_OF_IMPL_JAN_9_2022_0354PM)
+#ifndef BOOST_FUSION_TRANSFORM_VIEW_KEY_OF_IMPL_JAN_9_2022_0354PM
 #define BOOST_FUSION_TRANSFORM_VIEW_KEY_OF_IMPL_JAN_9_2022_0354PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/next_impl.hpp b/include/boost/fusion/view/transform_view/detail/next_impl.hpp
index ce22d19e..33c6462b 100644
--- a/include/boost/fusion/view/transform_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/next_impl.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NEXT_IMPL_07162005_1029)
+#ifndef FUSION_NEXT_IMPL_07162005_1029
 #define FUSION_NEXT_IMPL_07162005_1029
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/prior_impl.hpp b/include/boost/fusion/view/transform_view/detail/prior_impl.hpp
index ed6d742e..bcdd4098 100644
--- a/include/boost/fusion/view/transform_view/detail/prior_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/prior_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_PREV_IMPL_13122005_2110)
+#ifndef FUSION_PREV_IMPL_13122005_2110
 #define FUSION_PREV_IMPL_13122005_2110
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp b/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp
index 932dcf63..05a0c20c 100644
--- a/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_IMPL_20061101_0745)
+#ifndef BOOST_FUSION_VALUE_AT_IMPL_20061101_0745
 #define BOOST_FUSION_VALUE_AT_IMPL_20061101_0745
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/value_of_data_impl.hpp b/include/boost/fusion/view/transform_view/detail/value_of_data_impl.hpp
index dc3f1e55..bd691e5f 100644
--- a/include/boost/fusion/view/transform_view/detail/value_of_data_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/value_of_data_impl.hpp
@@ -4,7 +4,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_TRANSFORM_VIEW_VALUE_OF_IMPL_JAN_9_2022_0354PM)
+#ifndef BOOST_FUSION_TRANSFORM_VIEW_VALUE_OF_IMPL_JAN_9_2022_0354PM
 #define BOOST_FUSION_TRANSFORM_VIEW_VALUE_OF_IMPL_JAN_9_2022_0354PM
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp b/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp
index 2bf4a508..08ccfd62 100644
--- a/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp
+++ b/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_OF_IMPL_07162005_1030)
+#ifndef FUSION_VALUE_OF_IMPL_07162005_1030
 #define FUSION_VALUE_OF_IMPL_07162005_1030
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/transform_view.hpp b/include/boost/fusion/view/transform_view/transform_view.hpp
index 901fe362..4c8eaf10 100644
--- a/include/boost/fusion/view/transform_view/transform_view.hpp
+++ b/include/boost/fusion/view/transform_view/transform_view.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_TRANSFORM_VIEW_07162005_1037)
+#ifndef FUSION_TRANSFORM_VIEW_07162005_1037
 #define FUSION_TRANSFORM_VIEW_07162005_1037
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/transform_view/transform_view_fwd.hpp b/include/boost/fusion/view/transform_view/transform_view_fwd.hpp
index c52cf6e1..bf5d3218 100644
--- a/include/boost/fusion/view/transform_view/transform_view_fwd.hpp
+++ b/include/boost/fusion/view/transform_view/transform_view_fwd.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_TRANSFORM_VIEW_FORWARD_01052006_1839)
+#ifndef FUSION_TRANSFORM_VIEW_FORWARD_01052006_1839
 #define FUSION_TRANSFORM_VIEW_FORWARD_01052006_1839
 
 namespace boost { namespace fusion
diff --git a/include/boost/fusion/view/transform_view/transform_view_iterator.hpp b/include/boost/fusion/view/transform_view/transform_view_iterator.hpp
index ba5b7c9b..dd7621f7 100644
--- a/include/boost/fusion/view/transform_view/transform_view_iterator.hpp
+++ b/include/boost/fusion/view/transform_view/transform_view_iterator.hpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_TRANSFORM_VIEW_ITERATOR_07162005_1033)
+#ifndef FUSION_TRANSFORM_VIEW_ITERATOR_07162005_1033
 #define FUSION_TRANSFORM_VIEW_ITERATOR_07162005_1033
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view.hpp b/include/boost/fusion/view/zip_view.hpp
index 5376f999..32ca5229 100644
--- a/include/boost/fusion/view/zip_view.hpp
+++ b/include/boost/fusion/view/zip_view.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ZIP_VIEW_23012006_0811)
+#ifndef FUSION_ZIP_VIEW_23012006_0811
 #define FUSION_ZIP_VIEW_23012006_0811
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/detail/advance_impl.hpp b/include/boost/fusion/view/zip_view/detail/advance_impl.hpp
index 69134d94..aa0e584a 100644
--- a/include/boost/fusion/view/zip_view/detail/advance_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/advance_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ADVANCE_IMPL_20061024_2021)
+#ifndef FUSION_ADVANCE_IMPL_20061024_2021
 #define FUSION_ADVANCE_IMPL_20061024_2021
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/detail/at_impl.hpp b/include/boost/fusion/view/zip_view/detail/at_impl.hpp
index 55c0fef1..08772b6a 100644
--- a/include/boost/fusion/view/zip_view/detail/at_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_AT_IMPL_20060124_1933)
+#ifndef FUSION_AT_IMPL_20060124_1933
 #define FUSION_AT_IMPL_20060124_1933
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/detail/begin_impl.hpp b/include/boost/fusion/view/zip_view/detail/begin_impl.hpp
index 75e13751..52a30ed1 100644
--- a/include/boost/fusion/view/zip_view/detail/begin_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/begin_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_BEGIN_IMPL_20060123_2147)
+#ifndef FUSION_BEGIN_IMPL_20060123_2147
 #define FUSION_BEGIN_IMPL_20060123_2147
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/detail/deref_impl.hpp b/include/boost/fusion/view/zip_view/detail/deref_impl.hpp
index df7e91ae..af1d2724 100644
--- a/include/boost/fusion/view/zip_view/detail/deref_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/deref_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DEREF_IMPL_20061024_1959)
+#ifndef FUSION_DEREF_IMPL_20061024_1959
 #define FUSION_DEREF_IMPL_20061024_1959
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/detail/distance_impl.hpp b/include/boost/fusion/view/zip_view/detail/distance_impl.hpp
index f306e1b4..fc752a9e 100644
--- a/include/boost/fusion/view/zip_view/detail/distance_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/distance_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_DISTANCE_IMPL_20060124_2033)
+#ifndef FUSION_DISTANCE_IMPL_20060124_2033
 #define FUSION_DISTANCE_IMPL_20060124_2033
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/detail/end_impl.hpp b/include/boost/fusion/view/zip_view/detail/end_impl.hpp
index 28549cb7..e3d5ed05 100644
--- a/include/boost/fusion/view/zip_view/detail/end_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/end_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_END_IMPL_20060123_2208)
+#ifndef FUSION_END_IMPL_20060123_2208
 #define FUSION_END_IMPL_20060123_2208
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp b/include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp
index 6292a525..fc4c2efc 100644
--- a/include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_EQUAL_TO_IMPL_20060128_1423)
+#ifndef FUSION_EQUAL_TO_IMPL_20060128_1423
 #define FUSION_EQUAL_TO_IMPL_20060128_1423
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/detail/next_impl.hpp b/include/boost/fusion/view/zip_view/detail/next_impl.hpp
index 4bcd90a5..090624b3 100644
--- a/include/boost/fusion/view/zip_view/detail/next_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/next_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_NEXT_IMPL_20060124_2006)
+#ifndef FUSION_NEXT_IMPL_20060124_2006
 #define FUSION_NEXT_IMPL_20060124_2006
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/detail/prior_impl.hpp b/include/boost/fusion/view/zip_view/detail/prior_impl.hpp
index 655b5092..83f47c2a 100644
--- a/include/boost/fusion/view/zip_view/detail/prior_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/prior_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_PRIOR_IMPL_20060124_2006)
+#ifndef FUSION_PRIOR_IMPL_20060124_2006
 #define FUSION_PRIOR_IMPL_20060124_2006
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/detail/size_impl.hpp b/include/boost/fusion/view/zip_view/detail/size_impl.hpp
index f8f35692..4dbd7e5d 100644
--- a/include/boost/fusion/view/zip_view/detail/size_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/size_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_SIZE_IMPL_20060124_0800)
+#ifndef FUSION_SIZE_IMPL_20060124_0800
 #define FUSION_SIZE_IMPL_20060124_0800
 
 namespace boost { namespace fusion {
diff --git a/include/boost/fusion/view/zip_view/detail/value_at_impl.hpp b/include/boost/fusion/view/zip_view/detail/value_at_impl.hpp
index 26d75b46..3b11950f 100644
--- a/include/boost/fusion/view/zip_view/detail/value_at_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/value_at_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_AT_IMPL_20060124_2129)
+#ifndef FUSION_VALUE_AT_IMPL_20060124_2129
 #define FUSION_VALUE_AT_IMPL_20060124_2129
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/detail/value_of_impl.hpp b/include/boost/fusion/view/zip_view/detail/value_of_impl.hpp
index 0c06e0e1..4aacd67d 100644
--- a/include/boost/fusion/view/zip_view/detail/value_of_impl.hpp
+++ b/include/boost/fusion/view/zip_view/detail/value_of_impl.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_VALUE_OF_IMPL_20060124_2147)
+#ifndef FUSION_VALUE_OF_IMPL_20060124_2147
 #define FUSION_VALUE_OF_IMPL_20060124_2147
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/zip_view.hpp b/include/boost/fusion/view/zip_view/zip_view.hpp
index b0327201..ffc03fd7 100644
--- a/include/boost/fusion/view/zip_view/zip_view.hpp
+++ b/include/boost/fusion/view/zip_view/zip_view.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ZIP_VIEW_23012006_0813)
+#ifndef FUSION_ZIP_VIEW_23012006_0813
 #define FUSION_ZIP_VIEW_23012006_0813
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/zip_view_iterator.hpp b/include/boost/fusion/view/zip_view/zip_view_iterator.hpp
index cf2d7630..6861310a 100644
--- a/include/boost/fusion/view/zip_view/zip_view_iterator.hpp
+++ b/include/boost/fusion/view/zip_view/zip_view_iterator.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ZIP_VIEW_ITERATOR_23012006_0814)
+#ifndef FUSION_ZIP_VIEW_ITERATOR_23012006_0814
 #define FUSION_ZIP_VIEW_ITERATOR_23012006_0814
 
 #include <boost/fusion/support/config.hpp>
diff --git a/include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp b/include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp
index 7f162309..8939aa9f 100644
--- a/include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp
+++ b/include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#if !defined(FUSION_ZIP_VIEW_ITERATOR_FWD)
+#ifndef FUSION_ZIP_VIEW_ITERATOR_FWD
 #define FUSION_ZIP_VIEW_ITERATOR_FWD
 
 #include <boost/fusion/support/config.hpp>
diff --git a/test/compile_time/driver.hpp b/test/compile_time/driver.hpp
index 8d06e6de..1ad97388 100644
--- a/test/compile_time/driver.hpp
+++ b/test/compile_time/driver.hpp
@@ -6,7 +6,7 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_COMPILE_TIME_DRIVER)
+#ifndef BOOST_FUSION_COMPILE_TIME_DRIVER
 #define BOOST_FUSION_COMPILE_TIME_DRIVER
 
 int main()