8 files changed, 3 insertions, 9 deletions

diff --git a/plugins/.cvsignore b/plugins/.cvsignore
index 06fbb6a9..66bad73e 100644
--- a/plugins/.cvsignore
+++ b/plugins/.cvsignore
@@ -40,7 +40,7 @@ check_dig
 check_nt
 negate
 stamp-h*
-*.h
+config.h
 Makefile
 Makefile.in
 config.h.in
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index bd5b5500..2524e1ac 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
 
 check_tcp_programs = check_ftp check_imap check_nntp check_pop
 
-EXTRA_DIST = t utils.c netutils.c popen.c
+EXTRA_DIST = t utils.c netutils.c popen.c utils.h netutils.h popen.h common.h 
 
 PLUGINHDRS = common.h config.h
 
diff --git a/plugins/common.h.in b/plugins/common.h
index 56d53761..56d53761 100644
--- a/plugins/common.h.in
+++ b/plugins/common.h
diff --git a/plugins/netutils.h.in b/plugins/netutils.h
index 69cf2781..3ea51663 100644
--- a/plugins/netutils.h.in
+++ b/plugins/netutils.h
@@ -30,16 +30,12 @@
 *
 ******************************************************************************/
 
-#undef STDC_HEADERS
-#undef HAVE_STRINGS_H
-#undef HAVE_STRING_H
-
 #include "config.h"
 #include "common.h"
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-void socket_timeout_alarm_handler (int);
+RETSIGTYPE socket_timeout_alarm_handler (int);
 
 int process_tcp_request2 (char *address, int port, char *sbuffer,
         char *rbuffer, int rsize);
diff --git a/plugins/popen.h.in b/plugins/popen.h
index a1af4be0..a1af4be0 100644
--- a/plugins/popen.h.in
+++ b/plugins/popen.h
diff --git a/plugins/utils.c b/plugins/utils.c
index 9ac5596e..7361323f 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -13,7 +13,6 @@
 
 #include "config.h"
 #include "common.h"
-#include "version.h"
 #include <stdarg.h>
 #include <limits.h>
 
diff --git a/plugins/utils.h.in b/plugins/utils.h
index 89ada6f0..89ada6f0 100644
--- a/plugins/utils.h.in
+++ b/plugins/utils.h
diff --git a/plugins/version.h.in b/plugins/version.h.in
deleted file mode 100644
index 6fd1e107..00000000
--- a/plugins/version.h.in
+++ /dev/null
@@ -1 +0,0 @@
-#define CVS_DATE "$Date$"