diff --git a/util/symlinks.c b/util/symlinks.c
index f3a632a..f22cedf 100644
--- a/util/symlinks.c
+++ b/util/symlinks.c
@@ -2,13 +2,17 @@
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
 
+#include "config.h"
+
 #include <unistd.h>
 #ifndef _POSIX_SOURCE
 #define _POSIX_SOURCE
 #endif
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 #include <string.h>
 #include <fcntl.h>
 #include <sys/param.h>
diff --git a/util/Makefile.in b/util/Makefile.in
index adf0b46..b0c571c 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -15,7 +15,7 @@ SRCS = $(srcdir)/subst.c
 
 .c.o:
 	$(E) "	CC $<"
-	$(Q) $(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@
+	$(Q) $(BUILD_CC) -c $(BUILD_CFLAGS) $(CPPFLAGS) $< -o $@
 
 PROGS=		subst symlinks