diff --git a/headers/os/app/Application.h b/headers/os/app/Application.h
index bfb2c76788..f87c32468c 100644
--- a/headers/os/app/Application.h
+++ b/headers/os/app/Application.h
@@ -92,10 +92,11 @@ public:
 // Private or reserved ---------------------------------------------------------
 	virtual status_t		Perform(perform_code d, void* arg);
 
+	class Private;
+
 private:
 	typedef BLooper _inherited;
 
-	class Private;
 	friend class Private;
 
 	friend class BServer;
diff --git a/src/kits/app/Application.cpp b/src/kits/app/Application.cpp
index 4c51df8f46..f3ead67b32 100644
--- a/src/kits/app/Application.cpp
+++ b/src/kits/app/Application.cpp
@@ -222,11 +222,11 @@ BApplication::~BApplication()
 	BPrivate::AppServerLink link;
 	link.StartMessage(B_QUIT_REQUESTED);
 	link.Flush();
-#endif	// RUN_WITHOUT_APP_SERVER
 
 	delete_port(fServerLink->SenderPort());
 	delete_port(fServerLink->ReceiverPort());
 	delete fServerLink;
+#endif	// RUN_WITHOUT_APP_SERVER
 
 	// uninitialize be_app, the be_app_messenger is invalidated automatically
 	be_app = NULL;