diff --git a/include/boost/exception/exception.hpp b/include/boost/exception/exception.hpp
index 07e1245..ff873a0 100644
--- a/include/boost/exception/exception.hpp
+++ b/include/boost/exception/exception.hpp
@@ -3,8 +3,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)
 
-#ifndef UUID_274DA366004E11DCB1DDFE2E56D89593
-#define UUID_274DA366004E11DCB1DDFE2E56D89593
+#ifndef BOOST_UUID_274DA366004E11DCB1DDFE2E56D89593
+#define BOOST_UUID_274DA366004E11DCB1DDFE2E56D89593
 
 #include <boost/config.hpp>
 
@@ -478,4 +478,5 @@ boost
 #if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
 #pragma warning(pop)
 #endif
-#endif
+
+#endif // #ifndef BOOST_UUID_274DA366004E11DCB1DDFE2E56D89593
diff --git a/include/boost/throw_exception.hpp b/include/boost/throw_exception.hpp
index 7a666eb..17aff51 100644
--- a/include/boost/throw_exception.hpp
+++ b/include/boost/throw_exception.hpp
@@ -1,5 +1,5 @@
-#ifndef UUID_AA15E74A856F11E08B8D93F24824019B
-#define UUID_AA15E74A856F11E08B8D93F24824019B
+#ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED
+#define BOOST_THROW_EXCEPTION_HPP_INCLUDED
 
 // MS compatible compilers support #pragma once
 
@@ -179,4 +179,4 @@ template<class E> BOOST_NORETURN void throw_exception( E const & e, boost::sourc
 
 #define BOOST_THROW_EXCEPTION(x) ::boost::throw_exception(x, BOOST_CURRENT_LOCATION)
 
-#endif // #ifndef UUID_AA15E74A856F11E08B8D93F24824019B
+#endif // #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED