build: add gnulib sources

Signed-off-by: Fabian Groffen <grobian@gentoo.org>

28 files changed, 248 insertions, 158 deletions

diff --git a/libq/Makefile.am b/libq/Makefile.am
index fb9bc09..80b651c 100644
--- a/libq/Makefile.am
+++ b/libq/Makefile.am
@@ -20,7 +20,6 @@ QFILES = \
 	xarray.c xarray.h \
 	xasprintf.h \
 	xchdir.c xchdir.h \
-	xmalloc.c xmalloc.h \
 	xmkdir.c xmkdir.h \
 	xregex.c xregex.h \
 	xsystem.c xsystem.h \
@@ -28,3 +27,6 @@ QFILES = \
 
 noinst_LTLIBRARIES = libq.la
 libq_la_SOURCES = $(QFILES)
+libq_la_CPPFLAGS = \
+	-I$(top_builddir)/autotools/gnulib \
+	-I$(top_srcdir)/autotools/gnulib
diff --git a/libq/Makefile.in b/libq/Makefile.in
index 96e9580..a5e43fc 100644
--- a/libq/Makefile.in
+++ b/libq/Makefile.in
@@ -199,7 +199,6 @@ am__aclocal_m4_deps = $(top_srcdir)/autotools/m4/00gnulib.m4 \
 	$(top_srcdir)/autotools/m4/stdint_h.m4 \
 	$(top_srcdir)/autotools/m4/stdio_h.m4 \
 	$(top_srcdir)/autotools/m4/stdlib_h.m4 \
-	$(top_srcdir)/autotools/m4/stpcpy.m4 \
 	$(top_srcdir)/autotools/m4/strcase.m4 \
 	$(top_srcdir)/autotools/m4/strcasestr.m4 \
 	$(top_srcdir)/autotools/m4/strdup.m4 \
@@ -231,6 +230,7 @@ am__aclocal_m4_deps = $(top_srcdir)/autotools/m4/00gnulib.m4 \
 	$(top_srcdir)/autotools/m4/wchar_h.m4 \
 	$(top_srcdir)/autotools/m4/wchar_t.m4 \
 	$(top_srcdir)/autotools/m4/wint_t.m4 \
+	$(top_srcdir)/autotools/m4/xalloc.m4 \
 	$(top_srcdir)/autotools/m4/xsize.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -241,10 +241,13 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libq_la_LIBADD =
