diff -Naur audacity-1.3.7/lib-src/libnyquist/nyqsrc/sndwrite.c audacity-1.3.7.orig/lib-src/libnyquist/nyqsrc/sndwrite.c
--- audacity-1.3.7/lib-src/libnyquist/nyqsrc/sndwrite.c	2009-04-17 18:35:15.000000000 +0200
+++ audacity-1.3.7.orig/lib-src/libnyquist/nyqsrc/sndwrite.c	2009-04-17 18:44:03.000000000 +0200
@@ -10,7 +10,13 @@
 #include "string.h"
 #ifdef UNIX
 #include "sys/types.h"
-#endif
+#ifdef LINUX
+#include "sndlinux.h"
+#endif /*LINUX*/
+#if defined(__FreeBSD_kernel__)
+#include "sndfreebsd.h"
+#endif /*FreeBSD*/
+#endif /*UNIX*/
 #ifdef WINDOWS
 #include <io.h>
 #endif
diff -Naur audacity-1.3.7/lib-src/libnyquist/snd/sndcvt.c audacity-1.3.7.orig/lib-src/libnyquist/snd/sndcvt.c
--- audacity-1.3.7/lib-src/libnyquist/snd/sndcvt.c	2009-04-17 18:35:14.000000000 +0200
+++ audacity-1.3.7.orig/lib-src/libnyquist/snd/sndcvt.c	2009-04-17 18:45:47.000000000 +0200
@@ -9,20 +9,25 @@
 #endif /* mips */
 #include "snd.h"
 #include "stdio.h"
+#ifdef __GLIBC__
+#include <sys/file.h>
+#endif
 #ifdef LINUX
-#include "sys/file.h"
+#include "sndlinux.h"
 #else
 /* #include <unistd.h> */
 #ifdef WIN32
 #include <sys/stat.h>
 #include "io.h"
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD_kernel__)
+#include "sndfreebsd.h"
 #include <sys/stat.h>
 #endif /* WIN32 */
 #define L_SET SEEK_SET
 #define L_INCR SEEK_CUR
 #define PROTECTION 
 #endif /* LINUX */
+
 #include "sndhead.h"
 /* on the mac, memory.h gets Memory.h, a mac header so use string.h */
 /* #include "memory.h" -- for memcpy */