diff --git a/include/boost/wave.hpp b/include/boost/wave.hpp
index f2b3bc20f..ad7e2b4ff 100644
--- a/include/boost/wave.hpp
+++ b/include/boost/wave.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(WAVE_HPP_DCA0EA51_EF5B_4BF1_88A8_461DBC5F292B_INCLUDED)
-#define WAVE_HPP_DCA0EA51_EF5B_4BF1_88A8_461DBC5F292B_INCLUDED
+#if !defined(BOOST_WAVE_HPP_DCA0EA51_EF5B_4BF1_88A8_461DBC5F292B_INCLUDED)
+#define BOOST_WAVE_HPP_DCA0EA51_EF5B_4BF1_88A8_461DBC5F292B_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/cpp_exceptions.hpp>
@@ -20,4 +20,4 @@
 #include <boost/wave/token_ids.hpp>
 #include <boost/wave/cpp_context.hpp>
 
-#endif // !defined(WAVE_HPP_DCA0EA51_EF5B_4BF1_88A8_461DBC5F292B_INCLUDED)
+#endif // !defined(BOOST_WAVE_HPP_DCA0EA51_EF5B_4BF1_88A8_461DBC5F292B_INCLUDED)
diff --git a/include/boost/wave/cpp_context.hpp b/include/boost/wave/cpp_context.hpp
index 0804d2af1..f5f16462a 100644
--- a/include/boost/wave/cpp_context.hpp
+++ b/include/boost/wave/cpp_context.hpp
@@ -9,8 +9,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_CONTEXT_HPP_907485E2_6649_4A87_911B_7F7225F3E5B8_INCLUDED)
-#define CPP_CONTEXT_HPP_907485E2_6649_4A87_911B_7F7225F3E5B8_INCLUDED
+#if !defined(BOOST_CPP_CONTEXT_HPP_907485E2_6649_4A87_911B_7F7225F3E5B8_INCLUDED)
+#define BOOST_CPP_CONTEXT_HPP_907485E2_6649_4A87_911B_7F7225F3E5B8_INCLUDED
 
 #include <string>
 #include <vector>
@@ -568,4 +568,4 @@ struct version<boost::wave::context<Iterator, LexIterator, InputPolicy, Hooks> >
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_CONTEXT_HPP_907485E2_6649_4A87_911B_7F7225F3E5B8_INCLUDED)
+#endif // !defined(BOOST_CPP_CONTEXT_HPP_907485E2_6649_4A87_911B_7F7225F3E5B8_INCLUDED)
diff --git a/include/boost/wave/cpp_exceptions.hpp b/include/boost/wave/cpp_exceptions.hpp
index dd3296f6b..4ecd21fcf 100644
--- a/include/boost/wave/cpp_exceptions.hpp
+++ b/include/boost/wave/cpp_exceptions.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_EXCEPTIONS_HPP_5190E447_A781_4521_A275_5134FF9917D7_INCLUDED)
-#define CPP_EXCEPTIONS_HPP_5190E447_A781_4521_A275_5134FF9917D7_INCLUDED
+#if !defined(BOOST_CPP_EXCEPTIONS_HPP_5190E447_A781_4521_A275_5134FF9917D7_INCLUDED)
+#define BOOST_CPP_EXCEPTIONS_HPP_5190E447_A781_4521_A275_5134FF9917D7_INCLUDED
 
 #include <exception>
 #include <string>
@@ -432,4 +432,4 @@ is_recoverable(cpp_exception const& e)
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_EXCEPTIONS_HPP_5190E447_A781_4521_A275_5134FF9917D7_INCLUDED)
+#endif // !defined(BOOST_CPP_EXCEPTIONS_HPP_5190E447_A781_4521_A275_5134FF9917D7_INCLUDED)
diff --git a/include/boost/wave/cpp_iteration_context.hpp b/include/boost/wave/cpp_iteration_context.hpp
index 4dd4be483..74b448555 100644
--- a/include/boost/wave/cpp_iteration_context.hpp
+++ b/include/boost/wave/cpp_iteration_context.hpp
@@ -9,8 +9,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_ITERATION_CONTEXT_HPP_00312288_9DDB_4668_AFE5_25D3994FD095_INCLUDED)
-#define CPP_ITERATION_CONTEXT_HPP_00312288_9DDB_4668_AFE5_25D3994FD095_INCLUDED
+#if !defined(BOOST_CPP_ITERATION_CONTEXT_HPP_00312288_9DDB_4668_AFE5_25D3994FD095_INCLUDED)
+#define BOOST_CPP_ITERATION_CONTEXT_HPP_00312288_9DDB_4668_AFE5_25D3994FD095_INCLUDED
 
 #include <iterator>
 #include <boost/filesystem/fstream.hpp>
@@ -168,4 +168,4 @@ struct iteration_context
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_ITERATION_CONTEXT_HPP_00312288_9DDB_4668_AFE5_25D3994FD095_INCLUDED)
+#endif // !defined(BOOST_CPP_ITERATION_CONTEXT_HPP_00312288_9DDB_4668_AFE5_25D3994FD095_INCLUDED)
diff --git a/include/boost/wave/cpplexer/convert_trigraphs.hpp b/include/boost/wave/cpplexer/convert_trigraphs.hpp
index 3a6a6db38..59205e8a8 100644
--- a/include/boost/wave/cpplexer/convert_trigraphs.hpp
+++ b/include/boost/wave/cpplexer/convert_trigraphs.hpp
@@ -9,8 +9,8 @@
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#if !defined(CONVERT_TRIGRAPHS_HK050403_INCLUDED)
-#define CONVERT_TRIGRAPHS_HK050403_INCLUDED
+#if !defined(BOOST_CONVERT_TRIGRAPHS_HK050403_INCLUDED)
+#define BOOST_CONVERT_TRIGRAPHS_HK050403_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/cpplexer/cpplexer_exceptions.hpp>
@@ -134,6 +134,6 @@ convert_trigraphs(StringT const &value)
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CONVERT_TRIGRAPHS_HK050403_INCLUDED)
+#endif // !defined(BOOST_CONVERT_TRIGRAPHS_HK050403_INCLUDED)
 
 
diff --git a/include/boost/wave/cpplexer/cpp_lex_interface.hpp b/include/boost/wave/cpplexer/cpp_lex_interface.hpp
index 477d00179..986a644b6 100644
--- a/include/boost/wave/cpplexer/cpp_lex_interface.hpp
+++ b/include/boost/wave/cpplexer/cpp_lex_interface.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_LEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED)
-#define CPP_LEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED
+#if !defined(BOOST_CPP_LEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED)
+#define BOOST_CPP_LEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/util/file_position.hpp>
@@ -70,4 +70,4 @@ struct lex_input_interface
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_LEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED)
+#endif // !defined(BOOST_CPP_LEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED)
diff --git a/include/boost/wave/cpplexer/cpp_lex_iterator.hpp b/include/boost/wave/cpplexer/cpp_lex_iterator.hpp
index a18902038..66e9ce307 100644
--- a/include/boost/wave/cpplexer/cpp_lex_iterator.hpp
+++ b/include/boost/wave/cpplexer/cpp_lex_iterator.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_LEX_ITERATOR_HPP_AF0C37E3_CBD8_4F33_A225_51CF576FA61F_INCLUDED)
-#define CPP_LEX_ITERATOR_HPP_AF0C37E3_CBD8_4F33_A225_51CF576FA61F_INCLUDED
+#if !defined(BOOST_CPP_LEX_ITERATOR_HPP_AF0C37E3_CBD8_4F33_A225_51CF576FA61F_INCLUDED)
+#define BOOST_CPP_LEX_ITERATOR_HPP_AF0C37E3_CBD8_4F33_A225_51CF576FA61F_INCLUDED
 
 #include <string>
 
@@ -240,4 +240,4 @@ class lex_iterator
 
 #undef BOOST_WAVE_EOF_PREFIX
 
-#endif // !defined(CPP_LEX_ITERATOR_HPP_AF0C37E3_CBD8_4F33_A225_51CF576FA61F_INCLUDED)
+#endif // !defined(BOOST_CPP_LEX_ITERATOR_HPP_AF0C37E3_CBD8_4F33_A225_51CF576FA61F_INCLUDED)
diff --git a/include/boost/wave/cpplexer/cpp_lex_token.hpp b/include/boost/wave/cpplexer/cpp_lex_token.hpp
index 6d82273df..41d05bd61 100644
--- a/include/boost/wave/cpplexer/cpp_lex_token.hpp
+++ b/include/boost/wave/cpplexer/cpp_lex_token.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED)
-#define CPP_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED
+#if !defined(BOOST_CPP_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED)
+#define BOOST_CPP_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #if BOOST_WAVE_SERIALIZATION != 0
@@ -332,4 +332,4 @@ operator<< (std::ostream &stream, lex_token<PositionT> const &object)
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED)
+#endif // !defined(BOOST_CPP_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED)
diff --git a/include/boost/wave/cpplexer/cpplexer_exceptions.hpp b/include/boost/wave/cpplexer/cpplexer_exceptions.hpp
index 9e1df87a4..983318480 100644
--- a/include/boost/wave/cpplexer/cpplexer_exceptions.hpp
+++ b/include/boost/wave/cpplexer/cpplexer_exceptions.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPPLEXER_EXCEPTIONS_HPP_1A09DE1A_6D1F_4091_AF7F_5F13AB0D31AB_INCLUDED)
-#define CPPLEXER_EXCEPTIONS_HPP_1A09DE1A_6D1F_4091_AF7F_5F13AB0D31AB_INCLUDED
+#if !defined(BOOST_CPPLEXER_EXCEPTIONS_HPP_1A09DE1A_6D1F_4091_AF7F_5F13AB0D31AB_INCLUDED)
+#define BOOST_CPPLEXER_EXCEPTIONS_HPP_1A09DE1A_6D1F_4091_AF7F_5F13AB0D31AB_INCLUDED
 
 #include <exception>
 #include <string>
@@ -287,4 +287,4 @@ is_recoverable(lexing_exception const& e)
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPPLEXER_EXCEPTIONS_HPP_1A09DE1A_6D1F_4091_AF7F_5F13AB0D31AB_INCLUDED)
+#endif // !defined(BOOST_CPPLEXER_EXCEPTIONS_HPP_1A09DE1A_6D1F_4091_AF7F_5F13AB0D31AB_INCLUDED)
diff --git a/include/boost/wave/cpplexer/detect_include_guards.hpp b/include/boost/wave/cpplexer/detect_include_guards.hpp
index a3f0ccb99..ab83ec507 100644
--- a/include/boost/wave/cpplexer/detect_include_guards.hpp
+++ b/include/boost/wave/cpplexer/detect_include_guards.hpp
@@ -26,8 +26,8 @@
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#if !defined(DETECT_INCLUDE_GUARDS_HK060304_INCLUDED)
-#define DETECT_INCLUDE_GUARDS_HK060304_INCLUDED
+#if !defined(BOOST_DETECT_INCLUDE_GUARDS_HK060304_INCLUDED)
+#define BOOST_DETECT_INCLUDE_GUARDS_HK060304_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/token_ids.hpp>
@@ -260,4 +260,4 @@ include_guards<Token>::state_5(Token& t)
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !DETECT_INCLUDE_GUARDS_HK060304_INCLUDED
+#endif // !BOOST_DETECT_INCLUDE_GUARDS_HK060304_INCLUDED
diff --git a/include/boost/wave/cpplexer/re2clex/aq.hpp b/include/boost/wave/cpplexer/re2clex/aq.hpp
index fbafd8602..f7a4859c9 100644
--- a/include/boost/wave/cpplexer/re2clex/aq.hpp
+++ b/include/boost/wave/cpplexer/re2clex/aq.hpp
@@ -9,8 +9,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(AQ_HPP_A21D9145_B643_44C0_81E7_DB346DD67EE1_INCLUDED)
-#define AQ_HPP_A21D9145_B643_44C0_81E7_DB346DD67EE1_INCLUDED
+#if !defined(BOOST_AQ_HPP_A21D9145_B643_44C0_81E7_DB346DD67EE1_INCLUDED)
+#define BOOST_AQ_HPP_A21D9145_B643_44C0_81E7_DB346DD67EE1_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <cstdlib>
@@ -61,4 +61,4 @@ BOOST_WAVE_DECL void aq_terminate(aq_queue q);
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(AQ_HPP_A21D9145_B643_44C0_81E7_DB346DD67EE1_INCLUDED)
+#endif // !defined(BOOST_AQ_HPP_A21D9145_B643_44C0_81E7_DB346DD67EE1_INCLUDED)
diff --git a/include/boost/wave/cpplexer/re2clex/cpp_re.hpp b/include/boost/wave/cpplexer/re2clex/cpp_re.hpp
index 08fd739be..2f828439b 100644
--- a/include/boost/wave/cpplexer/re2clex/cpp_re.hpp
+++ b/include/boost/wave/cpplexer/re2clex/cpp_re.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_RE_HPP_B76C4F5E_63E9_4B8A_9975_EC32FA6BF027_INCLUDED)
-#define CPP_RE_HPP_B76C4F5E_63E9_4B8A_9975_EC32FA6BF027_INCLUDED
+#if !defined(BOOST_CPP_RE_HPP_B76C4F5E_63E9_4B8A_9975_EC32FA6BF027_INCLUDED)
+#define BOOST_CPP_RE_HPP_B76C4F5E_63E9_4B8A_9975_EC32FA6BF027_INCLUDED
 
 #include <boost/assert.hpp>
 