-am__objects_1 = atom.lo basename.lo colors.lo copy_file.lo eat_file.lo \
-	hash_fd.lo human_readable.lo md5_sha1_sum.lo prelink.lo \
-	profile.lo rmspace.lo safe_io.lo scandirat.lo set.lo vdb.lo \
-	xarray.lo xchdir.lo xmalloc.lo xmkdir.lo xregex.lo xsystem.lo
+am__objects_1 = libq_la-atom.lo libq_la-basename.lo libq_la-colors.lo \
+	libq_la-copy_file.lo libq_la-eat_file.lo libq_la-hash_fd.lo \
+	libq_la-human_readable.lo libq_la-md5_sha1_sum.lo \
+	libq_la-prelink.lo libq_la-profile.lo libq_la-rmspace.lo \
+	libq_la-safe_io.lo libq_la-scandirat.lo libq_la-set.lo \
+	libq_la-vdb.lo libq_la-xarray.lo libq_la-xchdir.lo \
+	libq_la-xmkdir.lo libq_la-xregex.lo libq_la-xsystem.lo
 am_libq_la_OBJECTS = $(am__objects_1)
 libq_la_OBJECTS = $(am_libq_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -1458,7 +1461,6 @@ QFILES = \
 	xarray.c xarray.h \
 	xasprintf.h \
 	xchdir.c xchdir.h \
-	xmalloc.c xmalloc.h \
 	xmkdir.c xmkdir.h \
 	xregex.c xregex.h \
 	xsystem.c xsystem.h \
@@ -1466,6 +1468,10 @@ QFILES = \
 
 noinst_LTLIBRARIES = libq.la
 libq_la_SOURCES = $(QFILES)
+libq_la_CPPFLAGS = \
+	-I$(top_builddir)/autotools/gnulib \
+	-I$(top_srcdir)/autotools/gnulib
+
 all: all-am
 
 .SUFFIXES:
@@ -1520,27 +1526,26 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atom.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colors.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy_file.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eat_file.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash_fd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/human_readable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5_sha1_sum.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prelink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/profile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmspace.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe_io.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scandirat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vdb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xarray.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xchdir.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmkdir.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xregex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsystem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-atom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-basename.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-colors.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-copy_file.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-eat_file.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-hash_fd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-human_readable.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-md5_sha1_sum.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-prelink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-profile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-rmspace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-safe_io.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-scandirat.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-set.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-vdb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-xarray.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-xchdir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-xmkdir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-xregex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libq_la-xsystem.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1563,6 +1568,146 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+libq_la-atom.lo: atom.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-atom.lo -MD -MP -MF $(DEPDIR)/libq_la-atom.Tpo -c -o libq_la-atom.lo `test -f 'atom.c' || echo '$(srcdir)/'`atom.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-atom.Tpo $(DEPDIR)/libq_la-atom.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atom.c' object='libq_la-atom.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-atom.lo `test -f 'atom.c' || echo '$(srcdir)/'`atom.c
+
+libq_la-basename.lo: basename.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-basename.lo -MD -MP -MF $(DEPDIR)/libq_la-basename.Tpo -c -o libq_la-basename.lo `test -f 'basename.c' || echo '$(srcdir)/'`basename.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-basename.Tpo $(DEPDIR)/libq_la-basename.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='basename.c' object='libq_la-basename.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-basename.lo `test -f 'basename.c' || echo '$(srcdir)/'`basename.c
+
+libq_la-colors.lo: colors.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-colors.lo -MD -MP -MF $(DEPDIR)/libq_la-colors.Tpo -c -o libq_la-colors.lo `test -f 'colors.c' || echo '$(srcdir)/'`colors.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-colors.Tpo $(DEPDIR)/libq_la-colors.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='colors.c' object='libq_la-colors.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-colors.lo `test -f 'colors.c' || echo '$(srcdir)/'`colors.c
+
+libq_la-copy_file.lo: copy_file.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-copy_file.lo -MD -MP -MF $(DEPDIR)/libq_la-copy_file.Tpo -c -o libq_la-copy_file.lo `test -f 'copy_file.c' || echo '$(srcdir)/'`copy_file.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-copy_file.Tpo $(DEPDIR)/libq_la-copy_file.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='copy_file.c' object='libq_la-copy_file.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-copy_file.lo `test -f 'copy_file.c' || echo '$(srcdir)/'`copy_file.c
+
+libq_la-eat_file.lo: eat_file.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-eat_file.lo -MD -MP -MF $(DEPDIR)/libq_la-eat_file.Tpo -c -o libq_la-eat_file.lo `test -f 'eat_file.c' || echo '$(srcdir)/'`eat_file.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-eat_file.Tpo $(DEPDIR)/libq_la-eat_file.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eat_file.c' object='libq_la-eat_file.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-eat_file.lo `test -f 'eat_file.c' || echo '$(srcdir)/'`eat_file.c
+
+libq_la-hash_fd.lo: hash_fd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-hash_fd.lo -MD -MP -MF $(DEPDIR)/libq_la-hash_fd.Tpo -c -o libq_la-hash_fd.lo `test -f 'hash_fd.c' || echo '$(srcdir)/'`hash_fd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-hash_fd.Tpo $(DEPDIR)/libq_la-hash_fd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hash_fd.c' object='libq_la-hash_fd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-hash_fd.lo `test -f 'hash_fd.c' || echo '$(srcdir)/'`hash_fd.c
+
+libq_la-human_readable.lo: human_readable.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-human_readable.lo -MD -MP -MF $(DEPDIR)/libq_la-human_readable.Tpo -c -o libq_la-human_readable.lo `test -f 'human_readable.c' || echo '$(srcdir)/'`human_readable.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-human_readable.Tpo $(DEPDIR)/libq_la-human_readable.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='human_readable.c' object='libq_la-human_readable.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-human_readable.lo `test -f 'human_readable.c' || echo '$(srcdir)/'`human_readable.c
+
+libq_la-md5_sha1_sum.lo: md5_sha1_sum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-md5_sha1_sum.lo -MD -MP -MF $(DEPDIR)/libq_la-md5_sha1_sum.Tpo -c -o libq_la-md5_sha1_sum.lo `test -f 'md5_sha1_sum.c' || echo '$(srcdir)/'`md5_sha1_sum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-md5_sha1_sum.Tpo $(DEPDIR)/libq_la-md5_sha1_sum.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='md5_sha1_sum.c' object='libq_la-md5_sha1_sum.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-md5_sha1_sum.lo `test -f 'md5_sha1_sum.c' || echo '$(srcdir)/'`md5_sha1_sum.c
+
+libq_la-prelink.lo: prelink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-prelink.lo -MD -MP -MF $(DEPDIR)/libq_la-prelink.Tpo -c -o libq_la-prelink.lo `test -f 'prelink.c' || echo '$(srcdir)/'`prelink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-prelink.Tpo $(DEPDIR)/libq_la-prelink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='prelink.c' object='libq_la-prelink.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-prelink.lo `test -f 'prelink.c' || echo '$(srcdir)/'`prelink.c
+
+libq_la-profile.lo: profile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-profile.lo -MD -MP -MF $(DEPDIR)/libq_la-profile.Tpo -c -o libq_la-profile.lo `test -f 'profile.c' || echo '$(srcdir)/'`profile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-profile.Tpo $(DEPDIR)/libq_la-profile.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='profile.c' object='libq_la-profile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-profile.lo `test -f 'profile.c' || echo '$(srcdir)/'`profile.c
+
+libq_la-rmspace.lo: rmspace.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-rmspace.lo -MD -MP -MF $(DEPDIR)/libq_la-rmspace.Tpo -c -o libq_la-rmspace.lo `test -f 'rmspace.c' || echo '$(srcdir)/'`rmspace.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-rmspace.Tpo $(DEPDIR)/libq_la-rmspace.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='rmspace.c' object='libq_la-rmspace.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-rmspace.lo `test -f 'rmspace.c' || echo '$(srcdir)/'`rmspace.c
+
+libq_la-safe_io.lo: safe_io.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-safe_io.lo -MD -MP -MF $(DEPDIR)/libq_la-safe_io.Tpo -c -o libq_la-safe_io.lo `test -f 'safe_io.c' || echo '$(srcdir)/'`safe_io.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-safe_io.Tpo $(DEPDIR)/libq_la-safe_io.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='safe_io.c' object='libq_la-safe_io.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-safe_io.lo `test -f 'safe_io.c' || echo '$(srcdir)/'`safe_io.c
+
+libq_la-scandirat.lo: scandirat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-scandirat.lo -MD -MP -MF $(DEPDIR)/libq_la-scandirat.Tpo -c -o libq_la-scandirat.lo `test -f 'scandirat.c' || echo '$(srcdir)/'`scandirat.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-scandirat.Tpo $(DEPDIR)/libq_la-scandirat.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='scandirat.c' object='libq_la-scandirat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-scandirat.lo `test -f 'scandirat.c' || echo '$(srcdir)/'`scandirat.c
+
+libq_la-set.lo: set.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-set.lo -MD -MP -MF $(DEPDIR)/libq_la-set.Tpo -c -o libq_la-set.lo `test -f 'set.c' || echo '$(srcdir)/'`set.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-set.Tpo $(DEPDIR)/libq_la-set.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='set.c' object='libq_la-set.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-set.lo `test -f 'set.c' || echo '$(srcdir)/'`set.c
+
+libq_la-vdb.lo: vdb.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-vdb.lo -MD -MP -MF $(DEPDIR)/libq_la-vdb.Tpo -c -o libq_la-vdb.lo `test -f 'vdb.c' || echo '$(srcdir)/'`vdb.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-vdb.Tpo $(DEPDIR)/libq_la-vdb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='vdb.c' object='libq_la-vdb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-vdb.lo `test -f 'vdb.c' || echo '$(srcdir)/'`vdb.c
+
+libq_la-xarray.lo: xarray.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-xarray.lo -MD -MP -MF $(DEPDIR)/libq_la-xarray.Tpo -c -o libq_la-xarray.lo `test -f 'xarray.c' || echo '$(srcdir)/'`xarray.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-xarray.Tpo $(DEPDIR)/libq_la-xarray.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xarray.c' object='libq_la-xarray.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-xarray.lo `test -f 'xarray.c' || echo '$(srcdir)/'`xarray.c
+
+libq_la-xchdir.lo: xchdir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-xchdir.lo -MD -MP -MF $(DEPDIR)/libq_la-xchdir.Tpo -c -o libq_la-xchdir.lo `test -f 'xchdir.c' || echo '$(srcdir)/'`xchdir.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-xchdir.Tpo $(DEPDIR)/libq_la-xchdir.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xchdir.c' object='libq_la-xchdir.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-xchdir.lo `test -f 'xchdir.c' || echo '$(srcdir)/'`xchdir.c
+
+libq_la-xmkdir.lo: xmkdir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-xmkdir.lo -MD -MP -MF $(DEPDIR)/libq_la-xmkdir.Tpo -c -o libq_la-xmkdir.lo `test -f 'xmkdir.c' || echo '$(srcdir)/'`xmkdir.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-xmkdir.Tpo $(DEPDIR)/libq_la-xmkdir.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xmkdir.c' object='libq_la-xmkdir.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-xmkdir.lo `test -f 'xmkdir.c' || echo '$(srcdir)/'`xmkdir.c
+
+libq_la-xregex.lo: xregex.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-xregex.lo -MD -MP -MF $(DEPDIR)/libq_la-xregex.Tpo -c -o libq_la-xregex.lo `test -f 'xregex.c' || echo '$(srcdir)/'`xregex.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-xregex.Tpo $(DEPDIR)/libq_la-xregex.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xregex.c' object='libq_la-xregex.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-xregex.lo `test -f 'xregex.c' || echo '$(srcdir)/'`xregex.c
+
+libq_la-xsystem.lo: xsystem.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libq_la-xsystem.lo -MD -MP -MF $(DEPDIR)/libq_la-xsystem.Tpo -c -o libq_la-xsystem.lo `test -f 'xsystem.c' || echo '$(srcdir)/'`xsystem.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libq_la-xsystem.Tpo $(DEPDIR)/libq_la-xsystem.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='xsystem.c' object='libq_la-xsystem.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libq_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libq_la-xsystem.lo `test -f 'xsystem.c' || echo '$(srcdir)/'`xsystem.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/libq/atom.c b/libq/atom.c
index 017a85a..e5c3dc1 100644
--- a/libq/atom.c
+++ b/libq/atom.c
@@ -8,9 +8,13 @@
  */
 
 #include "main.h"
-#include "xmalloc.h"
 #include "atom.h"
 
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+#include <xalloc.h>
+
 const char * const booga[] = {"!!!", "!=", "==", ">", "<"};
 
 const char * const atom_suffixes_str[] = {
@@ -264,8 +268,8 @@ atom_explode(const char *atom)
 		ret->suffixes[idx] = t;
 	}
 
-	ptr = stpcpy(ret->PVR, ret->PV);
-	sprintf(ptr, "-r%i", ret->PR_int);
+	/* size is malloced above with the required space in mind */
+	sprintf(ret->PVR, "%s-r%i", ret->PV, ret->PR_int);
 
 	return ret;
 }
