diff --git a/include/boost/mpl/and.hpp b/include/boost/mpl/and.hpp
index 722c7a8..4ec63ee 100644
--- a/include/boost/mpl/and.hpp
+++ b/include/boost/mpl/and.hpp
@@ -29,21 +29,25 @@
 // has to be checked in a separate condition, otherwise GCC complains 
 // about 'and' being an alternative token
 #if defined(_MSC_VER) 
+#ifndef __GCCXML__
 #if defined(and) 
 #   pragma push_macro("and")
 #   undef and
 #   define and(x)
 #endif
 #endif
+#endif
 
 #   define BOOST_MPL_PREPROCESSED_HEADER and.hpp
 #   include <boost/mpl/aux_/include_preprocessed.hpp>
 
 #if defined(_MSC_VER)
+#ifndef __GCCXML__
 #if defined(and) 
 #   pragma pop_macro("and")
 #endif
 #endif
+#endif
 
 #else
 
diff --git a/include/boost/mpl/or.hpp b/include/boost/mpl/or.hpp
index 559ca6b..750730a 100644
--- a/include/boost/mpl/or.hpp
+++ b/include/boost/mpl/or.hpp
@@ -30,21 +30,25 @@
 // has to be checked in a separate condition, otherwise GCC complains 
 // about 'or' being an alternative token
 #if defined(_MSC_VER)
+#ifndef __GCCXML__
 #if defined(or)
 #   pragma push_macro("or")
 #   undef or
 #   define or(x)
 #endif
 #endif
+#endif
 
 #   define BOOST_MPL_PREPROCESSED_HEADER or.hpp
 #   include <boost/mpl/aux_/include_preprocessed.hpp>
 
 #if defined(_MSC_VER) 
+#ifndef __GCCXML__
 #if defined(or)
 #   pragma pop_macro("or")
 #endif
 #endif
+#endif
 
 #else