From 05b2d979e8097d648f91c773f2535a1f6013cb79 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 5 Jan 2010 16:06:02 +0200
Subject: [PATCH] Move <stdio.h> includes out of system.h to the places that
 need it

---
 rpmio/rpmmalloc.c |  1 +
 rpmio/rpmsq.c     |  1 +
 rpmio/rpmstring.c |  1 +
 system.h          |  2 --
 tools/javadeps.c  | 13 -------------
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/rpmio/rpmmalloc.c b/rpmio/rpmmalloc.c
index 6c640c858..68aa246c5 100644
--- a/rpmio/rpmmalloc.c
+++ b/rpmio/rpmmalloc.c
@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "debug.h"
 
diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c
index 3d0563be6..95f5aaa1c 100644
--- a/rpmio/rpmsq.c
+++ b/rpmio/rpmsq.c
@@ -9,6 +9,7 @@
 #include <sys/wait.h>
 #include <search.h>
 #include <errno.h>
+#include <stdio.h>
 
 #if defined(HAVE_PTHREAD_H)
 
diff --git a/rpmio/rpmstring.c b/rpmio/rpmstring.c
index 68543ce34..82e330501 100644
--- a/rpmio/rpmstring.c
+++ b/rpmio/rpmstring.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include <stdarg.h>
+#include <stdio.h>
 
 #include <rpm/rpmstring.h>
 #include "debug.h"
diff --git a/system.h b/system.h
index f7cb77558..ac18e16fa 100644
--- a/system.h
+++ b/system.h
@@ -9,8 +9,6 @@
 #include "config.h"
 #endif
 
-#include <stdio.h>
-
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
diff --git a/tools/javadeps.c b/tools/javadeps.c
index d4474f3e9..d1dcb8b81 100644
--- a/tools/javadeps.c
+++ b/tools/javadeps.c
@@ -50,20 +50,7 @@ marc@redhat.com and ewt@redhat.com.
    
 */
 
-#include "system.h"
-
-/*
-  these includes are for my use, rpm will use #include "system.h"*
-*/
-
-/*
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <netinet/in.h>
-*/
-
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>