diff --git a/mozilla/nsprpub/pr/include/md/_pth.h b/mozilla/nsprpub/pr/include/md/_pth.h
index a54f878354c..214fb9f98d2 100644
--- a/mozilla/nsprpub/pr/include/md/_pth.h
+++ b/mozilla/nsprpub/pr/include/md/_pth.h
@@ -226,6 +226,4 @@ extern int (*_PT_aix_yield_fcn)();
 #error "Need to define PTHREAD_YIELD for this platform"
 #endif
 
-#define _MD_INIT_LOCKS()
-
 #endif /* nspr_pth_defs_h_ */
diff --git a/mozilla/nsprpub/pr/include/private/primpl.h b/mozilla/nsprpub/pr/include/private/primpl.h
index 3bdf038033b..b594d07381c 100644
--- a/mozilla/nsprpub/pr/include/private/primpl.h
+++ b/mozilla/nsprpub/pr/include/private/primpl.h
@@ -726,6 +726,9 @@ PR_EXTERN(void) _PR_MD_WAKEUP_CPUS();
 
 /* Interrupts related */
 
+PR_EXTERN(void) _PR_MD_START_INTERRUPTS(void);
+#define    _PR_MD_START_INTERRUPTS _MD_START_INTERRUPTS
+
 PR_EXTERN(void) _PR_MD_STOP_INTERRUPTS(void);
 #define    _PR_MD_STOP_INTERRUPTS _MD_STOP_INTERRUPTS
 
@@ -792,6 +795,9 @@ extern void _PR_MD_EXIT(PRIntn status);
 
 /* Locks related */
 
+PR_EXTERN(void) _PR_MD_INIT_LOCKS(void);
+#define    _PR_MD_INIT_LOCKS _MD_INIT_LOCKS
+
 PR_EXTERN(PRStatus) _PR_MD_NEW_LOCK(_MDLock *md);
 #define    _PR_MD_NEW_LOCK _MD_NEW_LOCK
 
@@ -1214,12 +1220,6 @@ extern PRStatus _PR_MapOptionName(
 extern void _PR_InitThreads(
     PRThreadType type, PRThreadPriority priority, PRUintn maxPTDs);
 
-PR_EXTERN(void) _PR_MD_START_INTERRUPTS(void);
-#define    _PR_MD_START_INTERRUPTS _MD_START_INTERRUPTS
-
-PR_EXTERN(void) _PR_MD_INIT_LOCKS(void);
-#define    _PR_MD_INIT_LOCKS _MD_INIT_LOCKS
-
 struct PRLock {
 #if defined(_PR_PTHREADS)
     pthread_mutex_t mutex;          /* the underlying lock */
diff --git a/mozilla/nsprpub/pr/src/pthreads/ptsynch.c b/mozilla/nsprpub/pr/src/pthreads/ptsynch.c
index a81234eda5d..01376a3ae5d 100644
--- a/mozilla/nsprpub/pr/src/pthreads/ptsynch.c
+++ b/mozilla/nsprpub/pr/src/pthreads/ptsynch.c
@@ -57,7 +57,6 @@ void _PR_InitLocks(void)
 
     rv = PTHREAD_CONDATTR_INIT(&_pt_cvar_attr);
     PR_ASSERT(0 == rv);
-    _PR_MD_INIT_LOCKS();
 }
 
 static void pt_PostNotifies(PRLock *lock, PRBool unlock)