Move <errno.h> include out of system.h to the places that need it

25 files changed, 29 insertions, 5 deletions

diff --git a/build.c b/build.c
index 5c1f5303a..5d6338435 100644
--- a/build.c
+++ b/build.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include <libgen.h>
+#include <errno.h>
 
 #include <rpm/rpmcli.h>
 #include <rpm/rpmtag.h>
diff --git a/build/build.c b/build/build.c
index ada633d76..c3295b945 100644
--- a/build/build.c
+++ b/build/build.c
@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <errno.h>
 #include <sys/wait.h>
 
 #include <rpm/rpmbuild.h>
diff --git a/build/files.c b/build/files.c
index eeb4ffb3c..6fbeddcca 100644
--- a/build/files.c
+++ b/build/files.c
@@ -8,6 +8,7 @@
 
 #define	MYALLPERMS	07777
 
+#include <errno.h>
 #include <regex.h>
 #if WITH_CAP
 #include <sys/capability.h>
diff --git a/build/pack.c b/build/pack.c
index f3b764cf1..1857257e4 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -5,6 +5,8 @@
 
 #include "system.h"
 
+#include <errno.h>
+
 #include <rpm/rpmlib.h>			/* RPMSIGTAG*, rpmReadPackageFile */
 #include <rpm/rpmts.h>
 #include <rpm/rpmbuild.h>
diff --git a/build/parsePrep.c b/build/parsePrep.c
index 670ed709d..8e10c0060 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -5,6 +5,8 @@
 
 #include "system.h"
 
+#include <errno.h>
+
 #include <rpm/header.h>
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmlog.h>
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 816aa814d..06b5a3d3d 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -5,6 +5,8 @@
 
 #include "system.h"
 
+#include <errno.h>
+
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>		/* RPM_MACHTABLE & related */
 #include <rpm/rpmbuild.h>
diff --git a/build/rpmfc.c b/build/rpmfc.c
index e92a6bdd7..0e8eba792 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1,5 +1,6 @@
 #include "system.h"
 
+#include <errno.h>
 #include <sys/select.h>
 #include <sys/wait.h>
 #include <signal.h>
diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index 73a2d6c8f..0b058dd22 100644
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -6,6 +6,7 @@ static int _debug = 1;	/* XXX if < 0 debugging, > 0 unusual error returns */
 
 #include "system.h"
 
+#include <errno.h>
 #include <sys/wait.h>
 #if defined(HAVE_FTOK) && defined(HAVE_SYS_IPC_H)
 #include <sys/ipc.h>
diff --git a/lib/cpio.c b/lib/cpio.c
index e71f7cb7e..b5c39c0ff 100644
--- a/lib/cpio.c
+++ b/lib/cpio.c
@@ -16,6 +16,7 @@
 #else
 #include <sys/types.h> /* already included from system.h */
 #endif
+#include <errno.h>
 
 #include <rpm/rpmio.h>
 #include <rpm/rpmlog.h>
diff --git a/lib/fs.c b/lib/fs.c
index f99852570..4aab92222 100644
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -4,6 +4,7 @@
 
 #include "system.h"
 
+#include <errno.h>
 #include <rpm/rpmlib.h>		/* rpmGetFilesystem*() prototypes */
 #include <rpm/rpmfileutil.h>	/* for rpmGetPath */
 #include <rpm/rpmlog.h>
diff --git a/lib/fsm.c b/lib/fsm.c
index 946c7af4c..a0efef45d 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include <utime.h>
+#include <errno.h>
 #if defined(HAVE_MMAP)
 #include <sys/mman.h>
 #endif
diff --git a/lib/merge.c b/lib/merge.c
index 5fcd9a40a..738ad7a68 100644
--- a/lib/merge.c
+++ b/lib/merge.c
@@ -56,6 +56,7 @@ static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
 #include "system.h"
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include "lib/rpmdb_internal.h" /* XXX for mergesort */
 
 #define ISIZE sizeof(int)
