diff --git a/src/switch.c b/src/switch.c
index ac5ea63555..5f89d8f8dd 100644
--- a/src/switch.c
+++ b/src/switch.c
@@ -51,12 +51,12 @@ static char *pfile = PIDFILE;
 static HANDLE shutdown_event;
 #endif
 
-	static int handle_SIGHUP(int sig)
+static void handle_SIGHUP(int sig)
 {
 	uint32_t arg = 0;
 	if(sig);
 	switch_core_session_ctl(SCSC_SHUTDOWN, &arg);
-	return 0;
+	return;
 }
 
 
@@ -228,8 +228,8 @@ int main(int argc, char *argv[])
 	if (bg) {
 		ppath = lfile;
 
-		signal(SIGHUP, (void *) handle_SIGHUP);
-		signal(SIGTERM, (void *) handle_SIGHUP);
+		signal(SIGHUP, handle_SIGHUP);
+		signal(SIGTERM, handle_SIGHUP);
 
 #ifdef WIN32
 		FreeConsole();
diff --git a/src/switch_core.c b/src/switch_core.c
index 67ea3e4cb8..659df3c8d3 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -3677,26 +3677,26 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err
 	return SWITCH_STATUS_SUCCESS;
 }
 #ifdef SIGPIPE
-static int handle_SIGPIPE(int sig)
+static void handle_SIGPIPE(int sig)
 {
 	if(sig);
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Sig Pipe!\n");
-	return 0;
+	return;
 }
 #endif
 #ifdef TRAP_BUS
-static int handle_SIGBUS(int sig)
+static void handle_SIGBUS(int sig)
 {
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Sig BUS!\n");
-	return 0;
+	return;
 }
 #endif
 
 /* no ctl-c mofo */
-static int handle_SIGINT(int sig)
+static void handle_SIGINT(int sig)
 {
 	if (sig);
-	return 0;
+	return;
 }
 SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, const char **err)
 {
@@ -3706,12 +3706,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, cons
 	}
 
 	/* set signal handlers */
-	signal(SIGINT, (void *) handle_SIGINT);
+	signal(SIGINT, handle_SIGINT);
 #ifdef SIGPIPE
-	signal(SIGPIPE, (void *) handle_SIGPIPE);
+	signal(SIGPIPE, handle_SIGPIPE);
 #endif
 #ifdef TRAP_BUS
-	signal(SIGBUS, (void *) handle_SIGBUS);
+	signal(SIGBUS, handle_SIGBUS);
 #endif
 	
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Bringing up environment.\n");