diff --git a/libq/basename.c b/libq/basename.c
index 7e480b1..11084b3 100644
--- a/libq/basename.c
+++ b/libq/basename.c
@@ -5,6 +5,8 @@
  * Copyright 2010-2014 Mike Frysinger  - <vapier@gentoo.org>
  */
 
+#include "main.h"
+
 #include <string.h>
 
 #include "basename.h"
diff --git a/libq/basename.h b/libq/basename.h
index cca19ac..106f835 100644
--- a/libq/basename.h
+++ b/libq/basename.h
@@ -8,6 +8,8 @@
 #ifndef _BASENAME_H
 #define _BASENAME_H 1
 
+#include <libgen.h>
+
 const char *_basename(const char *filename);
 
 /* Avoid issues with clobbering C library def */
diff --git a/libq/copy_file.c b/libq/copy_file.c
index dffe9b5..e013442 100644
--- a/libq/copy_file.c
+++ b/libq/copy_file.c
@@ -5,6 +5,7 @@
  * Copyright 2011-2016 Mike Frysinger  - <vapier@gentoo.org>
  */
 
+#include "main.h"
 #include "safe_io.h"
 #include "copy_file.h"
 
diff --git a/libq/eat_file.c b/libq/eat_file.c
index 563969d..6deabe2 100644
--- a/libq/eat_file.c
+++ b/libq/eat_file.c
@@ -6,13 +6,13 @@
  * Copyright 2005-2014 Mike Frysinger  - <vapier@gentoo.org>
  */
 