@@ -407,4 +407,4 @@ boost::wave::token_id scan(Scanner<Iterator> *s)
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_RE_HPP_B76C4F5E_63E9_4B8A_9975_EC32FA6BF027_INCLUDED)
+#endif // !defined(BOOST_CPP_RE_HPP_B76C4F5E_63E9_4B8A_9975_EC32FA6BF027_INCLUDED)
diff --git a/include/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp b/include/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
index 78c50f25e..aefe73e51 100644
--- a/include/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
+++ b/include/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED)
-#define CPP_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED
+#if !defined(BOOST_CPP_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED)
+#define BOOST_CPP_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED
 
 #include <string>
 #include <cstdio>
@@ -420,4 +420,4 @@ new_lexer_gen<IteratorT, PositionT, TokenT>::new_lexer(IteratorT const &first,
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED)
+#endif // !defined(BOOST_CPP_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED)
diff --git a/include/boost/wave/cpplexer/re2clex/scanner.hpp b/include/boost/wave/cpplexer/re2clex/scanner.hpp
index b3b310932..d2cb2f669 100644
--- a/include/boost/wave/cpplexer/re2clex/scanner.hpp
+++ b/include/boost/wave/cpplexer/re2clex/scanner.hpp
@@ -9,8 +9,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(SCANNER_HPP_F4FB01EB_E75C_4537_A146_D34B9895EF37_INCLUDED)
-#define SCANNER_HPP_F4FB01EB_E75C_4537_A146_D34B9895EF37_INCLUDED
+#if !defined(BOOST_SCANNER_HPP_F4FB01EB_E75C_4537_A146_D34B9895EF37_INCLUDED)
+#define BOOST_SCANNER_HPP_F4FB01EB_E75C_4537_A146_D34B9895EF37_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/cpplexer/re2clex/aq.hpp>
@@ -87,4 +87,4 @@ struct Scanner {
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(SCANNER_HPP_F4FB01EB_E75C_4537_A146_D34B9895EF37_INCLUDED)
+#endif // !defined(BOOST_SCANNER_HPP_F4FB01EB_E75C_4537_A146_D34B9895EF37_INCLUDED)
diff --git a/include/boost/wave/cpplexer/token_cache.hpp b/include/boost/wave/cpplexer/token_cache.hpp
index 1af66733c..c6d12551f 100644
--- a/include/boost/wave/cpplexer/token_cache.hpp
+++ b/include/boost/wave/cpplexer/token_cache.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(TOKEN_CACHE_HPP_4D2320B7_1D56_4113_A114_397E70FA438C_INCLUDED)
-#define TOKEN_CACHE_HPP_4D2320B7_1D56_4113_A114_397E70FA438C_INCLUDED
+#if !defined(BOOST_TOKEN_CACHE_HPP_4D2320B7_1D56_4113_A114_397E70FA438C_INCLUDED)
+#define BOOST_TOKEN_CACHE_HPP_4D2320B7_1D56_4113_A114_397E70FA438C_INCLUDED
 
 #include <vector>
 
@@ -69,4 +69,4 @@ class token_cache
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(TOKEN_CACHE_HPP_4D2320B7_1D56_4113_A114_397E70FA438C_INCLUDED)
+#endif // !defined(BOOST_TOKEN_CACHE_HPP_4D2320B7_1D56_4113_A114_397E70FA438C_INCLUDED)
diff --git a/include/boost/wave/cpplexer/validate_universal_char.hpp b/include/boost/wave/cpplexer/validate_universal_char.hpp
index 255919048..5341a4526 100644
--- a/include/boost/wave/cpplexer/validate_universal_char.hpp
+++ b/include/boost/wave/cpplexer/validate_universal_char.hpp
@@ -9,8 +9,8 @@
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#if !defined(VALIDATE_UNIVERSAL_CHAR_HPP_55F1B811_CD76_4C72_8344_CBC69CF3B339_INCLUDED)
-#define VALIDATE_UNIVERSAL_CHAR_HPP_55F1B811_CD76_4C72_8344_CBC69CF3B339_INCLUDED
+#if !defined(BOOST_VALIDATE_UNIVERSAL_CHAR_HPP_55F1B811_CD76_4C72_8344_CBC69CF3B339_INCLUDED)
+#define BOOST_VALIDATE_UNIVERSAL_CHAR_HPP_55F1B811_CD76_4C72_8344_CBC69CF3B339_INCLUDED
 
 #include <boost/assert.hpp>
 
@@ -319,4 +319,4 @@ typename StringT::size_type pos = name.find_first_of('\\');
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(VALIDATE_UNIVERSAL_CHAR_HPP_55F1B811_CD76_4C72_8344_CBC69CF3B339_INCLUDED)
+#endif // !defined(BOOST_VALIDATE_UNIVERSAL_CHAR_HPP_55F1B811_CD76_4C72_8344_CBC69CF3B339_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_chlit_grammar.hpp b/include/boost/wave/grammars/cpp_chlit_grammar.hpp
index 77fcfd1eb..76fc179ba 100644
--- a/include/boost/wave/grammars/cpp_chlit_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_chlit_grammar.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_CHLIT_GRAMMAR_HPP_9527D349_6592_449A_A409_42A001E6C64C_INCLUDED)
-#define CPP_CHLIT_GRAMMAR_HPP_9527D349_6592_449A_A409_42A001E6C64C_INCLUDED
+#if !defined(BOOST_CPP_CHLIT_GRAMMAR_HPP_9527D349_6592_449A_A409_42A001E6C64C_INCLUDED)
+#define BOOST_CPP_CHLIT_GRAMMAR_HPP_9527D349_6592_449A_A409_42A001E6C64C_INCLUDED
 
 #include <limits>     // std::numeric_limits
 #include <climits>    // CHAR_BIT
@@ -351,4 +351,4 @@ parse_info<typename TokenT::string_type::const_iterator> hit =
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_CHLIT_GRAMMAR_HPP_9527D349_6592_449A_A409_42A001E6C64C_INCLUDED)
+#endif // !defined(BOOST_CPP_CHLIT_GRAMMAR_HPP_9527D349_6592_449A_A409_42A001E6C64C_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_defined_grammar.hpp b/include/boost/wave/grammars/cpp_defined_grammar.hpp
index b9d006bd6..fdb2feebf 100644
--- a/include/boost/wave/grammars/cpp_defined_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_defined_grammar.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_DEFINED_GRAMMAR_HPP_F48287B2_DC67_40A8_B4A1_800EFBD67869_INCLUDED)
-#define CPP_DEFINED_GRAMMAR_HPP_F48287B2_DC67_40A8_B4A1_800EFBD67869_INCLUDED
+#if !defined(BOOST_CPP_DEFINED_GRAMMAR_HPP_F48287B2_DC67_40A8_B4A1_800EFBD67869_INCLUDED)
+#define BOOST_CPP_DEFINED_GRAMMAR_HPP_F48287B2_DC67_40A8_B4A1_800EFBD67869_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 
@@ -182,4 +182,4 @@ defined_grammar_gen<LexIteratorT>::parse_operator_defined (
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_DEFINED_GRAMMAR_HPP_F48287B2_DC67_40A8_B4A1_800EFBD67869_INCLUDED)
+#endif // !defined(BOOST_CPP_DEFINED_GRAMMAR_HPP_F48287B2_DC67_40A8_B4A1_800EFBD67869_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp b/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp
index 2b454a328..f98774481 100644
--- a/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp
+++ b/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_DEFINED_GRAMMAR_GEN_HPP_825BE9F5_98A3_400D_A97C_AD76B3B08632_INCLUDED)
-#define CPP_DEFINED_GRAMMAR_GEN_HPP_825BE9F5_98A3_400D_A97C_AD76B3B08632_INCLUDED
+#if !defined(BOOST_CPP_DEFINED_GRAMMAR_GEN_HPP_825BE9F5_98A3_400D_A97C_AD76B3B08632_INCLUDED)
+#define BOOST_CPP_DEFINED_GRAMMAR_GEN_HPP_825BE9F5_98A3_400D_A97C_AD76B3B08632_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 
@@ -82,4 +82,4 @@ struct BOOST_WAVE_DECL defined_grammar_gen
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_DEFINED_GRAMMAR_GEN_HPP_825BE9F5_98A3_400D_A97C_AD76B3B08632_INCLUDED)
+#endif // !defined(BOOST_CPP_DEFINED_GRAMMAR_GEN_HPP_825BE9F5_98A3_400D_A97C_AD76B3B08632_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_expression_grammar.hpp b/include/boost/wave/grammars/cpp_expression_grammar.hpp
index fbb2139ae..68184be53 100644
--- a/include/boost/wave/grammars/cpp_expression_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_expression_grammar.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_EXPRESSION_GRAMMAR_HPP_099CD1A4_A6C0_44BE_8F24_0B00F5BE5674_INCLUDED)
-#define CPP_EXPRESSION_GRAMMAR_HPP_099CD1A4_A6C0_44BE_8F24_0B00F5BE5674_INCLUDED
+#if !defined(BOOST_CPP_EXPRESSION_GRAMMAR_HPP_099CD1A4_A6C0_44BE_8F24_0B00F5BE5674_INCLUDED)
+#define BOOST_CPP_EXPRESSION_GRAMMAR_HPP_099CD1A4_A6C0_44BE_8F24_0B00F5BE5674_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 
@@ -867,4 +867,4 @@ expression_grammar_gen<TokenT>::evaluate(
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_EXPRESSION_GRAMMAR_HPP_099CD1A4_A6C0_44BE_8F24_0B00F5BE5674_INCLUDED)
+#endif // !defined(BOOST_CPP_EXPRESSION_GRAMMAR_HPP_099CD1A4_A6C0_44BE_8F24_0B00F5BE5674_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp b/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp
index 1c519db17..41fb985df 100644
--- a/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp
+++ b/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_EXPRESSION_GRAMMAR_GEN_HPP_42399258_6CDC_4101_863D_5C7D95B5A6CA_INCLUDED)
-#define CPP_EXPRESSION_GRAMMAR_GEN_HPP_42399258_6CDC_4101_863D_5C7D95B5A6CA_INCLUDED
+#if !defined(BOOST_CPP_EXPRESSION_GRAMMAR_GEN_HPP_42399258_6CDC_4101_863D_5C7D95B5A6CA_INCLUDED)
+#define BOOST_CPP_EXPRESSION_GRAMMAR_GEN_HPP_42399258_6CDC_4101_863D_5C7D95B5A6CA_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/cpp_iteration_context.hpp>
@@ -72,4 +72,4 @@ struct BOOST_WAVE_DECL expression_grammar_gen {
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_EXPRESSION_GRAMMAR_GEN_HPP_42399258_6CDC_4101_863D_5C7D95B5A6CA_INCLUDED)
+#endif // !defined(BOOST_CPP_EXPRESSION_GRAMMAR_GEN_HPP_42399258_6CDC_4101_863D_5C7D95B5A6CA_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_expression_value.hpp b/include/boost/wave/grammars/cpp_expression_value.hpp
index 26feb67d0..7a6060352 100644
--- a/include/boost/wave/grammars/cpp_expression_value.hpp
+++ b/include/boost/wave/grammars/cpp_expression_value.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_EXPRESSION_VALUE_HPP_452FE66D_8754_4107_AF1E_E42255A0C18A_INCLUDED)
-#define CPP_EXPRESSION_VALUE_HPP_452FE66D_8754_4107_AF1E_E42255A0C18A_INCLUDED
+#if !defined(BOOST_CPP_EXPRESSION_VALUE_HPP_452FE66D_8754_4107_AF1E_E42255A0C18A_INCLUDED)
+#define BOOST_CPP_EXPRESSION_VALUE_HPP_452FE66D_8754_4107_AF1E_E42255A0C18A_INCLUDED
 
 #if defined (BOOST_SPIRIT_DEBUG)
 #include <iostream>
