Index: base/stdint_.h
--- base/stdint_.h.orig	2016-09-26 12:41:28.000000000 +0200
+++ base/stdint_.h	2016-09-27 00:14:15.159444567 +0200
@@ -70,6 +70,13 @@
    typedef unsigned long long uint64_t;
 #  define STDINT_TYPES_DEFINED
 # endif
+#ifdef __sun__
+#  include <sys/int_types.h>
+#  define STDINT_TYPES_DEFINED
+#endif
+#ifdef __FreeBSD__
+#  define STDINT_TYPES_DEFINED
+#endif
    /* other archs may want to add defines here,
       or use the fallbacks in std.h */
 #endif
Index: configure
--- configure.orig	2016-09-26 12:41:58.000000000 +0200
+++ configure	2016-09-27 18:18:20.839969603 +0200
@@ -3997,10 +3997,9 @@
 
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    cflags_to_try="-Wall -Wstrict-prototypes -Wundef \
--Wmissing-declarations -Wmissing-prototypes -Wwrite-strings \
--Wno-strict-aliasing -Werror=declaration-after-statement \
--fno-builtin -fno-common -Werror=return-type"
+    cflags_to_try=" \
+-Wno-strict-aliasing \
+-fno-builtin -fno-common"
     optflags_to_try="$CC_OPT_FLAGS_TO_TRY"
     dbgflags_to_try="$CC_DBG_FLAGS_TO_TRY"
 else
Index: xps/xps.mak
--- xps/xps.mak.orig	2016-09-26 12:41:29.000000000 +0200
+++ xps/xps.mak	2016-09-27 18:17:03.890169140 +0200
@@ -57,8 +57,8 @@
 $(XPSOBJ)xpsjpeg.$(OBJ): $(XPSSRC)xpsjpeg.c $(XPSINCLUDES) $(XPS_MAK) $(MAKEDIRS)
 	$(XPSCCC) $(XPSSRC)xpsjpeg.c $(XPSO_)xpsjpeg.$(OBJ)
 
-$(XPSOBJ)xpspng.$(OBJ): $(XPSSRC)xpspng.c $(XPSINCLUDES) $(PNGSRCDIR)$(D)png.h \
-                        $(PNGGENDIR)$(D)libpng.dev $(XPS_MAK) $(MAKEDIRS)
+$(XPSOBJ)xpspng.$(OBJ): $(XPSSRC)xpspng.c $(XPSINCLUDES) \
+                        $(XPS_MAK) $(MAKEDIRS)
 	$(XPSCCC) $(I_)$(PNGSRCDIR)$(_I) $(XPSSRC)xpspng.c $(XPSO_)xpspng.$(OBJ)
 
 $(XPSOBJ)xpstiff.$(OBJ): $(XPSSRC)xpstiff.c $(XPSINCLUDES) $(XPS_MAK) $(MAKEDIRS)