diff --git a/build/parsePrep.c b/build/parsePrep.c
index 7c862edcc5..b70aee249f 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include <errno.h>
+#include <libgen.h>
 
 #include <rpm/header.h>
 #include <rpm/rpmlog.h>
diff --git a/build/rpmfc.c b/build/rpmfc.c
index 3637f5cbe5..7c61d9d465 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1,6 +1,7 @@
 #include "system.h"
 
 #include <errno.h>
+#include <libgen.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 d4ce690bc8..0932514a67 100644
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -10,6 +10,7 @@ static int _debug = 1;	/* XXX if < 0 debugging, > 0 unusual error returns */
 #include <sys/wait.h>
 #include <popt.h>
 #include <db.h>
+#include <signal.h>
 
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmmacro.h>
diff --git a/lib/transaction.c b/lib/transaction.c
index 4f90782acb..cf4678830c 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include <inttypes.h>
+#include <libgen.h>
 
 #include <rpm/rpmlib.h>		/* rpmMachineScore, rpmReadPackageFile */
 #include <rpm/rpmmacro.h>	/* XXX for rpmExpand */
diff --git a/misc/fnmatch.c b/misc/fnmatch.c
index 77fbd93e7c..8de22c8b0e 100644
--- a/misc/fnmatch.c
+++ b/misc/fnmatch.c
@@ -17,7 +17,9 @@
    Boston, MA 02111-1307, USA.  */
 
 # include "system.h"
+# include <ctype.h>
 # include <stdlib.h>
+# include <string.h>
 
 /* Find the first occurrence of C in S or the final NUL byte.  */
 static inline char *