@@ -880,4 +880,4 @@ class closure_value {
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_EXPRESSION_VALUE_HPP_452FE66D_8754_4107_AF1E_E42255A0C18A_INCLUDED)
+#endif // !defined(BOOST_CPP_EXPRESSION_VALUE_HPP_452FE66D_8754_4107_AF1E_E42255A0C18A_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_grammar.hpp b/include/boost/wave/grammars/cpp_grammar.hpp
index c660669dd..e085f9e7b 100644
--- a/include/boost/wave/grammars/cpp_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_grammar.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_GRAMMAR_HPP_FEAEBC2E_2734_428B_A7CA_85E5A415E23E_INCLUDED)
-#define CPP_GRAMMAR_HPP_FEAEBC2E_2734_428B_A7CA_85E5A415E23E_INCLUDED
+#if !defined(BOOST_CPP_GRAMMAR_HPP_FEAEBC2E_2734_428B_A7CA_85E5A415E23E_INCLUDED)
+#define BOOST_CPP_GRAMMAR_HPP_FEAEBC2E_2734_428B_A7CA_85E5A415E23E_INCLUDED
 
 #include <boost/spirit/include/classic_core.hpp>
 #include <boost/spirit/include/classic_parse_tree.hpp>
@@ -762,4 +762,4 @@ cpp_grammar_gen<LexIteratorT, TokenContainerT>::parse_cpp_grammar (
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_GRAMMAR_HPP_FEAEBC2E_2734_428B_A7CA_85E5A415E23E_INCLUDED)
+#endif // !defined(BOOST_CPP_GRAMMAR_HPP_FEAEBC2E_2734_428B_A7CA_85E5A415E23E_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_grammar_gen.hpp b/include/boost/wave/grammars/cpp_grammar_gen.hpp
index 79fc2d7d8..e68164bfb 100644
--- a/include/boost/wave/grammars/cpp_grammar_gen.hpp
+++ b/include/boost/wave/grammars/cpp_grammar_gen.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_GRAMMAR_GEN_HPP_80CB8A59_5411_4E45_B406_62531A12FB99_INCLUDED)
-#define CPP_GRAMMAR_GEN_HPP_80CB8A59_5411_4E45_B406_62531A12FB99_INCLUDED
+#if !defined(BOOST_CPP_GRAMMAR_GEN_HPP_80CB8A59_5411_4E45_B406_62531A12FB99_INCLUDED)
+#define BOOST_CPP_GRAMMAR_GEN_HPP_80CB8A59_5411_4E45_B406_62531A12FB99_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/language_support.hpp>
@@ -107,4 +107,4 @@ struct BOOST_WAVE_DECL cpp_grammar_gen
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_GRAMMAR_GEN_HPP_80CB8A59_5411_4E45_B406_62531A12FB99_INCLUDED)
+#endif // !defined(BOOST_CPP_GRAMMAR_GEN_HPP_80CB8A59_5411_4E45_B406_62531A12FB99_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_intlit_grammar.hpp b/include/boost/wave/grammars/cpp_intlit_grammar.hpp
index 9259c4dc5..6f0cf9bbd 100644
--- a/include/boost/wave/grammars/cpp_intlit_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_intlit_grammar.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_INTLIT_GRAMMAR_HPP_2E1E70B1_F15C_4132_8554_10A231B0D91C_INCLUDED)
-#define CPP_INTLIT_GRAMMAR_HPP_2E1E70B1_F15C_4132_8554_10A231B0D91C_INCLUDED
+#if !defined(BOOST_CPP_INTLIT_GRAMMAR_HPP_2E1E70B1_F15C_4132_8554_10A231B0D91C_INCLUDED)
+#define BOOST_CPP_INTLIT_GRAMMAR_HPP_2E1E70B1_F15C_4132_8554_10A231B0D91C_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 
@@ -185,4 +185,4 @@ parse_info<typename TokenT::string_type::const_iterator> hit =
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_INTLIT_GRAMMAR_HPP_2E1E70B1_F15C_4132_8554_10A231B0D91C_INCLUDED)
+#endif // !defined(BOOST_CPP_INTLIT_GRAMMAR_HPP_2E1E70B1_F15C_4132_8554_10A231B0D91C_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp b/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp
index c9918b8af..7d5616b1c 100644
--- a/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp
+++ b/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_LITERAL_GRAMMAR_GEN_HPP_67794A6C_468A_4AAB_A757_DEDDB182F5A0_INCLUDED)
-#define CPP_LITERAL_GRAMMAR_GEN_HPP_67794A6C_468A_4AAB_A757_DEDDB182F5A0_INCLUDED
+#if !defined(BOOST_CPP_LITERAL_GRAMMAR_GEN_HPP_67794A6C_468A_4AAB_A757_DEDDB182F5A0_INCLUDED)
+#define BOOST_CPP_LITERAL_GRAMMAR_GEN_HPP_67794A6C_468A_4AAB_A757_DEDDB182F5A0_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/grammars/cpp_value_error.hpp>
@@ -74,4 +74,4 @@ struct BOOST_WAVE_DECL chlit_grammar_gen {
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_LITERAL_GRAMMAR_GEN_HPP_67794A6C_468A_4AAB_A757_DEDDB182F5A0_INCLUDED)
+#endif // !defined(BOOST_CPP_LITERAL_GRAMMAR_GEN_HPP_67794A6C_468A_4AAB_A757_DEDDB182F5A0_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_predef_macros_gen.hpp b/include/boost/wave/grammars/cpp_predef_macros_gen.hpp
index 01d4e21cb..b8561e44c 100644
--- a/include/boost/wave/grammars/cpp_predef_macros_gen.hpp
+++ b/include/boost/wave/grammars/cpp_predef_macros_gen.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_PREDEF_MACROS_GEN_HPP_CADB6D2C_76A4_4988_83E1_EFFC6902B9A2_INCLUDED)
-#define CPP_PREDEF_MACROS_GEN_HPP_CADB6D2C_76A4_4988_83E1_EFFC6902B9A2_INCLUDED
+#if !defined(BOOST_CPP_PREDEF_MACROS_GEN_HPP_CADB6D2C_76A4_4988_83E1_EFFC6902B9A2_INCLUDED)
+#define BOOST_CPP_PREDEF_MACROS_GEN_HPP_CADB6D2C_76A4_4988_83E1_EFFC6902B9A2_INCLUDED
 
 #include <boost/spirit/include/classic_parse_tree.hpp>
 
@@ -77,4 +77,4 @@ struct BOOST_WAVE_DECL predefined_macros_grammar_gen
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_PREDEF_MACROS_GEN_HPP_CADB6D2C_76A4_4988_83E1_EFFC6902B9A2_INCLUDED)
+#endif // !defined(BOOST_CPP_PREDEF_MACROS_GEN_HPP_CADB6D2C_76A4_4988_83E1_EFFC6902B9A2_INCLUDED)
diff --git a/include/boost/wave/grammars/cpp_predef_macros_grammar.hpp b/include/boost/wave/grammars/cpp_predef_macros_grammar.hpp
index cc9edc221..5f48bd126 100644
--- a/include/boost/wave/grammars/cpp_predef_macros_grammar.hpp
+++ b/include/boost/wave/grammars/cpp_predef_macros_grammar.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_PREDEF_MACROS_GRAMMAR_HPP_53858C9A_C202_4D60_AD92_DC9CAE4DBB43_INCLUDED)
-#define CPP_PREDEF_MACROS_GRAMMAR_HPP_53858C9A_C202_4D60_AD92_DC9CAE4DBB43_INCLUDED
+#if !defined(BOOST_CPP_PREDEF_MACROS_GRAMMAR_HPP_53858C9A_C202_4D60_AD92_DC9CAE4DBB43_INCLUDED)
+#define BOOST_CPP_PREDEF_MACROS_GRAMMAR_HPP_53858C9A_C202_4D60_AD92_DC9CAE4DBB43_INCLUDED
 
 #include <boost/spirit/include/classic_core.hpp>
 #include <boost/spirit/include/classic_parse_tree.hpp>
@@ -175,4 +175,4 @@ predefined_macros_grammar_gen<LexIteratorT>::parse_predefined_macro (
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_PREDEF_MACROS_GRAMMAR_HPP_53858C9A_C202_4D60_AD92_DC9CAE4DBB43_INCLUDED)
+#endif // !defined(BOOST_CPP_PREDEF_MACROS_GRAMMAR_HPP_53858C9A_C202_4D60_AD92_DC9CAE4DBB43_INCLUDED)
diff --git a/include/boost/wave/language_support.hpp b/include/boost/wave/language_support.hpp
index d9b826cb1..8e956d60d 100644
--- a/include/boost/wave/language_support.hpp
+++ b/include/boost/wave/language_support.hpp
@@ -8,8 +8,8 @@
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#if !defined(LANGUAGE_SUPPORT_HPP_93EDD057_2DEF_44BC_BC9F_FDABB9F51AFA_INCLUDED)
-#define LANGUAGE_SUPPORT_HPP_93EDD057_2DEF_44BC_BC9F_FDABB9F51AFA_INCLUDED
+#if !defined(BOOST_LANGUAGE_SUPPORT_HPP_93EDD057_2DEF_44BC_BC9F_FDABB9F51AFA_INCLUDED)
+#define BOOST_LANGUAGE_SUPPORT_HPP_93EDD057_2DEF_44BC_BC9F_FDABB9F51AFA_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 
@@ -256,4 +256,4 @@ BOOST_WAVE_OPTION(no_newline_at_end_of_file) // support_no_newline_at_end_of_fil
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(LANGUAGE_SUPPORT_HPP_93EDD057_2DEF_44BC_BC9F_FDABB9F51AFA_INCLUDED)
+#endif // !defined(BOOST_LANGUAGE_SUPPORT_HPP_93EDD057_2DEF_44BC_BC9F_FDABB9F51AFA_INCLUDED)
diff --git a/include/boost/wave/preprocessing_hooks.hpp b/include/boost/wave/preprocessing_hooks.hpp
index 81bd21787..9da057238 100644
--- a/include/boost/wave/preprocessing_hooks.hpp
+++ b/include/boost/wave/preprocessing_hooks.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(DEFAULT_PREPROCESSING_HOOKS_HPP_INCLUDED)
-#define DEFAULT_PREPROCESSING_HOOKS_HPP_INCLUDED
+#if !defined(BOOST_DEFAULT_PREPROCESSING_HOOKS_HPP_INCLUDED)
+#define BOOST_DEFAULT_PREPROCESSING_HOOKS_HPP_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/util/cpp_include_paths.hpp>
@@ -816,4 +816,4 @@ struct default_preprocessing_hooks
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(DEFAULT_PREPROCESSING_HOOKS_HPP_INCLUDED)
+#endif // !defined(BOOST_DEFAULT_PREPROCESSING_HOOKS_HPP_INCLUDED)
diff --git a/include/boost/wave/token_ids.hpp b/include/boost/wave/token_ids.hpp
index f8afb9d4b..4a0f05604 100644
--- a/include/boost/wave/token_ids.hpp
+++ b/include/boost/wave/token_ids.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(TOKEN_IDS_HPP_414E9A58_F079_4789_8AFF_513815CE475B_INCLUDED)
-#define TOKEN_IDS_HPP_414E9A58_F079_4789_8AFF_513815CE475B_INCLUDED
+#if !defined(BOOST_TOKEN_IDS_HPP_414E9A58_F079_4789_8AFF_513815CE475B_INCLUDED)
+#define BOOST_TOKEN_IDS_HPP_414E9A58_F079_4789_8AFF_513815CE475B_INCLUDED
 
 #include <string>
 