diff --git a/lib/psm.c b/lib/psm.c
index 282e5b207..f23635bfe 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -5,6 +5,8 @@
 
 #include "system.h"
 
+#include <errno.h>
+
 #include <rpm/rpmlib.h>		/* rpmvercmp and others */
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmurl.h>
diff --git a/lib/query.c b/lib/query.c
index 16999c318..6442975f5 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <errno.h>
 #include <inttypes.h>
 
 #include <rpm/rpmcli.h>
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 526ccecf1..ba36eb0bf 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -8,6 +8,7 @@
 
 #include <sys/file.h>
 #include <utime.h>
+#include <errno.h>
 
 #ifndef	DYING	/* XXX already in "system.h" */
 #include <fnmatch.h>
diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index e53391bbc..153436a45 100644
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -3,6 +3,8 @@
  */
 #include "system.h"
 
+#include <errno.h>
+
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>		/* rpmReadPackageFile */
 #include <rpm/rpmte.h>		/* XXX rpmElementType */
diff --git a/lib/rpmlead.c b/lib/rpmlead.c
index 39d20a7d1..c2fa4be72 100644
--- a/lib/rpmlead.c
+++ b/lib/rpmlead.c
@@ -4,6 +4,7 @@
 
 #include "system.h"
 
+#include <errno.h>
 #include <netinet/in.h>
 
 #include <rpm/rpmlib.h>		/* rpmGetOs/ArchInfo() */
diff --git a/lib/rpmlock.c b/lib/rpmlock.c
index d220bee94..33208c2a6 100644
--- a/lib/rpmlock.c
+++ b/lib/rpmlock.c
@@ -2,6 +2,7 @@
 #include "system.h"
 
 #include <libgen.h>
+#include <errno.h>
 
 #include <rpm/rpmlog.h>
 #include <rpm/rpmmacro.h>
diff --git a/lib/signature.c b/lib/signature.c
index 957009be2..91450299b 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -4,6 +4,7 @@
 
 #include "system.h"
 
+#include <errno.h>
 #include <inttypes.h>
 #include <sys/wait.h>
 #include <popt.h>
diff --git a/lib/verify.c b/lib/verify.c
index e85264958..44ab31453 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <errno.h>
 #if WITH_CAP
 #include <sys/capability.h>
 #endif
diff --git a/rpmio/fts.c b/rpmio/fts.c
index ec9636b7c..196994813 100644
--- a/rpmio/fts.c
+++ b/rpmio/fts.c
@@ -62,6 +62,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #endif
 #include "system.h"
 #include <string.h>
+#include <errno.h>
 #include "rpmio/fts.h"
 #include <rpm/rpmio.h>
 #include <rpm/rpmurl.h>
diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index 593447845..2bbddc922 100644
--- a/rpmio/rpmfileutil.c
+++ b/rpmio/rpmfileutil.c
@@ -18,6 +18,7 @@
 #endif
 
 #include <sys/wait.h>
+#include <errno.h>
 #include <popt.h>
 
 #include <rpm/rpmfileutil.h>
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index 6adb12cd1..70a3f04fb 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -4,6 +4,7 @@
 
 #include "system.h"
 #include <stdarg.h>
+#include <errno.h>
 
 #if defined(HAVE_POLL_H)
 #include <poll.h>
diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c
index 95b25f37e..3d0563be6 100644
--- a/rpmio/rpmsq.c
+++ b/rpmio/rpmsq.c
@@ -8,6 +8,7 @@
 #include <sys/signal.h>
 #include <sys/wait.h>
 #include <search.h>
+#include <errno.h>
 
 #if defined(HAVE_PTHREAD_H)
 
diff --git a/system.h b/system.h
index 71fd8874d..b04d2ef68 100644
--- a/system.h
+++ b/system.h
@@ -40,11 +40,6 @@ char * stpcpy(char * dest, const char * src);
 char * stpncpy(char * dest, const char * src, size_t n);
 #endif
 
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
 #if HAVE___SECURE_GETENV
 #define	getenv(_s)	__secure_getenv(_s)
 #endif