diff --git a/headers/build/os/app/Application.h b/headers/build/os/app/Application.h
index f87c32468c..2d2d16944a 100644
--- a/headers/build/os/app/Application.h
+++ b/headers/build/os/app/Application.h
@@ -8,167 +8,14 @@
 #ifndef _APPLICATION_H
 #define _APPLICATION_H
 
-
-#include <BeBuild.h>
-#include <AppDefs.h>		// For convenience
-#include <InterfaceDefs.h>
-#include <Looper.h>
 #include <Messenger.h>
-#include <Point.h>
-#include <Rect.h>
 
-
-class BCursor;
-class BList;
-class BWindow;
-class _BSession_;
-class BResources;
-class BMessageRunner;
-class BServer;
-struct _server_heap_;
-struct _drag_data_;
-
-namespace BPrivate {
-	class PortLink;
-}
-
-
-class BApplication : public BLooper {
+class BApplication {
 public:
 							BApplication(const char* signature);
 							BApplication(const char* signature,
 										 status_t* error);
 	virtual					~BApplication();
-
-	// Archiving
-							BApplication(BMessage* data);
-	static	BArchivable*	Instantiate(BMessage* data);
-	virtual	status_t		Archive(BMessage* data, bool deep = true) const;
-
-			status_t		InitCheck() const;
-
-	// App control and System Message handling
-	virtual	thread_id		Run();
-	virtual	void			Quit();
-	virtual bool			QuitRequested();
-	virtual	void			Pulse();
-	virtual	void			ReadyToRun();
-	virtual	void			MessageReceived(BMessage* msg);
-	virtual	void			ArgvReceived(int32 argc, char** argv);
-	virtual	void			AppActivated(bool active);
-	virtual	void			RefsReceived(BMessage* message);
-	virtual	void			AboutRequested();
-
-	// Scripting
-	virtual BHandler*		ResolveSpecifier(BMessage* msg,
-											 int32 index,
-											 BMessage* specifier,
-											 int32 form,
-											 const char* property);
-
-	// Cursor control, window/looper list, and app info
-			void			ShowCursor();
-			void			HideCursor();
-			void			ObscureCursor();
-			bool			IsCursorHidden() const;
-			void			SetCursor(const void* cursor);
-			void			SetCursor(const BCursor* cursor, bool sync = true);
-			int32			CountWindows() const;
-			BWindow*		WindowAt(int32 index) const;
-			int32			CountLoopers() const;
-			BLooper*		LooperAt(int32 index) const;
-			bool			IsLaunching() const;
-			status_t		GetAppInfo(app_info* info) const;
-	static	BResources*		AppResources();
-
-	virtual	void			DispatchMessage(BMessage* message,
-											BHandler* handler);
-			void			SetPulseRate(bigtime_t rate);
-
-	// More scripting
-	virtual status_t		GetSupportedSuites(BMessage* data);
-
-
-// Private or reserved ---------------------------------------------------------
-	virtual status_t		Perform(perform_code d, void* arg);
-
-	class Private;
-
-private:
-	typedef BLooper _inherited;
-
-	friend class Private;
-
-	friend class BServer;
-
-							BApplication(const char* signature, bool initGUI,
-										 status_t* error);
-							BApplication(uint32 signature);
-							BApplication(const BApplication&);
-			BApplication&	operator=(const BApplication&);
-
-	virtual	void			_ReservedApplication1();
-	virtual	void			_ReservedApplication2();
-	virtual	void			_ReservedApplication3();
-	virtual	void			_ReservedApplication4();
-	virtual	void			_ReservedApplication5();
-	virtual	void			_ReservedApplication6();
-	virtual	void			_ReservedApplication7();
-	virtual	void			_ReservedApplication8();
-
-	virtual	bool			ScriptReceived(BMessage* msg, int32 index,
-								BMessage* specifier, int32 form,
-								const char* property);
-			void			run_task();
-			void			InitData(const char* signature, bool initGUI,
-								status_t* error);
-			void			BeginRectTracking(BRect r, bool trackWhole);
-			void			EndRectTracking();
-			status_t		setup_server_heaps();
-			void*			rw_offs_to_ptr(uint32 offset);
-			void*			ro_offs_to_ptr(uint32 offset);
-			void*			global_ro_offs_to_ptr(uint32 offset);
-			status_t		_InitGUIContext();
-			status_t		connect_to_app_server();
-			void			send_drag(	BMessage* msg,
-										int32 vs_token,
-										BPoint offset,
-										BRect drag_rect,
-										BHandler* reply_to);
-			void			send_drag(	BMessage* msg,
-										int32 vs_token,
-										BPoint offset,
-										int32 bitmap_token,
-										drawing_mode dragMode,
-										BHandler* reply_to);
-			void			write_drag(_BSession_* session, BMessage* a_message);
-			bool			quit_all_windows(bool force);
-			bool			window_quit_loop(bool, bool);
-			void			do_argv(BMessage* msg);
-			void			SetAppCursor();
-
-			uint32			InitialWorkspace();
-			int32			count_windows(bool incl_menus) const;
-			BWindow*		window_at(uint32 index, bool incl_menus) const;
-			status_t		get_window_list(BList* list, bool incl_menus) const;
-	static	int32			async_quit_entry(void*);
-	static	BResources*		_app_resources;
-	static	BLocker			_app_resources_lock;
-
-			const char*		fAppName;
-			BPrivate::PortLink* fServerLink;
-			uint32			_unused0;
-
-			void*			fCursorData;
-			_server_heap_* 	fServerHeap;
-			bigtime_t		fPulseRate;
-			uint32			fInitialWorkspace;
-			_drag_data_*	fDraggedMessage;
-			BMessageRunner*	fPulseRunner;
-			status_t		fInitError;
-			uint32			_reserved[11];
-
-			bool			fReadyToRunCalled;
 };
 
 // Global Objects
diff --git a/src/build/libbe/app/Application.cpp b/src/build/libbe/app/Application.cpp
new file mode 100644
index 0000000000..007785ead5
--- /dev/null
+++ b/src/build/libbe/app/Application.cpp
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2006, Haiku. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include <Application.h>
+
+
+BApplication::BApplication(const char *signature)
+{
+}
+
+
+BApplication::BApplication(const char *signature, status_t *error)
+{
+	*error = B_OK;
+}
+
+
+BApplication::~BApplication()
+{
+}
+