@@ -378,5 +378,5 @@ char const *get_token_value(token_id tokid);
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(TOKEN_IDS_HPP_414E9A58_F079_4789_8AFF_513815CE475B_INCLUDED)
+#endif // !defined(BOOST_TOKEN_IDS_HPP_414E9A58_F079_4789_8AFF_513815CE475B_INCLUDED)
 
diff --git a/include/boost/wave/util/cpp_ifblock.hpp b/include/boost/wave/util/cpp_ifblock.hpp
index 975ac5156..cdc7d3ac9 100644
--- a/include/boost/wave/util/cpp_ifblock.hpp
+++ b/include/boost/wave/util/cpp_ifblock.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_IFBLOCK_HPP_D4676B36_00C5_41F4_BC9F_9CBBAE3B8006_INCLUDED)
-#define CPP_IFBLOCK_HPP_D4676B36_00C5_41F4_BC9F_9CBBAE3B8006_INCLUDED
+#if !defined(BOOST_CPP_IFBLOCK_HPP_D4676B36_00C5_41F4_BC9F_9CBBAE3B8006_INCLUDED)
+#define BOOST_CPP_IFBLOCK_HPP_D4676B36_00C5_41F4_BC9F_9CBBAE3B8006_INCLUDED
 
 #include <stack>
 #include <boost/wave/wave_config.hpp>
@@ -158,4 +158,4 @@ class if_block_stack
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_IFBLOCK_HPP_D4676B36_00C5_41F4_BC9F_9CBBAE3B8006_INCLUDED)
+#endif // !defined(BOOST_CPP_IFBLOCK_HPP_D4676B36_00C5_41F4_BC9F_9CBBAE3B8006_INCLUDED)
diff --git a/include/boost/wave/util/cpp_include_paths.hpp b/include/boost/wave/util/cpp_include_paths.hpp
index 888964cc9..221ccee8c 100644
--- a/include/boost/wave/util/cpp_include_paths.hpp
+++ b/include/boost/wave/util/cpp_include_paths.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_INCLUDE_PATHS_HPP_AF620DA4_B3D2_4221_AD91_8A1ABFFB6944_INCLUDED)
-#define CPP_INCLUDE_PATHS_HPP_AF620DA4_B3D2_4221_AD91_8A1ABFFB6944_INCLUDED
+#if !defined(BOOST_CPP_INCLUDE_PATHS_HPP_AF620DA4_B3D2_4221_AD91_8A1ABFFB6944_INCLUDED)
+#define BOOST_CPP_INCLUDE_PATHS_HPP_AF620DA4_B3D2_4221_AD91_8A1ABFFB6944_INCLUDED
 
 #include <string>
 #include <list>
@@ -545,4 +545,4 @@ BOOST_CLASS_VERSION(boost::wave::util::include_paths,
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_INCLUDE_PATHS_HPP_AF620DA4_B3D2_4221_AD91_8A1ABFFB6944_INCLUDED)
+#endif // !defined(BOOST_CPP_INCLUDE_PATHS_HPP_AF620DA4_B3D2_4221_AD91_8A1ABFFB6944_INCLUDED)
diff --git a/include/boost/wave/util/cpp_iterator.hpp b/include/boost/wave/util/cpp_iterator.hpp
index d7d0c1cd7..9a8b2c0dc 100644
--- a/include/boost/wave/util/cpp_iterator.hpp
+++ b/include/boost/wave/util/cpp_iterator.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_ITERATOR_HPP_175CA88F_7273_43FA_9039_BCF7459E1F29_INCLUDED)
-#define CPP_ITERATOR_HPP_175CA88F_7273_43FA_9039_BCF7459E1F29_INCLUDED
+#if !defined(BOOST_CPP_ITERATOR_HPP_175CA88F_7273_43FA_9039_BCF7459E1F29_INCLUDED)
+#define BOOST_CPP_ITERATOR_HPP_175CA88F_7273_43FA_9039_BCF7459E1F29_INCLUDED
 
 #include <string>
 #include <vector>
@@ -2635,4 +2635,4 @@ class pp_iterator
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_ITERATOR_HPP_175CA88F_7273_43FA_9039_BCF7459E1F29_INCLUDED)
+#endif // !defined(BOOST_CPP_ITERATOR_HPP_175CA88F_7273_43FA_9039_BCF7459E1F29_INCLUDED)
diff --git a/include/boost/wave/util/cpp_macromap.hpp b/include/boost/wave/util/cpp_macromap.hpp
index 8bf5f4219..f7c490784 100644
--- a/include/boost/wave/util/cpp_macromap.hpp
+++ b/include/boost/wave/util/cpp_macromap.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_MACROMAP_HPP_CB8F51B0_A3F0_411C_AEF4_6FF631B8B414_INCLUDED)
-#define CPP_MACROMAP_HPP_CB8F51B0_A3F0_411C_AEF4_6FF631B8B414_INCLUDED
+#if !defined(BOOST_CPP_MACROMAP_HPP_CB8F51B0_A3F0_411C_AEF4_6FF631B8B414_INCLUDED)
+#define BOOST_CPP_MACROMAP_HPP_CB8F51B0_A3F0_411C_AEF4_6FF631B8B414_INCLUDED
 
 #include <cstdlib>
 #include <cstdio>
@@ -2166,4 +2166,4 @@ struct version<boost::wave::util::macromap<ContextT> >
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_MACROMAP_HPP_CB8F51B0_A3F0_411C_AEF4_6FF631B8B414_INCLUDED)
+#endif // !defined(BOOST_CPP_MACROMAP_HPP_CB8F51B0_A3F0_411C_AEF4_6FF631B8B414_INCLUDED)
diff --git a/include/boost/wave/util/cpp_macromap_predef.hpp b/include/boost/wave/util/cpp_macromap_predef.hpp
index f2a095dd9..02c74a348 100644
--- a/include/boost/wave/util/cpp_macromap_predef.hpp
+++ b/include/boost/wave/util/cpp_macromap_predef.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_MACROMAP_PREDEF_HPP_HK041119)
-#define CPP_MACROMAP_PREDEF_HPP_HK041119
+#if !defined(BOOST_CPP_MACROMAP_PREDEF_HPP_HK041119)
+#define BOOST_CPP_MACROMAP_PREDEF_HPP_HK041119
 
 #include <cstdio>
 #include <boost/assert.hpp>
@@ -302,4 +302,4 @@ namespace util {
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_MACROMAP_PREDEF_HPP_HK041119)
+#endif // !defined(BOOST_CPP_MACROMAP_PREDEF_HPP_HK041119)
diff --git a/include/boost/wave/util/cpp_macromap_utils.hpp b/include/boost/wave/util/cpp_macromap_utils.hpp
index eb9ac8e3f..4fc20f380 100644
--- a/include/boost/wave/util/cpp_macromap_utils.hpp
+++ b/include/boost/wave/util/cpp_macromap_utils.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_MACROMAP_UTIL_HPP_HK041119)
-#define CPP_MACROMAP_UTIL_HPP_HK041119
+#if !defined(BOOST_CPP_MACROMAP_UTIL_HPP_HK041119)
+#define BOOST_CPP_MACROMAP_UTIL_HPP_HK041119
 
 #include <boost/assert.hpp>
 
@@ -593,4 +593,4 @@ to_string(Src const& src)
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(CPP_MACROMAP_UTIL_HPP_HK041119)
+#endif // !defined(BOOST_CPP_MACROMAP_UTIL_HPP_HK041119)
diff --git a/include/boost/wave/util/file_position.hpp b/include/boost/wave/util/file_position.hpp
index 840e7cdcb..c0ecc0f56 100644
--- a/include/boost/wave/util/file_position.hpp
+++ b/include/boost/wave/util/file_position.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(FILE_POSITION_H_52BDEDF7_DAD3_4F24_802F_E66BB8098F68_INCLUDED)
-#define FILE_POSITION_H_52BDEDF7_DAD3_4F24_802F_E66BB8098F68_INCLUDED
+#if !defined(BOOST_FILE_POSITION_H_52BDEDF7_DAD3_4F24_802F_E66BB8098F68_INCLUDED)
+#define BOOST_FILE_POSITION_H_52BDEDF7_DAD3_4F24_802F_E66BB8098F68_INCLUDED
 
 #include <string>
 #include <ostream>
