diff -rupN libffado-2.1.0.old/src/bebob/bebob_dl_mgr.cpp libffado-2.1.0/src/bebob/bebob_dl_mgr.cpp
--- libffado-2.1.0.old/src/bebob/bebob_dl_mgr.cpp	2009-12-19 11:12:53.000000000 -0500
+++ libffado-2.1.0/src/bebob/bebob_dl_mgr.cpp	2012-01-10 23:30:49.727652689 -0500
@@ -35,6 +35,7 @@
 
 #include <cstdio>
 #include <cstring>
+#include <unistd.h>
 
 namespace BeBoB {
     enum {
diff -rupN libffado-2.1.0.old/src/ffadodevice.cpp libffado-2.1.0/src/ffadodevice.cpp
--- libffado-2.1.0.old/src/ffadodevice.cpp	2010-01-10 15:59:02.000000000 -0500
+++ libffado-2.1.0/src/ffadodevice.cpp	2012-01-10 23:30:49.737652631 -0500
@@ -34,6 +34,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <unistd.h>
 
 #include <assert.h>
 
diff -rupN libffado-2.1.0.old/src/fireworks/fireworks_device.cpp libffado-2.1.0/src/fireworks/fireworks_device.cpp
--- libffado-2.1.0.old/src/fireworks/fireworks_device.cpp	2010-10-10 13:39:07.000000000 -0400
+++ libffado-2.1.0/src/fireworks/fireworks_device.cpp	2012-01-10 23:30:49.747652573 -0500
@@ -45,6 +45,7 @@
 #define FIREWORKS_MIN_FIRMWARE_VERSION 0x04080000
 
 #include <sstream>
+#include <unistd.h>
 using namespace std;
 
 // FireWorks is the platform used and developed by ECHO AUDIO
diff -rupN libffado-2.1.0.old/src/libieee1394/IsoHandlerManager.cpp libffado-2.1.0/src/libieee1394/IsoHandlerManager.cpp
--- libffado-2.1.0.old/src/libieee1394/IsoHandlerManager.cpp	2011-09-12 20:22:20.000000000 -0400
+++ libffado-2.1.0/src/libieee1394/IsoHandlerManager.cpp	2012-01-10 23:30:49.758652510 -0500
@@ -35,6 +35,7 @@
 #include "libutil/Configuration.h"
 
 #include <cstring>
+#include <unistd.h>
 #include <assert.h>
 
 IMPL_DEBUG_MODULE( IsoHandlerManager, IsoHandlerManager, DEBUG_LEVEL_NORMAL );
diff -rupN libffado-2.1.0.old/src/libutil/PosixSharedMemory.cpp libffado-2.1.0/src/libutil/PosixSharedMemory.cpp
--- libffado-2.1.0.old/src/libutil/PosixSharedMemory.cpp	2008-05-15 00:38:31.000000000 -0400
+++ libffado-2.1.0/src/libutil/PosixSharedMemory.cpp	2012-01-10 23:30:49.767652458 -0500
@@ -26,6 +26,7 @@
 #include <sys/mman.h>
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 #include <fcntl.h>
 
 namespace Util {
diff -rupN libffado-2.1.0.old/support/dbus/test-dbus.cpp libffado-2.1.0/support/dbus/test-dbus.cpp
--- libffado-2.1.0.old/support/dbus/test-dbus.cpp	2008-04-26 13:30:41.000000000 -0400
+++ libffado-2.1.0/support/dbus/test-dbus.cpp	2012-01-10 23:30:49.776652406 -0500
@@ -24,6 +24,7 @@
 #include <argp.h>
 #include <stdlib.h>
 #include <iostream>
+#include <unistd.h>
 #include <signal.h>
 
 #include "controlclient.h"