diff --git a/xpcom/glue/nsQuickSort.cpp b/xpcom/glue/nsQuickSort.cpp
index f243258f085..e6953ac623b 100644
--- a/xpcom/glue/nsQuickSort.cpp
+++ b/xpcom/glue/nsQuickSort.cpp
@@ -39,10 +39,9 @@
 
 #include <stdlib.h>
 #include "prtypes.h"
-#include "nsComObsolete.h"
 #include "nsQuickSort.h"
 
-NS_BEGIN_EXTERN_C
+PR_BEGIN_EXTERN_C
 
 #if !defined(DEBUG) && (defined(__cplusplus) || defined(__gcc))
 # ifndef INLINE
@@ -184,4 +183,4 @@ loop:	SWAPINIT(a, es);
 /*		NS_QuickSort(pn - r, r / es, es, cmp, data);*/
 }
 
-NS_END_EXTERN_C
+PR_END_EXTERN_C
diff --git a/xpcom/glue/nsQuickSort.h b/xpcom/glue/nsQuickSort.h
index f8e103ebf81..0172b1c6eef 100644
--- a/xpcom/glue/nsQuickSort.h
+++ b/xpcom/glue/nsQuickSort.h
@@ -44,8 +44,7 @@
 #define nsQuickSort_h___
 
 #include "prtypes.h"
-#include "nsComObsolete.h"
-NS_BEGIN_EXTERN_C
+PR_BEGIN_EXTERN_C
 
 /**
  * Parameters:
@@ -63,6 +62,6 @@ PR_EXTERN(void) NS_QuickSort(void *, unsigned int, unsigned int,
                              int (*)(const void *, const void *, void *), 
                              void *);
 
-NS_END_EXTERN_C
+PR_END_EXTERN_C
 
 #endif /* nsQuickSort_h___ */