diff --git a/headers/private/app/RosterPrivate.h b/headers/private/app/RosterPrivate.h
index 031b5aca32..206b7e3b3e 100644
--- a/headers/private/app/RosterPrivate.h
+++ b/headers/private/app/RosterPrivate.h
@@ -63,11 +63,11 @@ public:
 	void SaveRecentLists(const char *file) const
 		{ fRoster->SaveRecentLists(file); }
 
+	static void InitBeRoster();
+	static void DeleteBeRoster();
+
 private:
 	BRoster	*fRoster;
 };
 
-extern "C" int	_init_roster_();
-extern "C" int	_delete_roster_();
-
 #endif	// _ROSTER_PRIVATE_H
diff --git a/src/kits/app/InitTerminateLibBe.cpp b/src/kits/app/InitTerminateLibBe.cpp
index dcb2f07bae..90f2c8282a 100644
--- a/src/kits/app/InitTerminateLibBe.cpp
+++ b/src/kits/app/InitTerminateLibBe.cpp
@@ -42,7 +42,7 @@ initialize_before()
 DBG(OUT("initialize_before()\n"));
 
 	_init_message_();
-	_init_roster_();
+	BRoster::Private::InitBeRoster();
 	BPrivate::init_clipboard();
 
 DBG(OUT("initialize_before() done\n"));
@@ -55,7 +55,7 @@ terminate_after()
 {
 DBG(OUT("terminate_after()\n"));
 
-	_delete_roster_();
+	BRoster::Private::DeleteBeRoster();
 	_delete_message_();
 	_msg_cache_cleanup_();
 
diff --git a/src/kits/app/RosterPrivate.cpp b/src/kits/app/RosterPrivate.cpp
index efad1d7aa0..729f8af637 100644
--- a/src/kits/app/RosterPrivate.cpp
+++ b/src/kits/app/RosterPrivate.cpp
@@ -98,36 +98,24 @@ BRoster::Private::IsMessengerValid(bool mime) const
 							 : fRoster->fMess.IsValid()));
 }
 
-
-// _init_roster_
+// InitBeRoster
 /*!	\brief Initializes the global be_roster variable.
 
 	Called before the global constructors are invoked.
-
-	\return Unknown!
-
-	\todo Investigate what the return value means.
 */
-int
-_init_roster_()
+void
+BRoster::Private::InitBeRoster()
 {
 	be_roster = new BRoster;
-	return 0;
 }
 
-// _delete_roster_
+// DeleteBeRoster
 /*!	\brief Deletes the global be_roster.
 
 	Called after the global destructors are invoked.
-
-	\return Unknown!
-
-	\todo Investigate what the return value means.
 */
-int
-_delete_roster_()
+void
+BRoster::Private::DeleteBeRoster()
 {
 	delete be_roster;
-	return 0;
 }
-