+#include "main.h"
+
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "main.h"
-#include "porting.h"
-#include "xmalloc.h"
+#include "xalloc.h"
 #include "eat_file.h"
 
 bool
@@ -83,4 +83,3 @@ eat_file(const char *file, char **bufptr, size_t *bufsize)
 {
 	return eat_file_at(AT_FDCWD, file, bufptr, bufsize);
 }
-
diff --git a/libq/eat_file.h b/libq/eat_file.h
index 03aa159..1575506 100644
--- a/libq/eat_file.h
+++ b/libq/eat_file.h
@@ -6,7 +6,8 @@
 #ifndef _EAT_FILE_H
 #define _EAT_FILE_H 1
 
-#include "porting.h"
+#include <unistd.h>
+#include <stdbool.h>
 
 bool eat_file_fd(int, char **, size_t *);
 bool eat_file(const char *, char **, size_t *);
diff --git a/libq/hash_fd.c b/libq/hash_fd.c
index 311798a..9c47078 100644
--- a/libq/hash_fd.c
+++ b/libq/hash_fd.c
@@ -20,6 +20,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "main.h"
+
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
@@ -52,7 +54,7 @@
 #endif
 
 #include "busybox.h"
-#include "xmalloc.h"
+#include "xalloc.h"
 #include "hash_fd.h"
 
 #ifdef CONFIG_SHA1SUM
