diff --git a/xpcom/glue/nsDebug.h b/xpcom/glue/nsDebug.h
index a8ad86cd8296..94ca472a7364 100644
--- a/xpcom/glue/nsDebug.h
+++ b/xpcom/glue/nsDebug.h
@@ -15,6 +15,7 @@
 #endif 
 
 #include "nsXPCOM.h"
+#include "mozilla/Assertions.h"
 
 #ifdef DEBUG
 #include "prprf.h"
@@ -347,12 +348,9 @@
 
 #ifdef XPCOM_GLUE
   #define NS_CheckThreadSafe(owningThread, msg)
-#elif defined MOZ_FATAL_ASSERTIONS_FOR_THREAD_SAFETY
-  #define NS_CheckThreadSafe(owningThread, msg)                 \
-    NS_ABORT_IF_FALSE(owningThread == PR_GetCurrentThread(), msg)
 #else
   #define NS_CheckThreadSafe(owningThread, msg)                 \
-    NS_ASSERTION(owningThread == PR_GetCurrentThread(), msg)
+    MOZ_ASSERT(owningThread == PR_GetCurrentThread(), msg)
 #endif
 
 /* When compiling the XPCOM Glue on Windows, we pretend that it's going to