5 files changed, 10 insertions, 19 deletions

diff --git a/include/platform.h b/include/platform.h
index ca6f3634f..fdaf50920 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -75,6 +75,14 @@
 # endif
 #endif
 
+/* gcc-2.95 had no va_copy but only __va_copy. */
+#if !__GNUC_PREREQ (3,0)
+# include <stdarg.h>
+# if !defined va_copy && defined __va_copy
+#  define va_copy(d,s) __va_copy((d),(s))
+# endif
+#endif
+
 /* ---- Endian Detection ------------------------------------ */
 
 #if (defined __digital__ && defined __unix__)
diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c
index 988a7a293..557b3290a 100644
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -7,12 +7,8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <syslog.h>
 #include "libbb.h"
+#include <syslog.h>
 
 int logmode = LOGMODE_STDIO;
 const char *msg_eol = "\n";
diff --git a/libbb/vherror_msg.c b/libbb/vherror_msg.c
index 7d9fc432a..04446a090 100644
--- a/libbb/vherror_msg.c
+++ b/libbb/vherror_msg.c
@@ -7,13 +7,8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdarg.h>
-#include <netdb.h>
-#include <stdio.h>
-
 #include "libbb.h"
 
-
 void bb_vherror_msg(const char *s, va_list p)
 {
         bb_verror_msg(s, p, hstrerror(h_errno));
diff --git a/libbb/vinfo_msg.c b/libbb/vinfo_msg.c
index 613b013cd..fa2798625 100644
--- a/libbb/vinfo_msg.c
+++ b/libbb/vinfo_msg.c
@@ -7,12 +7,8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <syslog.h>
 #include "libbb.h"
+#include <syslog.h>
 
 void bb_vinfo_msg(const char *s, va_list p)
 {
diff --git a/libbb/vperror_msg.c b/libbb/vperror_msg.c
index 70fd671e3..c3f79c23b 100644
--- a/libbb/vperror_msg.c
+++ b/libbb/vperror_msg.c
@@ -7,10 +7,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 #include "libbb.h"
 
 void bb_vperror_msg(const char *s, va_list p)