5 files changed, 18 insertions, 0 deletions
diff --git a/extensions/source/activex/main/SOActiveX.h b/extensions/source/activex/main/SOActiveX.h
index 3a5753531bf5..a184fcb1cb02 100644
--- a/extensions/source/activex/main/SOActiveX.h
+++ b/extensions/source/activex/main/SOActiveX.h
@@ -7,6 +7,10 @@
 #include <ExDispID.h>
 #include <ExDisp.h>
 #include <shlguid.h>
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#undef _DEBUG
+#endif
 #include <atlctl.h>
 
 #include "so_activex.h"
diff --git a/extensions/source/activex/main/SOComWindowPeer.h b/extensions/source/activex/main/SOComWindowPeer.h
index 76221ed47868..a97135729a17 100644
--- a/extensions/source/activex/main/SOComWindowPeer.h
+++ b/extensions/source/activex/main/SOComWindowPeer.h
@@ -13,6 +13,10 @@
 #include <ExDispID.h>
 #include <ExDisp.h>
 #include <shlguid.h>
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#undef _DEBUG
+#endif
 #include <atlctl.h>
 
 #include "so_activex.h"
diff --git a/extensions/source/activex/main/SODispatchInterceptor.h b/extensions/source/activex/main/SODispatchInterceptor.h
index d355a653cdbb..411810a1d188 100644
--- a/extensions/source/activex/main/SODispatchInterceptor.h
+++ b/extensions/source/activex/main/SODispatchInterceptor.h
@@ -13,6 +13,10 @@
 #include <ExDispID.h>
 #include <ExDisp.h>
 #include <shlguid.h>
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#undef _DEBUG
+#endif
 #include <atlctl.h>
 
 #include "so_activex.h"
diff --git a/extensions/source/activex/main/StdAfx2.cpp b/extensions/source/activex/main/StdAfx2.cpp
index 06274f78824d..dda7bab38a52 100644
--- a/extensions/source/activex/main/StdAfx2.cpp
+++ b/extensions/source/activex/main/StdAfx2.cpp
@@ -9,4 +9,7 @@
 #include <statreg.cpp>
 #endif
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#undef _DEBUG
+#endif
 #include <atlimpl.cpp>
diff --git a/extensions/source/activex/main/StdAfx2.h b/extensions/source/activex/main/StdAfx2.h
index ff5d87e57dc3..ac46cfe9d22a 100644
--- a/extensions/source/activex/main/StdAfx2.h
+++ b/extensions/source/activex/main/StdAfx2.h
@@ -18,6 +18,9 @@
 
 #define min(a, b)  (((a) < (b)) ? (a) : (b))
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#undef _DEBUG
+#endif
 #include <atlbase.h>
 //You may derive a class from CComModule and use it if you want to override
 //something, but do not change the name of _Module