diff --git a/libq/human_readable.c b/libq/human_readable.c
index 4cc8761..855ecef 100644
--- a/libq/human_readable.c
+++ b/libq/human_readable.c
@@ -22,6 +22,8 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
+#include "main.h"
+
 #include <stdio.h>
 
 #include "human_readable.h"
diff --git a/libq/md5_sha1_sum.c b/libq/md5_sha1_sum.c
index a1d203a..006a63b 100644
--- a/libq/md5_sha1_sum.c
+++ b/libq/md5_sha1_sum.c
@@ -17,6 +17,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "main.h"
+
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
@@ -26,7 +28,7 @@
 #include <unistd.h>
 
 #include "busybox.h"
-#include "xmalloc.h"
+#include "xalloc.h"
 #include "hash_fd.h"
 #include "md5_sha1_sum.h"
 
diff --git a/libq/prelink.c b/libq/prelink.c
index 23d583b..0d1ce83 100644
--- a/libq/prelink.c
+++ b/libq/prelink.c
@@ -3,12 +3,15 @@
  * Distributed under the terms of the GNU General Public License v2
  */
 
+#include "main.h"
+
 #include <signal.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
-#include "main.h"
 #include "xasprintf.h"
 #include "prelink.h"
 
diff --git a/libq/prelink.h b/libq/prelink.h
index 5d60162..38d8d7a 100644
--- a/libq/prelink.h
+++ b/libq/prelink.h
@@ -6,7 +6,7 @@
 #ifndef _PRELINK_H
 #define _PRELINK_H 1
 
-#include "porting.h"
+#include <stdbool.h>
 
 bool prelink_available(void);
 int hash_cb_prelink_undo(int fd, const char *filename);
diff --git a/libq/profile.c b/libq/profile.c
index 774e6cf..aeba009 100644
--- a/libq/profile.c
+++ b/libq/profile.c
@@ -6,6 +6,8 @@
  * Copyright 2018-     Fabian Groffen  - <grobian@gentoo.org>
  */
 
+#include "main.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -14,7 +16,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "porting.h"
 #include "rmspace.h"
 #include "profile.h"
 
diff --git a/libq/safe_io.c b/libq/safe_io.c
index 7fbc131..e209c87 100644
--- a/libq/safe_io.c
+++ b/libq/safe_io.c
@@ -5,10 +5,12 @@
  * Distributed under the terms of the GNU General Public License v2
  */
 
+#include "main.h"
+
 #include <stdio.h>
 #include <errno.h>
 
-#include "main.h"
+#define _IN_SAFE_IO 1
 #include "safe_io.h"
 
 size_t
diff --git a/libq/safe_io.h b/libq/safe_io.h
index dbe10fc..68ccbee 100644
--- a/libq/safe_io.h
+++ b/libq/safe_io.h
@@ -7,10 +7,12 @@
 #define _SAFE_IO_H 1
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <unistd.h>
 
 size_t safe_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream);
