diff --git a/headers/compatibility/bsd/err.h b/headers/compatibility/bsd/err.h
index 39649bd5c8..1f0ff6fbe5 100644
--- a/headers/compatibility/bsd/err.h
+++ b/headers/compatibility/bsd/err.h
@@ -49,8 +49,6 @@
 #include <sys/types.h>
 
 #define __dead2
-#define __printflike(a, b)
-#define __printf0like(a, b)
 #define __va_list va_list
 
 __BEGIN_DECLS
diff --git a/headers/compatibility/bsd/libutil.h b/headers/compatibility/bsd/libutil.h
index ec18040f4b..1e2fb73f70 100644
--- a/headers/compatibility/bsd/libutil.h
+++ b/headers/compatibility/bsd/libutil.h
@@ -40,6 +40,7 @@
 #define	_LIBUTIL_H_
 
 #include <stdint.h>
+#include <sys/types.h>
 
 #define PROPERTY_MAX_NAME	64
 #define PROPERTY_MAX_VALUE	512
diff --git a/headers/compatibility/bsd/sys/cdefs.h b/headers/compatibility/bsd/sys/cdefs.h
index 2438fba662..cfbf31b54d 100644
--- a/headers/compatibility/bsd/sys/cdefs.h
+++ b/headers/compatibility/bsd/sys/cdefs.h
@@ -13,4 +13,7 @@
 #define __unused
 #define protected
 
+#define __printflike(a, b)	__attribute__ ((format (__printf__, (a), (b))))
+#define __printf0like(a, b)
+
 #endif	/* _BSD_SYS_CDEFS_H_ */
diff --git a/src/libs/util/Jamfile b/src/libs/util/Jamfile
index 88f5dcfcea..22a89b2866 100644
--- a/src/libs/util/Jamfile
+++ b/src/libs/util/Jamfile
@@ -9,5 +9,7 @@ SubDirCcFlags $(defines) ;
 
 StaticLibrary libutil.a :
 	fparseln.c
+	realhostname.c
+	trimdomain.c
 ;