Index: /trunk/lib/format_erf.c
===================================================================
--- /trunk/lib/format_erf.c	(revision 795)
+++ /trunk/lib/format_erf.c	(revision 796)
@@ -55,4 +55,7 @@
 #else
 #  include <netdb.h>
+#  ifndef PATH_MAX
+#	define PATH_MAX 4096
+#  endif
 #endif
 
Index: /trunk/lib/libtrace.h.in
===================================================================
--- /trunk/lib/libtrace.h.in	(revision 795)
+++ /trunk/lib/libtrace.h.in	(revision 796)
@@ -99,5 +99,9 @@
 #else
 #    include <netinet/in.h>
+
+#ifndef __cplusplus
 #    include <stdbool.h>
+#endif
+
 #    include <sys/types.h>
 #    include <sys/socket.h>
Index: /trunk/lib/libtraceio.h
===================================================================
--- /trunk/lib/libtraceio.h	(revision 795)
+++ /trunk/lib/libtraceio.h	(revision 796)
@@ -10,4 +10,6 @@
 #include <stdio.h>
 #endif
+
+#include <unistd.h>
 
 typedef struct libtrace_io_t libtrace_io_t;