diff --git a/application/Main.cpp b/application/Main.cpp
deleted file mode 100644
index 21b41f2..0000000
--- a/application/Main.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2009-2011, Andrea Anzani. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *		Andrea Anzani, andrea.anzani@gmail.com
- */
-
-#include "TheApp.h"
-
-
-int
-main(int argc, char* argv[])
-{
-	TheApp app;
-	app.Run();
-
-	return 0;
-}
diff --git a/application/Makefile b/application/Makefile
index 2c14952..81b6eee 100644
--- a/application/Makefile
+++ b/application/Makefile
@@ -41,7 +41,6 @@ SRCS = \
 	application/DefaultItems.cpp \
 	application/EditingFilter.cpp \
 	application/ImageCache.cpp \
-	application/Main.cpp \
 	application/Notifier.cpp \
 	application/ProtocolLooper.cpp \
 	application/ProtocolManager.cpp \
diff --git a/application/TheApp.cpp b/application/TheApp.cpp
index 7c2bc63..5e01689 100644
--- a/application/TheApp.cpp
+++ b/application/TheApp.cpp
@@ -28,6 +28,16 @@
 #include "Server.h"
 
 
+int
+main(int argc, char* argv[])
+{
+	TheApp app;
+	app.Run();
+
+	return 0;
+}
+
+
 TheApp::TheApp()
 	:
 	BApplication(APP_SIGNATURE),
diff --git a/application/TheApp.h b/application/TheApp.h
index 6c444f2..9bd3ded 100644
--- a/application/TheApp.h
+++ b/application/TheApp.h
@@ -10,6 +10,10 @@
 
 class MainWindow;
 
+
+int main(int argc, char* argv[]);
+
+
 class TheApp : public BApplication {
 public:
 						TheApp();