@@ -15,12 +15,10 @@
  * file.
  */
 
 #include "config.h"
 
-#define OF_APPLICATION_M
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <errno.h>
@@ -99,29 +97,10 @@
 #if defined(OF_HAVE_THREADS) && defined(OF_HAVE_SOCKETS) && defined(OF_AMIGAOS)
 	of_socket_deinit();
 #endif
 }
 
-#define SIGNAL_HANDLER(signal)					\
-	static void						\
-	handle##signal(int sig)					\
-	{							\
-		app->_##signal##Handler(app->_delegate,		\
-		    @selector(applicationDidReceive##signal));	\
-	}
-SIGNAL_HANDLER(SIGINT)
-#ifdef SIGHUP
-SIGNAL_HANDLER(SIGHUP)
-#endif
-#ifdef SIGUSR1
-SIGNAL_HANDLER(SIGUSR1)
-#endif
-#ifdef SIGUSR2
-SIGNAL_HANDLER(SIGUSR2)
-#endif
-#undef SIGNAL_HANDLER
-
 int
 of_application_main(int *argc, char **argv[],
     id <OFApplicationDelegate> delegate)
 {
 #ifdef OF_WINDOWS
@@ -156,10 +135,29 @@
 @synthesize environment = _environment;
 #ifdef OF_HAVE_SANDBOX
 @synthesize activeSandbox = _activeSandbox;
 @synthesize activeSandboxForChildProcesses = _activeSandboxForChildProcesses;
 #endif
+
+#define SIGNAL_HANDLER(signal)					\
+	static void						\
+	handle##signal(int sig)					\
+	{							\
+		app->_##signal##Handler(app->_delegate,		\
+		    @selector(applicationDidReceive##signal));	\
+	}
+SIGNAL_HANDLER(SIGINT)
+#ifdef SIGHUP
+SIGNAL_HANDLER(SIGHUP)
+#endif
+#ifdef SIGUSR1
+SIGNAL_HANDLER(SIGUSR1)
+#endif
+#ifdef SIGUSR2
+SIGNAL_HANDLER(SIGUSR2)
+#endif
+#undef SIGNAL_HANDLER
 
 + (OFApplication *)sharedApplication
 {
 	return app;
 }