diff --git a/mozilla/xpcom/glue/nsISupportsImpl.h b/mozilla/xpcom/glue/nsISupportsImpl.h
index 1c572f1f2c3..dd794cd6eaa 100644
--- a/mozilla/xpcom/glue/nsISupportsImpl.h
+++ b/mozilla/xpcom/glue/nsISupportsImpl.h
@@ -49,6 +49,16 @@
 
 #ifdef XPCOM_GLUE
 // nsTraceRefcnt needs a cleaning...
+#undef NS_LOG_ADDREF
+#undef NS_LOG_RELEASE
+#undef NS_LOG_NEW_XPCOM
+#undef NS_LOG_DELETE_XPCOM
+#undef NS_LOG_ADDREF_CALL
+#undef NS_LOG_RELEASE_CALL
+#undef MOZ_DECL_CTOR_COUNTER
+#undef MOZ_COUNT_CTOR
+#undef MOZ_COUNT_DTOR
+
 #define NS_LOG_ADDREF(_p, _rc, _type, _size)
 #define NS_LOG_RELEASE(_p, _rc, _type)
 #define NS_LOG_NEW_XPCOM(_p,_type,_size,_file,_line)