diff --git a/headers/private/app/ServerLink.h b/headers/private/app/ServerLink.h
index effbef4637..4ebb7d3c24 100644
--- a/headers/private/app/ServerLink.h
+++ b/headers/private/app/ServerLink.h
@@ -12,7 +12,6 @@
 
 
 #include <OS.h>
-#include <Locker.h>
 #include <LinkReceiver.h>
 #include <LinkSender.h>
 
@@ -34,7 +33,7 @@ class BGradient;
 
 namespace BPrivate {
 
-class ServerLink : public BLocker {
+class ServerLink {
 public:
 								ServerLink();
 	virtual						~ServerLink();
diff --git a/src/kits/app/AppServerLink.cpp b/src/kits/app/AppServerLink.cpp
index 18d68f8c06..807fd33ff9 100644
--- a/src/kits/app/AppServerLink.cpp
+++ b/src/kits/app/AppServerLink.cpp
@@ -24,14 +24,14 @@
  */
 
 
-static mutex sLock = MUTEX_INITIALIZER("AppServerLink_sLock");
+static recursive_lock sLock = MUTEX_INITIALIZER("AppServerLink_sLock");
 
 
 namespace BPrivate {
 
 AppServerLink::AppServerLink()
 {
-	mutex_lock(&sLock);
+	recursive_lock_lock(&sLock);
 
 	// if there is no be_app, we can't do a whole lot, anyway
 	if (be_app != NULL) {
@@ -45,7 +45,7 @@ AppServerLink::AppServerLink()
 
 AppServerLink::~AppServerLink()
 {
-	mutex_unlock(&sLock);
+	recursive_lock_unlock(&sLock);
 }
 
 }	// namespace BPrivate