@@ -192,4 +192,4 @@ namespace spirit { namespace classic {
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(FILE_POSITION_H_52BDEDF7_DAD3_4F24_802F_E66BB8098F68_INCLUDED)
+#endif // !defined(BOOST_FILE_POSITION_H_52BDEDF7_DAD3_4F24_802F_E66BB8098F68_INCLUDED)
diff --git a/include/boost/wave/util/flex_string.hpp b/include/boost/wave/util/flex_string.hpp
index 3faa77868..3b5aa653e 100644
--- a/include/boost/wave/util/flex_string.hpp
+++ b/include/boost/wave/util/flex_string.hpp
@@ -35,8 +35,8 @@
 //      - Removed the getline implementation which was borrowed from the SGI
 //        STL as the license for this code is not compatible with Boost.
 
-#ifndef FLEX_STRING_INC_
-#define FLEX_STRING_INC_
+#ifndef BOOST_FLEX_STRING_INC_
+#define BOOST_FLEX_STRING_INC_
 
 /*
 ////////////////////////////////////////////////////////////////////////////////
@@ -2577,4 +2577,4 @@ inline void serialize(Archive & ar, boost::wave::util::flex_string<E, T, A, S> &
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // FLEX_STRING_INC_
+#endif // BOOST_FLEX_STRING_INC_
diff --git a/include/boost/wave/util/functor_input.hpp b/include/boost/wave/util/functor_input.hpp
index 183676ef1..11a8a955a 100644
--- a/include/boost/wave/util/functor_input.hpp
+++ b/include/boost/wave/util/functor_input.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(FUNCTOR_INPUT_HPP_ED3A4C21_8F8A_453F_B438_08214FAC106A_INCLUDED)
-#define FUNCTOR_INPUT_HPP_ED3A4C21_8F8A_453F_B438_08214FAC106A_INCLUDED
+#if !defined(BOOST_FUNCTOR_INPUT_HPP_ED3A4C21_8F8A_453F_B438_08214FAC106A_INCLUDED)
+#define BOOST_FUNCTOR_INPUT_HPP_ED3A4C21_8F8A_453F_B438_08214FAC106A_INCLUDED
 
 #include <boost/assert.hpp>
 #include <boost/spirit/include/classic_multi_pass.hpp>
@@ -152,4 +152,4 @@ struct functor_input {
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(FUNCTOR_INPUT_HPP_ED3A4C21_8F8A_453F_B438_08214FAC106A_INCLUDED)
+#endif // !defined(BOOST_FUNCTOR_INPUT_HPP_ED3A4C21_8F8A_453F_B438_08214FAC106A_INCLUDED)
diff --git a/include/boost/wave/util/insert_whitespace_detection.hpp b/include/boost/wave/util/insert_whitespace_detection.hpp
index 0bc7b2412..d6e4f4630 100644
--- a/include/boost/wave/util/insert_whitespace_detection.hpp
+++ b/include/boost/wave/util/insert_whitespace_detection.hpp
@@ -9,8 +9,8 @@
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#if !defined(INSERT_WHITESPACE_DETECTION_HPP_765EF77B_0513_4967_BDD6_6A38148C4C96_INCLUDED)
-#define INSERT_WHITESPACE_DETECTION_HPP_765EF77B_0513_4967_BDD6_6A38148C4C96_INCLUDED
+#if !defined(BOOST_INSERT_WHITESPACE_DETECTION_HPP_765EF77B_0513_4967_BDD6_6A38148C4C96_INCLUDED)
+#define BOOST_INSERT_WHITESPACE_DETECTION_HPP_765EF77B_0513_4967_BDD6_6A38148C4C96_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/token_ids.hpp>
@@ -545,4 +545,4 @@ class insert_whitespace_detection
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(INSERT_WHITESPACE_DETECTION_HPP_765EF77B_0513_4967_BDD6_6A38148C4C96_INCLUDED)
+#endif // !defined(BOOST_INSERT_WHITESPACE_DETECTION_HPP_765EF77B_0513_4967_BDD6_6A38148C4C96_INCLUDED)
diff --git a/include/boost/wave/util/interpret_pragma.hpp b/include/boost/wave/util/interpret_pragma.hpp
index 5a68a5e00..34c7e89ea 100644
--- a/include/boost/wave/util/interpret_pragma.hpp
+++ b/include/boost/wave/util/interpret_pragma.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(INTERPRET_PRAGMA_HPP_B1F2315E_C5CE_4ED1_A343_0EF548B7942A_INCLUDED)
-#define INTERPRET_PRAGMA_HPP_B1F2315E_C5CE_4ED1_A343_0EF548B7942A_INCLUDED
+#if !defined(BOOST_INTERPRET_PRAGMA_HPP_B1F2315E_C5CE_4ED1_A343_0EF548B7942A_INCLUDED)
+#define BOOST_INTERPRET_PRAGMA_HPP_B1F2315E_C5CE_4ED1_A343_0EF548B7942A_INCLUDED
 
 #include <string>
 #include <list>
@@ -207,4 +207,4 @@ interpret_pragma(ContextT &ctx, typename ContextT::token_type const &act_token,
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(INTERPRET_PRAGMA_HPP_B1F2315E_C5CE_4ED1_A343_0EF548B7942A_INCLUDED)
+#endif // !defined(BOOST_INTERPRET_PRAGMA_HPP_B1F2315E_C5CE_4ED1_A343_0EF548B7942A_INCLUDED)
diff --git a/include/boost/wave/util/iteration_context.hpp b/include/boost/wave/util/iteration_context.hpp
index 1ea027c88..bea16815b 100644
--- a/include/boost/wave/util/iteration_context.hpp
+++ b/include/boost/wave/util/iteration_context.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(ITERATION_CONTEXT_HPP_9556CD16_F11E_4ADC_AC8B_FB9A174BE664_INCLUDED)
-#define ITERATION_CONTEXT_HPP_9556CD16_F11E_4ADC_AC8B_FB9A174BE664_INCLUDED
+#if !defined(BOOST_ITERATION_CONTEXT_HPP_9556CD16_F11E_4ADC_AC8B_FB9A174BE664_INCLUDED)
+#define BOOST_ITERATION_CONTEXT_HPP_9556CD16_F11E_4ADC_AC8B_FB9A174BE664_INCLUDED
 
 #include <cstdlib>
 #include <cstdio>
@@ -80,4 +80,4 @@ class iteration_context_stack
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(ITERATION_CONTEXT_HPP_9556CD16_F11E_4ADC_AC8B_FB9A174BE664_INCLUDED)
+#endif // !defined(BOOST_ITERATION_CONTEXT_HPP_9556CD16_F11E_4ADC_AC8B_FB9A174BE664_INCLUDED)
diff --git a/include/boost/wave/util/macro_definition.hpp b/include/boost/wave/util/macro_definition.hpp
index a180317e0..4911b61a4 100644
--- a/include/boost/wave/util/macro_definition.hpp
+++ b/include/boost/wave/util/macro_definition.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(MACRO_DEFINITION_HPP_D68A639E_2DA5_4E9C_8ACD_CFE6B903831E_INCLUDED)
-#define MACRO_DEFINITION_HPP_D68A639E_2DA5_4E9C_8ACD_CFE6B903831E_INCLUDED
+#if !defined(BOOST_MACRO_DEFINITION_HPP_D68A639E_2DA5_4E9C_8ACD_CFE6B903831E_INCLUDED)
+#define BOOST_MACRO_DEFINITION_HPP_D68A639E_2DA5_4E9C_8ACD_CFE6B903831E_INCLUDED
 
 #include <vector>
 #include <list>
@@ -209,4 +209,4 @@ intrusive_ptr_release(macro_definition<TokenT, ContainerT>* p)
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(MACRO_DEFINITION_HPP_D68A639E_2DA5_4E9C_8ACD_CFE6B903831E_INCLUDED)
+#endif // !defined(BOOST_MACRO_DEFINITION_HPP_D68A639E_2DA5_4E9C_8ACD_CFE6B903831E_INCLUDED)
diff --git a/include/boost/wave/util/macro_helpers.hpp b/include/boost/wave/util/macro_helpers.hpp
index 7849e5c33..0e1c69f5c 100644
--- a/include/boost/wave/util/macro_helpers.hpp
+++ b/include/boost/wave/util/macro_helpers.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(MACRO_HELPERS_HPP_931BBC99_EBFA_4692_8FBE_B555998C2C39_INCLUDED)
-#define MACRO_HELPERS_HPP_931BBC99_EBFA_4692_8FBE_B555998C2C39_INCLUDED
+#if !defined(BOOST_MACRO_HELPERS_HPP_931BBC99_EBFA_4692_8FBE_B555998C2C39_INCLUDED)
+#define BOOST_MACRO_HELPERS_HPP_931BBC99_EBFA_4692_8FBE_B555998C2C39_INCLUDED
 
 #include <vector>
 
@@ -342,4 +342,4 @@ namespace impl {
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(MACRO_HELPERS_HPP_931BBC99_EBFA_4692_8FBE_B555998C2C39_INCLUDED)
+#endif // !defined(BOOST_MACRO_HELPERS_HPP_931BBC99_EBFA_4692_8FBE_B555998C2C39_INCLUDED)
diff --git a/include/boost/wave/util/symbol_table.hpp b/include/boost/wave/util/symbol_table.hpp
index 414bd9926..40d7905f0 100644
--- a/include/boost/wave/util/symbol_table.hpp
+++ b/include/boost/wave/util/symbol_table.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(SYMBOL_TABLE_HPP_32B0F7C6_3DD6_4113_95A5_E16516C6F45A_INCLUDED)
-#define SYMBOL_TABLE_HPP_32B0F7C6_3DD6_4113_95A5_E16516C6F45A_INCLUDED
+#if !defined(BOOST_SYMBOL_TABLE_HPP_32B0F7C6_3DD6_4113_95A5_E16516C6F45A_INCLUDED)
+#define BOOST_SYMBOL_TABLE_HPP_32B0F7C6_3DD6_4113_95A5_E16516C6F45A_INCLUDED
 
 #include <map>
 
@@ -117,4 +117,4 @@ struct symbol_table
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(SYMBOL_TABLE_HPP_32B0F7C6_3DD6_4113_95A5_E16516C6F45A_INCLUDED)
+#endif // !defined(BOOST_SYMBOL_TABLE_HPP_32B0F7C6_3DD6_4113_95A5_E16516C6F45A_INCLUDED)
diff --git a/include/boost/wave/util/time_conversion_helper.hpp b/include/boost/wave/util/time_conversion_helper.hpp
index 643930eed..c0d8eeba1 100644
--- a/include/boost/wave/util/time_conversion_helper.hpp
+++ b/include/boost/wave/util/time_conversion_helper.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(TIME_CONVERSION_HELPER_HPP_DA97E389_1797_43BA_82AE_B071064B3EF4_INCLUDED)
-#define TIME_CONVERSION_HELPER_HPP_DA97E389_1797_43BA_82AE_B071064B3EF4_INCLUDED
+#if !defined(BOOST_TIME_CONVERSION_HELPER_HPP_DA97E389_1797_43BA_82AE_B071064B3EF4_INCLUDED)
+#define BOOST_TIME_CONVERSION_HELPER_HPP_DA97E389_1797_43BA_82AE_B071064B3EF4_INCLUDED
 
 #include <ctime>
 #include <cstring>
@@ -150,4 +150,4 @@ using namespace time_conversion;
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(TIME_CONVERSION_HELPER_HPP_DA97E389_1797_43BA_82AE_B071064B3EF4_INCLUDED)
+#endif // !defined(BOOST_TIME_CONVERSION_HELPER_HPP_DA97E389_1797_43BA_82AE_B071064B3EF4_INCLUDED)
diff --git a/include/boost/wave/util/transform_iterator.hpp b/include/boost/wave/util/transform_iterator.hpp
index a9cdd6784..fc874bd91 100644
--- a/include/boost/wave/util/transform_iterator.hpp
+++ b/include/boost/wave/util/transform_iterator.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(TRANSFORM_ITERATOR_HPP_D492C659_88C7_4258_8C42_192F9AE80EC0_INCLUDED)
-#define TRANSFORM_ITERATOR_HPP_D492C659_88C7_4258_8C42_192F9AE80EC0_INCLUDED
+#if !defined(BOOST_TRANSFORM_ITERATOR_HPP_D492C659_88C7_4258_8C42_192F9AE80EC0_INCLUDED)
+#define BOOST_TRANSFORM_ITERATOR_HPP_D492C659_88C7_4258_8C42_192F9AE80EC0_INCLUDED
 
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
@@ -86,4 +86,4 @@ namespace impl {
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(TRANSFORM_ITERATOR_HPP_D492C659_88C7_4258_8C42_192F9AE80EC0_INCLUDED)
+#endif // !defined(BOOST_TRANSFORM_ITERATOR_HPP_D492C659_88C7_4258_8C42_192F9AE80EC0_INCLUDED)
diff --git a/include/boost/wave/util/unput_queue_iterator.hpp b/include/boost/wave/util/unput_queue_iterator.hpp
index 7ec14a8de..37df9f66b 100644
--- a/include/boost/wave/util/unput_queue_iterator.hpp
+++ b/include/boost/wave/util/unput_queue_iterator.hpp
@@ -9,8 +9,8 @@
     Software License, Version 1.0. (See accompanying file
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
-#if !defined(UNPUT_QUEUE_ITERATOR_HPP_76DA23D0_4893_4AD5_ABCC_6CED7CFB89BC_INCLUDED)
-#define UNPUT_QUEUE_ITERATOR_HPP_76DA23D0_4893_4AD5_ABCC_6CED7CFB89BC_INCLUDED
+#if !defined(BOOST_UNPUT_QUEUE_ITERATOR_HPP_76DA23D0_4893_4AD5_ABCC_6CED7CFB89BC_INCLUDED)
+#define BOOST_UNPUT_QUEUE_ITERATOR_HPP_76DA23D0_4893_4AD5_ABCC_6CED7CFB89BC_INCLUDED
 
 #include <list>
 
@@ -292,4 +292,4 @@ namespace impl {
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(UNPUT_QUEUE_ITERATOR_HPP_76DA23D0_4893_4AD5_ABCC_6CED7CFB89BC_INCLUDED)
+#endif // !defined(BOOST_UNPUT_QUEUE_ITERATOR_HPP_76DA23D0_4893_4AD5_ABCC_6CED7CFB89BC_INCLUDED)
diff --git a/include/boost/wave/wave_config.hpp b/include/boost/wave/wave_config.hpp
index 9c345c85d..943e762ea 100644
--- a/include/boost/wave/wave_config.hpp
+++ b/include/boost/wave/wave_config.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(WAVE_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED)
-#define WAVE_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED
+#if !defined(BOOST_WAVE_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED)
+#define BOOST_WAVE_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
@@ -516,4 +516,4 @@ namespace boost { namespace wave
 #endif
 #endif
 
-#endif // !defined(WAVE_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED)
+#endif // !defined(BOOST_WAVE_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED)
diff --git a/include/boost/wave/wave_version.hpp b/include/boost/wave/wave_version.hpp
index 7b143ca76..8e6e4efe2 100644
--- a/include/boost/wave/wave_version.hpp
+++ b/include/boost/wave/wave_version.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(WAVE_VERSION_H_9D79ABDB_AC54_4C0A_89B1_F70A2DCFE21E_INCLUDED)
-#define WAVE_VERSION_H_9D79ABDB_AC54_4C0A_89B1_F70A2DCFE21E_INCLUDED
+#if !defined(BOOST_WAVE_VERSION_H_9D79ABDB_AC54_4C0A_89B1_F70A2DCFE21E_INCLUDED)
+#define BOOST_WAVE_VERSION_H_9D79ABDB_AC54_4C0A_89B1_F70A2DCFE21E_INCLUDED
 
 //  BOOST_WAVE_VERSION & 0x0000FF is the sub-minor version
 //  BOOST_WAVE_VERSION & 0x00FF00 is the minor version
@@ -23,4 +23,4 @@
 #define BOOST_WAVE_VERSION_MINOR           3
 #define BOOST_WAVE_VERSION_SUBMINOR        2
 
-#endif // !defined(WAVE_VERSION_H_9D79ABDB_AC54_4C0A_89B1_F70A2DCFE21E_INCLUDED)
+#endif // !defined(BOOST_WAVE_VERSION_H_9D79ABDB_AC54_4C0A_89B1_F70A2DCFE21E_INCLUDED)
diff --git a/include/boost/wave/whitespace_handling.hpp b/include/boost/wave/whitespace_handling.hpp
index f80785f88..42dba42be 100644
--- a/include/boost/wave/whitespace_handling.hpp
+++ b/include/boost/wave/whitespace_handling.hpp
@@ -10,8 +10,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(WHITESPACE_HANDLING_HPP_INCLUDED)
-#define WHITESPACE_HANDLING_HPP_INCLUDED
+#if !defined(BOOST_WHITESPACE_HANDLING_HPP_INCLUDED)
+#define BOOST_WHITESPACE_HANDLING_HPP_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/token_ids.hpp>
@@ -292,5 +292,5 @@ eat_whitespace<TokenT>::whitespace(TokenT &token, bool &skipped_newline)
 #include BOOST_ABI_SUFFIX
 #endif
 
-#endif // !defined(WHITESPACE_HANDLING_HPP_INCLUDED)
+#endif // !defined(BOOST_WHITESPACE_HANDLING_HPP_INCLUDED)
 
diff --git a/samples/cpp_tokens/cpp_tokens.hpp b/samples/cpp_tokens/cpp_tokens.hpp
index a4903696b..0ace0a91f 100644
--- a/samples/cpp_tokens/cpp_tokens.hpp
+++ b/samples/cpp_tokens/cpp_tokens.hpp
@@ -13,8 +13,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_TOKENS_HPP_D6A31137_CE14_4869_9779_6357E2C43187_INCLUDED)
-#define CPP_TOKENS_HPP_D6A31137_CE14_4869_9779_6357E2C43187_INCLUDED
+#if !defined(BOOST_CPP_TOKENS_HPP_D6A31137_CE14_4869_9779_6357E2C43187_INCLUDED)
+#define BOOST_CPP_TOKENS_HPP_D6A31137_CE14_4869_9779_6357E2C43187_INCLUDED
 
 ///////////////////////////////////////////////////////////////////////////////
 //  include often used files from the stdlib
@@ -35,4 +35,4 @@
 #include <boost/assert.hpp>
 #include <boost/pool/pool_alloc.hpp>
 
-#endif // !defined(CPP_TOKENS_HPP_D6A31137_CE14_4869_9779_6357E2C43187_INCLUDED)
+#endif // !defined(BOOST_CPP_TOKENS_HPP_D6A31137_CE14_4869_9779_6357E2C43187_INCLUDED)
diff --git a/samples/cpp_tokens/cpp_tokens_config.hpp b/samples/cpp_tokens/cpp_tokens_config.hpp
index 80fa5ac24..8359a1ef8 100644
--- a/samples/cpp_tokens/cpp_tokens_config.hpp
+++ b/samples/cpp_tokens/cpp_tokens_config.hpp
@@ -11,8 +11,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_TOKENS_HPP_7C0F1F14_6ACA_4439_A073_32C61C0DB6C5_INCLUDED)
-#define CPP_TOKENS_HPP_7C0F1F14_6ACA_4439_A073_32C61C0DB6C5_INCLUDED
+#if !defined(BOOST_CPP_TOKENS_HPP_7C0F1F14_6ACA_4439_A073_32C61C0DB6C5_INCLUDED)
+#define BOOST_CPP_TOKENS_HPP_7C0F1F14_6ACA_4439_A073_32C61C0DB6C5_INCLUDED
 
 ///////////////////////////////////////////////////////////////////////////////
 //  Uncomment the following, if you need debug output, the 
@@ -52,4 +52,4 @@
 #pragma inline_recursion(on)
 #endif // defined(BOOST_MSVC)
 
-#endif // !defined(CPP_TOKENS_HPP_7C0F1F14_6ACA_4439_A073_32C61C0DB6C5_INCLUDED)
+#endif // !defined(BOOST_CPP_TOKENS_HPP_7C0F1F14_6ACA_4439_A073_32C61C0DB6C5_INCLUDED)
diff --git a/samples/cpp_tokens/slex/cpp_slex_lexer.hpp b/samples/cpp_tokens/slex/cpp_slex_lexer.hpp
index 945ac496a..108ac996c 100644
--- a/samples/cpp_tokens/slex/cpp_slex_lexer.hpp
+++ b/samples/cpp_tokens/slex/cpp_slex_lexer.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(SLEX_LEXER_HPP_5E8E1DF0_BB41_4938_B7E5_A4BB68222FF6_INCLUDED)
-#define SLEX_LEXER_HPP_5E8E1DF0_BB41_4938_B7E5_A4BB68222FF6_INCLUDED
+#if !defined(BOOST_SLEX_LEXER_HPP_5E8E1DF0_BB41_4938_B7E5_A4BB68222FF6_INCLUDED)
+#define BOOST_SLEX_LEXER_HPP_5E8E1DF0_BB41_4938_B7E5_A4BB68222FF6_INCLUDED
 
 #include <string>
 #if defined(BOOST_SPIRIT_DEBUG)
@@ -824,4 +824,4 @@ new_lexer_gen<IteratorT, PositionT>::new_lexer(IteratorT const &first,
 }   // namespace wave
 }   // namespace boost
 
-#endif // !defined(SLEX_LEXER_HPP_5E8E1DF0_BB41_4938_B7E5_A4BB68222FF6_INCLUDED)
+#endif // !defined(BOOST_SLEX_LEXER_HPP_5E8E1DF0_BB41_4938_B7E5_A4BB68222FF6_INCLUDED)
diff --git a/samples/cpp_tokens/slex_interface.hpp b/samples/cpp_tokens/slex_interface.hpp
index c89c2e9ac..345625345 100644
--- a/samples/cpp_tokens/slex_interface.hpp
+++ b/samples/cpp_tokens/slex_interface.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(SLEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED)
-#define SLEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED
+#if !defined(BOOST_SLEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED)
+#define BOOST_SLEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED
 
 #include <boost/wave/language_support.hpp>
 #include <boost/wave/util/file_position.hpp>
@@ -85,4 +85,4 @@ struct slex_input_interface
 }   // namespace wave
 }   // namespace boost 
 
-#endif // !defined(SLEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED)
+#endif // !defined(BOOST_SLEX_INTERFACE_HPP_E83F52A4_90AC_4FBE_A9A7_B65F7F94C497_INCLUDED)
diff --git a/samples/cpp_tokens/slex_token.hpp b/samples/cpp_tokens/slex_token.hpp
index 8a54776d7..223441619 100644
--- a/samples/cpp_tokens/slex_token.hpp
+++ b/samples/cpp_tokens/slex_token.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(SLEX_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED)
-#define SLEX_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED
+#if !defined(BOOST_SLEX_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED)
+#define BOOST_SLEX_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED
 
 #include <iomanip>
 #include <ios>
@@ -142,4 +142,4 @@ token_is_valid(slex_token<Position> const& t)
 }   // namespace wave
 }   // namespace boost
 
-#endif // !defined(SLEX_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED)
+#endif // !defined(BOOST_SLEX_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED)
diff --git a/samples/hannibal/translation_unit_parser.h b/samples/hannibal/translation_unit_parser.h
index 5ff64f1b8..7751283ff 100644
--- a/samples/hannibal/translation_unit_parser.h
+++ b/samples/hannibal/translation_unit_parser.h
@@ -9,8 +9,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying 
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#if !defined(HANNIBAL_TRANSLATION_UNIT_GRAMMAR_H_INCLUDED)
-#define HANNIBAL_TRANSLATION_UNIT_GRAMMAR_H_INCLUDED
+#if !defined(BOOST_HANNIBAL_TRANSLATION_UNIT_GRAMMAR_H_INCLUDED)
+#define BOOST_HANNIBAL_TRANSLATION_UNIT_GRAMMAR_H_INCLUDED
 
 #include <map>
 #if defined(HANNIBAL_TRACE_DECLARATIONS)
@@ -1345,4 +1345,4 @@ struct translation_unit_grammar
 #undef HANNIBAL_REGISTER_RULE
 #undef HANNIBAL_TRACE_TRANSLATION_UNIT_GRAMMAR
 
-#endif // HANNIBAL_TRANSLATION_UNIT_GRAMMAR_H_INCLUDED
+#endif // BOOST_HANNIBAL_TRANSLATION_UNIT_GRAMMAR_H_INCLUDED
diff --git a/samples/hannibal/translation_unit_skipper.h b/samples/hannibal/translation_unit_skipper.h
index 4dc2e2737..03d50af8d 100644
--- a/samples/hannibal/translation_unit_skipper.h
+++ b/samples/hannibal/translation_unit_skipper.h
@@ -9,8 +9,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying 
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#if !defined(HANNIBAL_TRANSLATION_UNIT_SKIPPER_H_INCLUDED)
-#define HANNIBAL_TRANSLATION_UNIT_SKIPPER_H_INCLUDED
+#if !defined(BOOST_HANNIBAL_TRANSLATION_UNIT_SKIPPER_H_INCLUDED)
+#define BOOST_HANNIBAL_TRANSLATION_UNIT_SKIPPER_H_INCLUDED
 
 #include <boost/spirit/include/classic_core.hpp>
 #include <boost/spirit/include/classic_confix.hpp>
@@ -48,4 +48,4 @@ struct translation_unit_skipper
     };
 };
 
-#endif // HANNIBAL_TRANSLATION_UNIT_SKIPPER_H_INCLUDED
+#endif // BOOST_HANNIBAL_TRANSLATION_UNIT_SKIPPER_H_INCLUDED
diff --git a/samples/list_includes/list_includes.hpp b/samples/list_includes/list_includes.hpp
index 5b8d9f146..71f04c090 100644
--- a/samples/list_includes/list_includes.hpp
+++ b/samples/list_includes/list_includes.hpp
@@ -11,8 +11,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(LIST_INCLUDES_HPP_843DB412_3AA8_4BCF_8081_AA4A5FDE0BE7_INCLUDED)
-#define LIST_INCLUDES_HPP_843DB412_3AA8_4BCF_8081_AA4A5FDE0BE7_INCLUDED
+#if !defined(BOOST_LIST_INCLUDES_HPP_843DB412_3AA8_4BCF_8081_AA4A5FDE0BE7_INCLUDED)
+#define BOOST_LIST_INCLUDES_HPP_843DB412_3AA8_4BCF_8081_AA4A5FDE0BE7_INCLUDED
 
 ///////////////////////////////////////////////////////////////////////////////
 //  include often used files from the stdlib
@@ -39,4 +39,4 @@
 #include <boost/assert.hpp>
 #include <boost/pool/pool_alloc.hpp>
 
-#endif // !defined(LIST_INCLUDES_HPP_843DB412_3AA8_4BCF_8081_AA4A5FDE0BE7_INCLUDED)
+#endif // !defined(BOOST_LIST_INCLUDES_HPP_843DB412_3AA8_4BCF_8081_AA4A5FDE0BE7_INCLUDED)
diff --git a/samples/list_includes/list_includes_config.hpp b/samples/list_includes/list_includes_config.hpp
index 59556af09..f6380feb8 100644
--- a/samples/list_includes/list_includes_config.hpp
+++ b/samples/list_includes/list_includes_config.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(LIST_INCLUDES_CONFIG_HPP_0DE80E47_8D50_4DFA_9C1C_0EECAA8A934A_INCLUDED)
-#define LIST_INCLUDES_CONFIG_HPP_0DE80E47_8D50_4DFA_9C1C_0EECAA8A934A_INCLUDED
+#if !defined(BOOST_LIST_INCLUDES_CONFIG_HPP_0DE80E47_8D50_4DFA_9C1C_0EECAA8A934A_INCLUDED)
+#define BOOST_LIST_INCLUDES_CONFIG_HPP_0DE80E47_8D50_4DFA_9C1C_0EECAA8A934A_INCLUDED
 
 ///////////////////////////////////////////////////////////////////////////////
 //  Uncomment the following, if you need debug output, the 
@@ -61,4 +61,4 @@
 #pragma inline_recursion(on)
 #endif // defined(BOOST_MSVC)
 
-#endif // !defined(LIST_INCLUDES_CONFIG_HPP_0DE80E47_8D50_4DFA_9C1C_0EECAA8A934A_INCLUDED)
+#endif // !defined(BOOST_LIST_INCLUDES_CONFIG_HPP_0DE80E47_8D50_4DFA_9C1C_0EECAA8A934A_INCLUDED)
diff --git a/samples/list_includes/list_includes_version.hpp b/samples/list_includes/list_includes_version.hpp
index 8f517e080..f7772e87f 100644
--- a/samples/list_includes/list_includes_version.hpp
+++ b/samples/list_includes/list_includes_version.hpp
@@ -10,11 +10,11 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(LIST_INCLUDES_VERSION_HPP_FF662D6C_C3E6_4BEC_A062_5D9BD7415EBF_INCLUDED)
-#define LIST_INCLUDES_VERSION_HPP_FF662D6C_C3E6_4BEC_A062_5D9BD7415EBF_INCLUDED
+#if !defined(BOOST_LIST_INCLUDES_VERSION_HPP_FF662D6C_C3E6_4BEC_A062_5D9BD7415EBF_INCLUDED)
+#define BOOST_LIST_INCLUDES_VERSION_HPP_FF662D6C_C3E6_4BEC_A062_5D9BD7415EBF_INCLUDED
 
 #define LIST_INCLUDES_VERSION_MAJOR           0
 #define LIST_INCLUDES_VERSION_MINOR           4
 #define LIST_INCLUDES_VERSION_SUBMINOR        0
 
-#endif // !defined(LIST_INCLUDES_VERSION_HPP_FF662D6C_C3E6_4BEC_A062_5D9BD7415EBF_INCLUDED)
+#endif // !defined(BOOST_LIST_INCLUDES_VERSION_HPP_FF662D6C_C3E6_4BEC_A062_5D9BD7415EBF_INCLUDED)
diff --git a/samples/real_positions/correct_token_positions.hpp b/samples/real_positions/correct_token_positions.hpp
index e42fd08c9..b29a4b768 100644
--- a/samples/real_positions/correct_token_positions.hpp
+++ b/samples/real_positions/correct_token_positions.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CORRECT_TOKEN_POSITIONS_HK_061106_INCLUDED)
-#define CORRECT_TOKEN_POSITIONS_HK_061106_INCLUDED
+#if !defined(BOOST_CORRECT_TOKEN_POSITIONS_HK_061106_INCLUDED)
+#define BOOST_CORRECT_TOKEN_POSITIONS_HK_061106_INCLUDED
 
 #include <boost/iterator/transform_iterator.hpp>
 
diff --git a/samples/real_positions/real_position_token.hpp b/samples/real_positions/real_position_token.hpp
index 413cf81c2..4d386a284 100644
--- a/samples/real_positions/real_position_token.hpp
+++ b/samples/real_positions/real_position_token.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(REAL_POSITION_TOKEN_HPP_HK_061109_INCLUDED)
-#define REAL_POSITION_TOKEN_HPP_HK_061109_INCLUDED
+#if !defined(BOOST_REAL_POSITION_TOKEN_HPP_HK_061109_INCLUDED)
+#define BOOST_REAL_POSITION_TOKEN_HPP_HK_061109_INCLUDED
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/util/file_position.hpp>
@@ -215,4 +215,4 @@ token_is_valid(lex_token<Position> const& t)
     return t.is_valid();
 }
 
-#endif // !defined(REAL_POSITION_TOKEN_HPP_HK_061109_INCLUDED)
+#endif // !defined(BOOST_REAL_POSITION_TOKEN_HPP_HK_061109_INCLUDED)
diff --git a/samples/token_statistics/collect_token_statistics.hpp b/samples/token_statistics/collect_token_statistics.hpp
index 971eb4955..aca26b87f 100644
--- a/samples/token_statistics/collect_token_statistics.hpp
+++ b/samples/token_statistics/collect_token_statistics.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(COLLECT_TOKEN_STATISTICS_VERSION_HPP)
-#define COLLECT_TOKEN_STATISTICS_VERSION_HPP
+#if !defined(BOOST_COLLECT_TOKEN_STATISTICS_VERSION_HPP)
+#define BOOST_COLLECT_TOKEN_STATISTICS_VERSION_HPP
 
 #include <algorithm>
 #include <map>
@@ -69,4 +69,4 @@ class collect_token_statistics
     int token_count[count];
 };
 
-#endif // !defined(COLLECT_TOKEN_STATISTICS_VERSION_HPP)
+#endif // !defined(BOOST_COLLECT_TOKEN_STATISTICS_VERSION_HPP)
diff --git a/samples/token_statistics/token_statistics.hpp b/samples/token_statistics/token_statistics.hpp
index 8c7fff328..30a640d2c 100644
--- a/samples/token_statistics/token_statistics.hpp
+++ b/samples/token_statistics/token_statistics.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(TOKEN_STATISTICS_HPP)
-#define TOKEN_STATISTICS_HPP
+#if !defined(BOOST_TOKEN_STATISTICS_HPP)
+#define BOOST_TOKEN_STATISTICS_HPP
 
 ///////////////////////////////////////////////////////////////////////////////
 //  include often used files from the stdlib
@@ -46,4 +46,4 @@
 //  include required boost libraries
 #include <boost/pool/pool_alloc.hpp>
 
-#endif // !defined(TOKEN_STATISTICS_HPP)
+#endif // !defined(BOOST_TOKEN_STATISTICS_HPP)
diff --git a/samples/token_statistics/token_statistics_version.hpp b/samples/token_statistics/token_statistics_version.hpp
index 5092a9e6e..f9d4a39fd 100644
--- a/samples/token_statistics/token_statistics_version.hpp
+++ b/samples/token_statistics/token_statistics_version.hpp
@@ -10,11 +10,11 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(TOKEN_STATISTICS_VERSION_HPP)
-#define TOKEN_STATISTICS_VERSION_HPP
+#if !defined(BOOST_TOKEN_STATISTICS_VERSION_HPP)
+#define BOOST_TOKEN_STATISTICS_VERSION_HPP
 
 #define TOKEN_STATISTICS_VERSION_MAJOR           0
 #define TOKEN_STATISTICS_VERSION_MINOR           1
 #define TOKEN_STATISTICS_VERSION_SUBMINOR        0
 
-#endif // !defined(TOKEN_STATISTICS_VERSION_HPP)
+#endif // !defined(BOOST_TOKEN_STATISTICS_VERSION_HPP)
diff --git a/samples/token_statistics/xlex/xlex_lexer.hpp b/samples/token_statistics/xlex/xlex_lexer.hpp
index a55250e0c..d9fe0ce33 100644
--- a/samples/token_statistics/xlex/xlex_lexer.hpp
+++ b/samples/token_statistics/xlex/xlex_lexer.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(XLEX_LEXER_HPP)
-#define XLEX_LEXER_HPP
+#if !defined(BOOST_XLEX_LEXER_HPP)
+#define BOOST_XLEX_LEXER_HPP
 
 #include <string>
 #include <cstdio>
@@ -592,4 +592,4 @@ new_lexer_gen<Iterator, Position>::new_lexer(Iterator const &first,
 }   // namespace wave
 }   // namespace boost
      
-#endif // !defined(XLEX_LEXER_HPP)
+#endif // !defined(BOOST_XLEX_LEXER_HPP)
diff --git a/samples/token_statistics/xlex/xpressive_lexer.hpp b/samples/token_statistics/xlex/xpressive_lexer.hpp
index 0e62ccc46..99b06a438 100644
--- a/samples/token_statistics/xlex/xpressive_lexer.hpp
+++ b/samples/token_statistics/xlex/xpressive_lexer.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(XPRESSIVE_LEXER_HPP)
-#define XPRESSIVE_LEXER_HPP
+#if !defined(BOOST_XPRESSIVE_LEXER_HPP)
+#define BOOST_XPRESSIVE_LEXER_HPP
 
 #include <string>
 #include <vector>
@@ -130,6 +130,6 @@ xpressive_lexer<Iterator, Token, Callback>::next_token(
 ///////////////////////////////////////////////////////////////////////////////
 }}}} // boost::wave::cpplexer::xlex
 
-#endif // !defined(XPRESSIVE_LEXER_HPP)
+#endif // !defined(BOOST_XPRESSIVE_LEXER_HPP)
 
 
diff --git a/samples/token_statistics/xlex_interface.hpp b/samples/token_statistics/xlex_interface.hpp
index a1edabd89..92887e52d 100644
--- a/samples/token_statistics/xlex_interface.hpp
+++ b/samples/token_statistics/xlex_interface.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(XLEX_INTERFACE_HPP)
-#define XLEX_INTERFACE_HPP
+#if !defined(BOOST_XLEX_INTERFACE_HPP)
+#define BOOST_XLEX_INTERFACE_HPP
 
 #include <boost/wave/language_support.hpp>
 #include <boost/wave/util/file_position.hpp>
@@ -86,4 +86,4 @@ struct xlex_input_interface
 }   // namespace wave
 }   // namespace boost 
 
-#endif // !defined(XLEX_INTERFACE_HPP)
+#endif // !defined(BOOST_XLEX_INTERFACE_HPP)
diff --git a/samples/waveidl/idl.hpp b/samples/waveidl/idl.hpp
index ee565f7af..6dda508e5 100644
--- a/samples/waveidl/idl.hpp
+++ b/samples/waveidl/idl.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(IDL_HPP_FC7EE131_5CE9_43F2_A713_8D9BBC3C8477_INCLUDED)
-#define IDL_HPP_FC7EE131_5CE9_43F2_A713_8D9BBC3C8477_INCLUDED
+#if !defined(BOOST_IDL_HPP_FC7EE131_5CE9_43F2_A713_8D9BBC3C8477_INCLUDED)
+#define BOOST_IDL_HPP_FC7EE131_5CE9_43F2_A713_8D9BBC3C8477_INCLUDED
 
 ///////////////////////////////////////////////////////////////////////////////
 //  This file may be used as a precompiled header (if applicable)
@@ -42,4 +42,4 @@
 #include <boost/assert.hpp>
 #include <boost/pool/pool_alloc.hpp>
 
-#endif // !defined(IDL_HPP_FC7EE131_5CE9_43F2_A713_8D9BBC3C8477_INCLUDED)
+#endif // !defined(BOOST_IDL_HPP_FC7EE131_5CE9_43F2_A713_8D9BBC3C8477_INCLUDED)
diff --git a/samples/waveidl/idl_config.hpp b/samples/waveidl/idl_config.hpp
index a7314fb35..29de82b56 100644
--- a/samples/waveidl/idl_config.hpp
+++ b/samples/waveidl/idl_config.hpp
@@ -11,8 +11,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(IDL_CONFIG_HPP_012D7524_FF3F_482F_9123_91966C72F4EA_INCLUDED)
-#define IDL_CONFIG_HPP_012D7524_FF3F_482F_9123_91966C72F4EA_INCLUDED
+#if !defined(BOOST_IDL_CONFIG_HPP_012D7524_FF3F_482F_9123_91966C72F4EA_INCLUDED)
+#define BOOST_IDL_CONFIG_HPP_012D7524_FF3F_482F_9123_91966C72F4EA_INCLUDED
 
 ///////////////////////////////////////////////////////////////////////////////
 //  Uncomment the following, if you need debug output, the 
@@ -62,4 +62,4 @@
 #pragma inline_recursion(on)
 #endif // defined(BOOST_MSVC)
 
-#endif // !defined(IDL_CONFIG_HPP_012D7524_FF3F_482F_9123_91966C72F4EA_INCLUDED)
+#endif // !defined(BOOST_IDL_CONFIG_HPP_012D7524_FF3F_482F_9123_91966C72F4EA_INCLUDED)
diff --git a/samples/waveidl/idl_version.hpp b/samples/waveidl/idl_version.hpp
index 3ab6ade36..86960ef2c 100644
--- a/samples/waveidl/idl_version.hpp
+++ b/samples/waveidl/idl_version.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(IDL_VERSION_HPP_780C1190_3107_440B_B303_B687A449749B_INCLUDED)
-#define IDL_VERSION_HPP_780C1190_3107_440B_B303_B687A449749B_INCLUDED
+#if !defined(BOOST_IDL_VERSION_HPP_780C1190_3107_440B_B303_B687A449749B_INCLUDED)
+#define BOOST_IDL_VERSION_HPP_780C1190_3107_440B_B303_B687A449749B_INCLUDED
 
 #include <boost/wave/wave_version.hpp>  
 
@@ -20,4 +20,4 @@
 #define IDL_VERSION_SUBMINOR        BOOST_WAVE_VERSION_SUBMINOR
 #define IDL_VERSION_DATE            20050117L
 
-#endif // !defined(IDL_VERSION_HPP_780C1190_3107_440B_B303_B687A449749B_INCLUDED)
+#endif // !defined(BOOST_IDL_VERSION_HPP_780C1190_3107_440B_B303_B687A449749B_INCLUDED)
diff --git a/samples/waveidl/idllexer/idl_lex_interface.hpp b/samples/waveidl/idllexer/idl_lex_interface.hpp
index 3ee295d87..ac89e0c1f 100644
--- a/samples/waveidl/idllexer/idl_lex_interface.hpp
+++ b/samples/waveidl/idllexer/idl_lex_interface.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(IDL_LEX_INTERFACE_HPP_INCLUDED)
-#define IDL_LEX_INTERFACE_HPP_INCLUDED
+#if !defined(BOOST_IDL_LEX_INTERFACE_HPP_INCLUDED)
+#define BOOST_IDL_LEX_INTERFACE_HPP_INCLUDED
 
 #include <boost/wave/util/file_position.hpp>
 #include <boost/wave/language_support.hpp>
@@ -75,4 +75,4 @@ struct lex_input_interface_generator
 }   // namespace wave
 }   // namespace boost 
 
-#endif // !defined(IDL_LEX_INTERFACE_HPP_INCLUDED)
+#endif // !defined(BOOST_IDL_LEX_INTERFACE_HPP_INCLUDED)
diff --git a/samples/waveidl/idllexer/idl_re.hpp b/samples/waveidl/idllexer/idl_re.hpp
index 3b4f1ebd7..719b39d53 100644
--- a/samples/waveidl/idllexer/idl_re.hpp
+++ b/samples/waveidl/idllexer/idl_re.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(IDL_RE_HPP_BD62775D_1659_4684_872C_03C02543C9A5_INCLUDED)
-#define IDL_RE_HPP_BD62775D_1659_4684_872C_03C02543C9A5_INCLUDED
+#if !defined(BOOST_IDL_RE_HPP_BD62775D_1659_4684_872C_03C02543C9A5_INCLUDED)
+#define BOOST_IDL_RE_HPP_BD62775D_1659_4684_872C_03C02543C9A5_INCLUDED
 
 #include <cstdio>
 
@@ -361,4 +361,4 @@ BOOST_WAVE_DECL boost::wave::token_id scan(
 
 #undef RE2C_ASSERT
 
-#endif // !defined(IDL_RE_HPP_BD62775D_1659_4684_872C_03C02543C9A5_INCLUDED)
+#endif // !defined(BOOST_IDL_RE_HPP_BD62775D_1659_4684_872C_03C02543C9A5_INCLUDED)
diff --git a/samples/waveidl/idllexer/idl_re2c_lexer.hpp b/samples/waveidl/idllexer/idl_re2c_lexer.hpp
index e5d9a3a03..8fb224065 100644
--- a/samples/waveidl/idllexer/idl_re2c_lexer.hpp
+++ b/samples/waveidl/idllexer/idl_re2c_lexer.hpp
@@ -10,8 +10,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(IDL_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED)
-#define IDL_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED
+#if !defined(BOOST_IDL_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED)
+#define BOOST_IDL_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED
 
 #include <string>
 #include <cstdio>
@@ -268,4 +268,4 @@ new_lexer_gen<IteratorT, PositionT>::new_lexer(IteratorT const &first,
 }   // namespace wave
 }   // namespace boost
      
-#endif // !defined(IDL_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED)
+#endif // !defined(BOOST_IDL_RE2C_LEXER_HPP_B81A2629_D5B1_4944_A97D_60254182B9A8_INCLUDED)
diff --git a/tool/cpp.hpp b/tool/cpp.hpp
index 856175043..7dd7001da 100644
--- a/tool/cpp.hpp
+++ b/tool/cpp.hpp
@@ -8,8 +8,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_HPP_920D0370_741F_44AF_BF86_F6104BDACF75_INCLUDED)
-#define CPP_HPP_920D0370_741F_44AF_BF86_F6104BDACF75_INCLUDED
+#if !defined(BOOST_CPP_HPP_920D0370_741F_44AF_BF86_F6104BDACF75_INCLUDED)
+#define BOOST_CPP_HPP_920D0370_741F_44AF_BF86_F6104BDACF75_INCLUDED
 
 ///////////////////////////////////////////////////////////////////////////////
 //  This file may be used as a precompiled header (if applicable)
@@ -39,4 +39,4 @@
 #include <boost/assert.hpp>
 #include <boost/pool/pool_alloc.hpp>
 
-#endif // !defined(CPP_HPP_920D0370_741F_44AF_BF86_F6104BDACF75_INCLUDED)
+#endif // !defined(BOOST_CPP_HPP_920D0370_741F_44AF_BF86_F6104BDACF75_INCLUDED)
diff --git a/tool/cpp_config.hpp b/tool/cpp_config.hpp
index e6e4f63e2..ad573f1ae 100644
--- a/tool/cpp_config.hpp
+++ b/tool/cpp_config.hpp
@@ -9,8 +9,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED)
-#define CPP_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED
+#if !defined(BOOST_CPP_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED)
+#define BOOST_CPP_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED
 
 ///////////////////////////////////////////////////////////////////////////////
 //  Uncomment the following, if you need debug output, the 
@@ -60,4 +60,4 @@
 #pragma inline_recursion(on)
 #endif // defined(BOOST_MSVC)
 
-#endif // !defined(CPP_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED)
+#endif // !defined(BOOST_CPP_CONFIG_HPP_F143F90A_A63F_4B27_AC41_9CA4F14F538D_INCLUDED)
diff --git a/tool/cpp_version.hpp b/tool/cpp_version.hpp
index 43330c2c9..c9b75f8b2 100644
--- a/tool/cpp_version.hpp
+++ b/tool/cpp_version.hpp
@@ -7,8 +7,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(CPP_VERSION_HPP_CE4FE67F_63F9_468D_8364_C855F89D3C5D_INCLUDED)
-#define CPP_VERSION_HPP_CE4FE67F_63F9_468D_8364_C855F89D3C5D_INCLUDED
+#if !defined(BOOST_CPP_VERSION_HPP_CE4FE67F_63F9_468D_8364_C855F89D3C5D_INCLUDED)
+#define BOOST_CPP_VERSION_HPP_CE4FE67F_63F9_468D_8364_C855F89D3C5D_INCLUDED
 
 #include <boost/wave/wave_version.hpp>
 
@@ -22,4 +22,4 @@
 #define CPP_VERSION_DATE            20120523L
 #define CPP_VERSION_DATE_STR        "20120523"
 
-#endif // !defined(CPP_VERSION_HPP_CE4FE67F_63F9_468D_8364_C855F89D3C5D_INCLUDED)
+#endif // !defined(BOOST_CPP_VERSION_HPP_CE4FE67F_63F9_468D_8364_C855F89D3C5D_INCLUDED)
diff --git a/tool/stop_watch.hpp b/tool/stop_watch.hpp
index bdbc9334e..6a35fce2d 100644
--- a/tool/stop_watch.hpp
+++ b/tool/stop_watch.hpp
@@ -7,8 +7,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(STOP_WATCH_HPP_HK040911_INCLUDED)
-#define STOP_WATCH_HPP_HK040911_INCLUDED
+#if !defined(BOOST_STOP_WATCH_HPP_HK040911_INCLUDED)
+#define BOOST_STOP_WATCH_HPP_HK040911_INCLUDED
 
 #include <boost/config.hpp>
 #include <boost/timer/timer.hpp>
@@ -50,4 +50,4 @@ class stop_watch : public boost::timer::cpu_timer {
     
 };
 
-#endif // !defined(STOP_WATCH_HPP_HK040911_INCLUDED)
+#endif // !defined(BOOST_STOP_WATCH_HPP_HK040911_INCLUDED)
diff --git a/tool/trace_macro_expansion.hpp b/tool/trace_macro_expansion.hpp
index 837b2cd35..c38e80f9b 100644
--- a/tool/trace_macro_expansion.hpp
+++ b/tool/trace_macro_expansion.hpp
@@ -7,8 +7,8 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(TRACE_MACRO_EXPANSION_HPP_D8469318_8407_4B9D_A19F_13CA60C1661F_INCLUDED)
-#define TRACE_MACRO_EXPANSION_HPP_D8469318_8407_4B9D_A19F_13CA60C1661F_INCLUDED
+#if !defined(BOOST_TRACE_MACRO_EXPANSION_HPP_D8469318_8407_4B9D_A19F_13CA60C1661F_INCLUDED)
+#define BOOST_TRACE_MACRO_EXPANSION_HPP_D8469318_8407_4B9D_A19F_13CA60C1661F_INCLUDED
 
 #include <cstdio>
 #include <cstdlib>
@@ -1489,4 +1489,4 @@ class trace_macro_expansion
 #undef BOOST_WAVE_GETSTRING
 #undef BOOST_WAVE_OSSTREAM
 
-#endif // !defined(TRACE_MACRO_EXPANSION_HPP_D8469318_8407_4B9D_A19F_13CA60C1661F_INCLUDED)
+#endif // !defined(BOOST_TRACE_MACRO_EXPANSION_HPP_D8469318_8407_4B9D_A19F_13CA60C1661F_INCLUDED)