diff --git a/addons/chan_ooh323.h b/addons/chan_ooh323.h
index 89caaff63b..1279a2246d 100644
--- a/addons/chan_ooh323.h
+++ b/addons/chan_ooh323.h
@@ -38,7 +38,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <sys/signal.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index e8bdad01e1..51921a98ec 100644
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -36,12 +36,7 @@ ASTERISK_REGISTER_FILE()
 
 #include <sys/ioctl.h>
 #include <sys/wait.h>
-#ifdef __linux__
-#include <sys/signal.h>
-#else
 #include <signal.h>
-#endif /* __linux__ */
-
 #include <fcntl.h>
 
 #include <dahdi/user.h>
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 5e034d3ebe..f05521b5d8 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -35,7 +35,7 @@
 ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <sys/stat.h>
 #include <netinet/in.h>
 
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 165924e0c8..cd545d2fa5 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -72,7 +72,7 @@
 ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <netinet/in.h>
 #include <ctype.h>
 
diff --git a/channels/chan_console.c b/channels/chan_console.c
index 9fdecd7d4a..bd849ad532 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -64,7 +64,7 @@
 
 ASTERISK_REGISTER_FILE()
 
-#include <sys/signal.h>  /* SIGURG */
+#include <signal.h>  /* SIGURG */
 
 #include <portaudio.h>
 
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 2d923433c5..e4b7c0ee8a 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -58,10 +58,8 @@ ASTERISK_REGISTER_FILE()
 
 #if defined(__NetBSD__) || defined(__FreeBSD__)
 #include <pthread.h>
-#include <signal.h>
-#else
-#include <sys/signal.h>
 #endif
+#include <signal.h>
 #include <sys/stat.h>
 #include <math.h>
 
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index af44de96c6..721da9a044 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -68,7 +68,6 @@ ASTERISK_REGISTER_FILE()
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/time.h>
-#include <sys/signal.h>
 #include <signal.h>
 #include <strings.h>
 #include <netdb.h>
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 8714ddbbc7..6df5d3fd0f 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -47,7 +47,6 @@ ASTERISK_REGISTER_FILE()
 #include <net/if.h>
 #include <fcntl.h>
 #include <netdb.h>
-#include <sys/signal.h>
 #include <signal.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index 118d1d9fb1..0c710923f6 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -51,7 +51,7 @@ ASTERISK_REGISTER_FILE()
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <iksemel.h>
 #include <pthread.h>
 
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 19f8aa308a..fc26e7ebf0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -224,7 +224,6 @@
 ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
-#include <sys/signal.h>
 #include <regex.h>
 #include <inttypes.h>
 
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 76990d175c..fb6e619a1e 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -49,7 +49,6 @@ ASTERISK_REGISTER_FILE()
 #include <fcntl.h>
 #include <netdb.h>
 #include <arpa/inet.h>
-#include <sys/signal.h>
 #include <signal.h>
 #include <ctype.h>
 
diff --git a/main/cli.c b/main/cli.c
index f2bedc91ab..8af20b61bd 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -42,7 +42,6 @@ ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"	/* use ast_config_AST_MODULE_DIR */
-#include <sys/signal.h>
 #include <signal.h>
 #include <ctype.h>
 #include <regex.h>
diff --git a/main/features.c b/main/features.c
index 7dfe4cde57..6806fe749f 100644
--- a/main/features.c
+++ b/main/features.c
@@ -46,7 +46,7 @@ ASTERISK_REGISTER_FILE()
 #include <pthread.h>
 #include <signal.h>
 #include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <netinet/in.h>
 
 #include "asterisk/lock.h"
diff --git a/main/http.c b/main/http.c
index 5ec94a7e19..a8362829ef 100644
--- a/main/http.c
+++ b/main/http.c
@@ -49,7 +49,7 @@ ASTERISK_REGISTER_FILE()
 #include <time.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <fcntl.h>
 
 #include "asterisk/paths.h"	/* use ast_config_AST_DATA_DIR */
diff --git a/main/tcptls.c b/main/tcptls.c
index f56e0aa70c..046501b77e 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -38,7 +38,6 @@ ASTERISK_REGISTER_FILE()
 #endif
 
 #include <signal.h>
-#include <sys/signal.h>
 
 #include "asterisk/compat.h"
 #include "asterisk/tcptls.h"
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 10495acb6f..94b71a002e 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -43,7 +43,7 @@ ASTERISK_REGISTER_FILE()
 #include "asterisk/network.h"
 #include <sys/ioctl.h>
 #include <zlib.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <pthread.h>
 #include <net/if.h>
 
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index f124d58f23..3c7199ef45 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -44,7 +44,7 @@ ASTERISK_REGISTER_FILE()
 #include <ctype.h>
 #include <signal.h>
 #include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <netinet/in.h>
 #include <sys/stat.h>
 #include <dirent.h>