diff --git a/configure.ac b/configure.ac
index 2a43632a..c7057a7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,7 +198,6 @@ AC_CHECK_HEADERS(sys/fmutex.h)
 AC_CHECK_HEADERS(sys/ioctl.h sys/sockio.h)
 AC_CHECK_HEADERS(sys/resource.h)
 AC_CHECK_HEADERS(sys/select.h)
-AC_CHECK_HEADERS(sys/signal.h)
 AC_CHECK_HEADERS(sys/socket.h)
 AC_CHECK_HEADERS(sys/time.h)
 AC_CHECK_HEADERS(sys/utsname.h)
@@ -323,13 +322,6 @@ if test x"$HAVE_RAISE" = x; then
 	fi
 fi
 
-AC_CACHE_CHECK([for __va_copy],el_cv_HAVE_VA_COPY,[
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
-va_list ap1,ap2;]], [[__va_copy(ap1,ap2);]])],[el_cv_HAVE_VA_COPY=yes],[el_cv_HAVE_VA_COPY=no])])
-if test x"$el_cv_HAVE_VA_COPY" = x"yes"; then
-	EL_DEFINE(HAVE_VA_COPY, __va_copy)
-fi
-
 AC_CACHE_CHECK([for sysconf(_SC_PAGE_SIZE)],el_cv_HAVE_SC_PAGE_SIZE,[
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>
 ]], [[int page_size = sysconf(_SC_PAGE_SIZE);]])],[el_cv_HAVE_SC_PAGE_SIZE=yes],[el_cv_HAVE_SC_PAGE_SIZE=no])])
diff --git a/src/bfu/msgbox.c b/src/bfu/msgbox.c
index d7af62be..aa126087 100644
--- a/src/bfu/msgbox.c
+++ b/src/bfu/msgbox.c
@@ -100,7 +100,7 @@ msg_text_do(unsigned char *format, va_list ap)
 	int infolen, len;
 	va_list ap2;
 
-	VA_COPY(ap2, ap);
+	va_copy(ap2, ap);
 
 	infolen = vsnprintf(NULL, 0, format, ap2);
 	info = mem_alloc(infolen + 1);
diff --git a/src/main/event.c b/src/main/event.c
index 9b3bc5dc..0190e358 100644
--- a/src/main/event.c
+++ b/src/main/event.c
@@ -162,7 +162,7 @@ trigger_event_va(int id, va_list ap_init)
 		enum evhook_status ret;
 		va_list ap;
 
-		VA_COPY(ap, ap_init);
+		va_copy(ap, ap_init);
 		ret = ev_handler->callback(ap, ev_handler->data);
 		va_end(ap);
 
diff --git a/src/main/select.c b/src/main/select.c
index 7382a0c3..7226a8b2 100644
--- a/src/main/select.c
+++ b/src/main/select.c
@@ -7,9 +7,6 @@
 #include <errno.h>
 #include <signal.h>
 #include <string.h> /* FreeBSD FD_ZERO() macro calls bzero() */
-#ifdef HAVE_SYS_SIGNAL_H
-#include <sys/signal.h>
-#endif
 #ifdef __GNU__ /* For GNU Hurd bug workaround in set_handlers() */
 #include <sys/stat.h> /* OS/2 needs this after sys/types.h */
 #endif
diff --git a/src/osdep/generic.h b/src/osdep/generic.h
index 357b602d..1f72d531 100644
--- a/src/osdep/generic.h
+++ b/src/osdep/generic.h
@@ -7,18 +7,10 @@
 #include <limits.h> /* may contain PIPE_BUF definition on some systems */
 #endif
 
-#ifdef HAVE_SYS_SIGNAL_H
-#include <sys/signal.h> /* may contain SA_RESTART */
-#endif
-
 #ifdef HAVE_STDDEF_H
 #include <stddef.h> /* may contain offsetof() */
 #endif
 
-#ifndef SA_RESTART
-#define SA_RESTART	0
-#endif
-
 #ifndef PIPE_BUF
 #define PIPE_BUF	512 /* POSIX says that. -- Mikulas */
 #endif
diff --git a/src/osdep/osdep.c b/src/osdep/osdep.c
index a8895539..37a13013 100644
--- a/src/osdep/osdep.c
+++ b/src/osdep/osdep.c
@@ -15,9 +15,6 @@
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
-#ifdef HAVE_SYS_SIGNAL_H
-#include <sys/signal.h>
-#endif
 #include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>	/* Need to be after sys/types.h */
diff --git a/src/osdep/signals.c b/src/osdep/signals.c
index 7de1213a..b2632a53 100644
--- a/src/osdep/signals.c
+++ b/src/osdep/signals.c
@@ -8,9 +8,6 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_SYS_SIGNAL_H
-#include <sys/signal.h>
-#endif
 #include <sys/types.h>
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
diff --git a/src/util/snprintf.c b/src/util/snprintf.c
index 7e9b286e..d2a4bcb1 100644
--- a/src/util/snprintf.c
+++ b/src/util/snprintf.c
@@ -178,7 +178,7 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args_in)
 	size_t currlen;
 	va_list args;
 
-	VA_COPY(args, args_in);
+	va_copy(args, args_in);
 
 	state = DP_S_DEFAULT;
 	currlen = 0;
@@ -825,7 +825,7 @@ elinks_vasprintf(char **ptr, const char *format, va_list ap)
 	int ret;
 	va_list ap2;
 
-	VA_COPY(ap2, ap);
+	va_copy(ap2, ap);
 
 	ret = vsnprintf(NULL, 0, format, ap2);
 	if (ret <= 0) return ret;
@@ -842,7 +842,7 @@ elinks_vasprintf(char **ptr, const char *format, va_list ap)
 	(*ptr) = (char *) malloc(ret + 1);
 	if (!*ptr) return -1;
 
-	VA_COPY(ap2, ap);
+	va_copy(ap2, ap);
 
 	return vsnprintf(*ptr, ret + 1, format, ap2);
 }
diff --git a/src/util/snprintf.h b/src/util/snprintf.h
index 1f3435a6..de222453 100644
--- a/src/util/snprintf.h
+++ b/src/util/snprintf.h
@@ -11,11 +11,11 @@
 
 /* XXX: This is not quite the best place for it, perhaps. But do we have
  * a better one now? --pasky */
-#ifndef VA_COPY
-#ifdef HAVE_VA_COPY
-#define VA_COPY(dest, src) __va_copy(dest, src)
+#ifndef va_copy
+#ifdef __va_copy
+#define va_copy(dest, src) __va_copy(dest, src)
 #else
-#define VA_COPY(dest, src) (dest) = (src)
+#define va_copy(dest, src) (dest) = (src)
 #endif
 #endif
 
diff --git a/src/viewer/dump/dump.c b/src/viewer/dump/dump.c
index 0958f070..c3f1fa32 100644
--- a/src/viewer/dump/dump.c
+++ b/src/viewer/dump/dump.c
@@ -8,9 +8,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h> /* NetBSD flavour */
-#ifdef HAVE_SYS_SIGNAL_H
-#include <sys/signal.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h> /* OS/2 needs this after sys/types.h */
 #endif