diff --git a/headers/os/app/Application.h b/headers/os/app/Application.h
index 87db695632..bfb2c76788 100644
--- a/headers/os/app/Application.h
+++ b/headers/os/app/Application.h
@@ -24,11 +24,11 @@ class BWindow;
 class _BSession_;
 class BResources;
 class BMessageRunner;
+class BServer;
 struct _server_heap_;
 struct _drag_data_;
 
 namespace BPrivate {
-	class AppServerLink;
 	class PortLink;
 }
 
@@ -98,6 +98,8 @@ private:
 	class Private;
 	friend class Private;
 
+	friend class BServer;
+
 							BApplication(const char* signature, bool initGUI,
 										 status_t* error);
 							BApplication(uint32 signature);
diff --git a/headers/private/app/ApplicationPrivate.h b/headers/private/app/ApplicationPrivate.h
index 5005ae043d..9fa83838fd 100644
--- a/headers/private/app/ApplicationPrivate.h
+++ b/headers/private/app/ApplicationPrivate.h
@@ -12,9 +12,6 @@
 
 class BApplication::Private {
 public:
-	static inline status_t InitGUIContext()
-		{ return be_app->_InitGUIContext(); }
-
 	static inline BPrivate::PortLink *ServerLink()
 		{ return be_app->fServerLink; }
 };
diff --git a/headers/private/app/Server.h b/headers/private/app/Server.h
new file mode 100644
index 0000000000..2c34b330dc
--- /dev/null
+++ b/headers/private/app/Server.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2005, Haiku.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Ingo Weinhold <bonefish@cs.tu-berlin.de>
+ */
+#ifndef _SERVER_H
+#define _SERVER_H
+
+#include <Application.h>
+
+class BServer : public BApplication {
+public:
+	BServer(const char* signature, bool initGUI, status_t* error);
+
+	status_t InitGUIContext();
+};
+
+#endif	// _SERVER_H
diff --git a/src/kits/app/Server.cpp b/src/kits/app/Server.cpp
new file mode 100644
index 0000000000..e14a6e9e44
--- /dev/null
+++ b/src/kits/app/Server.cpp
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2005, Haiku.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Ingo Weinhold <bonefish@cs.tu-berlin.de>
+ */
+
+#include <Server.h>
+
+// constructor
+BServer::BServer(const char* signature, bool initGUI, status_t* error)
+	: BApplication(signature, initGUI, error)
+{
+}
+
+// InitGUIContext
+status_t
+BServer::InitGUIContext()
+{
+	return _InitGUIContext();
+}
diff --git a/src/kits/app/app.src b/src/kits/app/app.src
index ff47214b23..51d790db0a 100644
--- a/src/kits/app/app.src
+++ b/src/kits/app/app.src
@@ -29,6 +29,7 @@ APP_KIT_SOURCE =
 	RegistrarThreadManager.cpp
 	Roster.cpp
 	RosterPrivate.cpp
+	Server.cpp
 	ServerMemIO.cpp
 	TokenSpace.cpp
 	TypeConstants.cpp