diff --git a/include/Inventor/errors/SoDebugError.h b/include/Inventor/errors/SoDebugError.h
index 6a0f0d0416..73463d4575 100644
--- a/include/Inventor/errors/SoDebugError.h
+++ b/include/Inventor/errors/SoDebugError.h
@@ -39,7 +39,8 @@
 // Avoid problem with Microsoft Win32 API headers (yes, they actually
 // #define ERROR -- in wingdi.h).
 #if defined(ERROR)
-#define SODEBUGERROR_STORE_ERROR_DEF ERROR
+#define SODEBUGERROR_STORE_ERROR_DEF
+#pragma push_macro("ERROR")
 #undef ERROR
 #endif /* ERROR */
 
@@ -82,7 +83,7 @@ class COIN_DLL_API SoDebugError : public SoError {
 
 // Avoid problem with Microsoft Win32 API headers (see above).
 #if defined(SODEBUGERROR_STORE_ERROR_DEF)
-#define ERROR SODEBUGERROR_STORE_ERROR_DEF
+#pragma pop_macro("ERROR")
 #undef SODEBUGERROR_STORE_ERROR_DEF
 #endif /* SODEBUGERROR_STORE_ERROR_DEF */