-#define fwrite safe_fwrite
+#ifndef _IN_SAFE_IO
+# define fwrite safe_fwrite
+#endif
 
 ssize_t safe_read(int fd, void *buf, size_t len);
 ssize_t safe_write(int fd, const void *buf, size_t len);
diff --git a/libq/scandirat.c b/libq/scandirat.c
index 70a1d9f..c98ce59 100644
--- a/libq/scandirat.c
+++ b/libq/scandirat.c
@@ -7,14 +7,16 @@
  * Copyright 2018-     Fabian Groffen  - <grobian@gentoo.org>
  */
 
+#include "main.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <stdlib.h>
 #include <string.h>
+#include <xalloc.h>
 
-#include "xmalloc.h"
 #include "scandirat.h"
 
 #if !defined(HAVE_SCANDIRAT)
diff --git a/libq/set.c b/libq/set.c
index ba31f07..7adbce7 100644
--- a/libq/set.c
+++ b/libq/set.c
@@ -7,14 +7,15 @@
  * Copyright 2019-     Fabian Groffen  - <grobian@gentoo.org>
  */
 
+#include "main.h"
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <xalloc.h>
 
-#include "porting.h"
 #include "rmspace.h"
-#include "xmalloc.h"
 #include "set.h"
 
 static unsigned int
diff --git a/libq/set.h b/libq/set.h
index d8b8f3e..27e30ad 100644
--- a/libq/set.h
+++ b/libq/set.h
@@ -6,8 +6,9 @@
 #ifndef _SET_H
 #define _SET_H 1
 
-#include "porting.h"
 #include <stdlib.h>
+#include <stdbool.h>
+#include <unistd.h>
 
 typedef struct elem_t elem;
 typedef struct set_t set;
diff --git a/libq/vdb.c b/libq/vdb.c
index 60fd758..9bf6d1d 100644
--- a/libq/vdb.c
+++ b/libq/vdb.c
@@ -7,13 +7,14 @@
  */
 
 #include "main.h"
-#include "porting.h"
-#include "xmalloc.h"
 #include "rmspace.h"
 #include "scandirat.h"
 #include "eat_file.h"
 #include "vdb.h"
 
