From e3638c2c86fd10831136419db2601cb4daf3d3bb Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 5 Jan 2010 15:17:34 +0200
Subject: [PATCH] Remove <string.h> include from system.h into the few places
 that still need - most of the places get it through <rpm/rpmstring.h> already

---
 lib/merge.c       | 1 +
 misc/glob.c       | 1 +
 rpmio/fts.c       | 1 +
 rpmio/rpmmalloc.c | 1 +
 system.h          | 4 ----
 tools/javadeps.c  | 1 +
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/merge.c b/lib/merge.c
index 9b541a6..5fcd9a4 100644
--- a/lib/merge.c
+++ b/lib/merge.c
@@ -55,6 +55,7 @@ static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
 
 #include "system.h"
 #include <stdlib.h>
+#include <string.h>
 #include "lib/rpmdb_internal.h" /* XXX for mergesort */
 
 #define ISIZE sizeof(int)
diff --git a/misc/glob.c b/misc/glob.c
index be393f8..28e6edd 100644
--- a/misc/glob.c
+++ b/misc/glob.c
@@ -25,6 +25,7 @@
 # include "system.h"
 
 # include <stdlib.h>
+# include <string.h>
 # include <pwd.h>
 # include <assert.h>
 
diff --git a/rpmio/fts.c b/rpmio/fts.c
index 325e1a9..ec9636b 100644
--- a/rpmio/fts.c
+++ b/rpmio/fts.c
@@ -61,6 +61,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #   define _STAT_VER		0
 #endif
 #include "system.h"
+#include <string.h>
 #include "rpmio/fts.h"
 #include <rpm/rpmio.h>
 #include <rpm/rpmurl.h>
diff --git a/rpmio/rpmmalloc.c b/rpmio/rpmmalloc.c
index eec73ed..6c640c8 100644
--- a/rpmio/rpmmalloc.c
+++ b/rpmio/rpmmalloc.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "debug.h"
 
diff --git a/system.h b/system.h
index 1101ed9..71fd887 100644
--- a/system.h
+++ b/system.h
@@ -32,10 +32,6 @@ extern char ** environ;
 #endif
 #endif
 
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-
 #if !defined(HAVE_STPCPY)
 char * stpcpy(char * dest, const char * src);
 #endif
diff --git a/tools/javadeps.c b/tools/javadeps.c
index 40055b5..9b68cab 100644
--- a/tools/javadeps.c
+++ b/tools/javadeps.c
@@ -66,6 +66,7 @@ marc@redhat.com and ewt@redhat.com.
 
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
 #include <netdb.h>
 #include <rpm/rpmutil.h>
 #include "debug.h"
-- 
2.7.4