diff --git a/include/boost/config/compiler/cray.hpp b/include/boost/config/compiler/cray.hpp
index 2ceb49c9..8e797831 100644
--- a/include/boost/config/compiler/cray.hpp
+++ b/include/boost/config/compiler/cray.hpp
@@ -31,6 +31,10 @@
 //     other parameters (i.e. C++ standards conformance level and GCC
 //     extensions).
 
+////
+//// Front matter
+////
+
 #define BOOST_CRAY_VERSION (_RELEASE_MAJOR * 10000 + _RELEASE_MINOR * 100 + _RELEASE_PATCHLEVEL)
 
 #ifdef __GNUC__
@@ -212,3 +216,10 @@
 #if BOOST_CRAY_VERSION >= 80605
 #endif // BOOST_CRAY_VERSION >= 80605
 
+////
+//// Remove temporary macros
+////
+
+#undef BOOST_GCC_VERSION
+#undef BOOST_CRAY_VERSION
+