+#include <ctype.h>
+#include <xalloc.h>
+
 q_vdb_ctx *
 q_vdb_open(const char *sroot, const char *svdb)
 {
@@ -208,7 +209,8 @@ int
 q_vdb_pkg_openat(q_vdb_pkg_ctx *pkg_ctx, const char *file, int flags, mode_t mode)
 {
 	if (pkg_ctx->fd == -1) {
-		pkg_ctx->fd = openat(pkg_ctx->cat_ctx->fd, pkg_ctx->name, O_RDONLY|O_CLOEXEC|O_PATH);
+		pkg_ctx->fd = openat(pkg_ctx->cat_ctx->fd, pkg_ctx->name,
+				O_RDONLY|O_CLOEXEC|O_PATH);
 		if (pkg_ctx->fd == -1)
 			return -1;
 	}
diff --git a/libq/xarray.c b/libq/xarray.c
index b8cbec9..a5cac49 100644
--- a/libq/xarray.c
+++ b/libq/xarray.c
@@ -7,10 +7,12 @@
  * Copyright 2018-     Fabian Groffen  - <grobian@gentoo.org>
  */
 
+#include "main.h"
+
 #include <stdlib.h>
 #include <string.h>
+#include <xalloc.h>
 
-#include "xmalloc.h"
 #include "xarray.h"
 
 #define ARRAY_INC_SIZE 32
diff --git a/libq/xarray.h b/libq/xarray.h
index 1f3c21f..46cd772 100644
--- a/libq/xarray.h
+++ b/libq/xarray.h
@@ -11,7 +11,7 @@
 #define _XARRAY_H 1
 
 #include <stdlib.h>
-#include "xmalloc.h"
+#include <xalloc.h>
 
 typedef struct {
 	void **eles;
diff --git a/libq/xchdir.c b/libq/xchdir.c
index ba2c5a5..2d649ad 100644
--- a/libq/xchdir.c
+++ b/libq/xchdir.c
@@ -5,9 +5,10 @@
  * Copyright 2010-2016 Mike Frysinger  - <vapier@gentoo.org>
  */
 
+#include "main.h"
+
 #include <unistd.h>
 
-#include "main.h"
 #include "xchdir.h"
 
 void
diff --git a/libq/xmalloc.c b/libq/xmalloc.c
deleted file mode 100644
index 8494632..0000000
--- a/libq/xmalloc.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Utility routines.
- *
- * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
- * Copyright (C) 2019-        Fabian Groffen <grobian@gentoo.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include "main.h"
-#include "xmalloc.h"
-
-void *xmalloc(size_t size)
-{
-	void *ptr = malloc(size);
-	if (unlikely(ptr == NULL))
-		err("Out of memory");
-	return ptr;
-}
-
-void *xcalloc(size_t nmemb, size_t size)
-{
-	void *ptr = calloc(nmemb, size);
-	if (unlikely(ptr == NULL))
-		err("Out of memory");
-	return ptr;
-}
-
-void *xzalloc(size_t size)
-{
-	void *ptr = xmalloc(size);
-	memset(ptr, 0x00, size);
-	return ptr;
-}
-
-void *xrealloc(void *optr, size_t size)
-{
-	void *ptr = realloc(optr, size);
-	if (unlikely(ptr == NULL))
-		err("Out of memory");
-	return ptr;
-}
-
-void *xmemdup(const void *src, size_t n)
-{
-	void *ret = xmalloc(n);
-	memcpy(ret, src, n);
-	return ret;
-}
-
-char *xstrdup_len(const char *s, size_t *len)
-{
-	if (s == NULL)
-		return NULL;
-
-	*len = strlen(s);
-	return xmemdup(s, *len + 1);
-}
-
-char *xstrdup(const char *s)
-{
-	size_t len;
-
-	return xstrdup_len(s, &len);
-}
diff --git a/libq/xmalloc.h b/libq/xmalloc.h
deleted file mode 100644
index 0113119..0000000
--- a/libq/xmalloc.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2019 Gentoo Foundation
- * Distributed under the terms of the GNU General Public License v2
- *
- * Copyright 2019-     Fabian Groffen  - <grobian@gentoo.org>
- */
-
-#ifndef XMALLOC_H
-#define XMALLOC_H 1
-
-#include <unistd.h>
-
-void *xmalloc(size_t size);
-void *xcalloc(size_t nmemb, size_t size);
-void *xzalloc(size_t size);
-void *xrealloc(void *optr, size_t size);
-void *xmemdup(const void *src, size_t n);
-char *xstrdup_len(const char *s, size_t *len);
-char *xstrdup(const char *s);
-
-#endif
diff --git a/libq/xmkdir.c b/libq/xmkdir.c
index e945227..2e60b08 100644
--- a/libq/xmkdir.c
+++ b/libq/xmkdir.c
@@ -7,7 +7,13 @@
  */
 
 #include "main.h"
-#include "xmalloc.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <xalloc.h>
+
 #include "xmkdir.h"
 
 /* Emulate `mkdir -p -m MODE PATH` */
@@ -111,7 +117,8 @@ rmdir_r_at(int dfd, const char *path)
 	size_t len;
 	char *p, *e;
 
-	p = xstrdup_len(path, &len);
+	p = xstrdup(path);
+	len = strlen(p);
 	e = p + len;
 
 	while (e != p) {
diff --git a/libq/xregex.h b/libq/xregex.h
index e4cfddc..fd75030 100644
--- a/libq/xregex.h
+++ b/libq/xregex.h
@@ -8,6 +8,8 @@
 #ifndef _XREGEX_H
 #define _XREGEX_H 1
 
+#include <regex.h>
+
 int wregcomp(regex_t *preg, const char *regex, int cflags);
 void xregcomp(regex_t *preg, const char *regex, int cflags);
 
diff --git a/libq/xsystem.c b/libq/xsystem.c
index 4cb47d5..1cc5cad 100644
--- a/libq/xsystem.c
+++ b/libq/xsystem.c
@@ -5,14 +5,14 @@
  * Copyright 2010-2016 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-#include <stdlib.h>
-#include <sys/wait.h>
-
 #include "main.h"
-#include "porting.h"
 #include "xasprintf.h"
 #include "xsystem.h"
 
+#include <stdlib.h>
+#include <sys/wait.h>
+#include <fcntl.h>
+
 void xsystem(const char *command)
 {
 	if (unlikely(system(command)))