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"
diff -rupN libffado-2.1.0.old/tests/test-dice-eap.cpp libffado-2.1.0/tests/test-dice-eap.cpp
--- libffado-2.1.0.old/tests/test-dice-eap.cpp	2010-01-04 17:20:56.000000000 -0500
+++ libffado-2.1.0/tests/test-dice-eap.cpp	2012-03-22 22:00:44.139732286 -0400
@@ -45,6 +45,7 @@ using namespace Dice;
 #include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <unistd.h>
 
 #include <signal.h>
 int run;
diff -rupN libffado-2.1.0.old/tests/test-fw410.cpp libffado-2.1.0/tests/test-fw410.cpp
--- libffado-2.1.0.old/tests/test-fw410.cpp	2008-01-20 05:29:17.000000000 -0500
+++ libffado-2.1.0/tests/test-fw410.cpp	2012-03-22 22:00:15.473867173 -0400
@@ -27,6 +27,7 @@
 #include <argp.h>
 #include <stdlib.h>
 #include <iostream>
+#include <unistd.h>
 
 using namespace std;
 
diff -rupN libffado-2.1.0.old/tests/test-ieee1394service.cpp libffado-2.1.0/tests/test-ieee1394service.cpp
--- libffado-2.1.0.old/tests/test-ieee1394service.cpp	2009-12-19 11:12:53.000000000 -0500
+++ libffado-2.1.0/tests/test-ieee1394service.cpp	2012-03-22 22:03:36.150915502 -0400
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <endian.h>
+#include <unistd.h>
 
 #include <getopt.h>
 
diff -rupN libffado-2.1.0.old/tests/test-ipcringbuffer.cpp libffado-2.1.0/tests/test-ipcringbuffer.cpp
--- libffado-2.1.0.old/tests/test-ipcringbuffer.cpp	2008-05-15 00:38:31.000000000 -0400
+++ libffado-2.1.0/tests/test-ipcringbuffer.cpp	2012-03-22 22:05:04.425493246 -0400
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <iostream>
 #include <signal.h>
+#include <unistd.h>
 
 using namespace Util;
 
diff -rupN libffado-2.1.0.old/tests/test-messagequeue.cpp libffado-2.1.0/tests/test-messagequeue.cpp
--- libffado-2.1.0.old/tests/test-messagequeue.cpp	2008-05-29 04:24:21.000000000 -0400
+++ libffado-2.1.0/tests/test-messagequeue.cpp	2012-03-22 22:06:16.287149558 -0400
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <iostream>
 #include <signal.h>
+#include <unistd.h>
 
 #include <semaphore.h>
 #include <cstring>
diff -rupN libffado-2.1.0.old/tests/test-scs.cpp libffado-2.1.0/tests/test-scs.cpp
--- libffado-2.1.0.old/tests/test-scs.cpp	2009-12-23 14:10:49.000000000 -0500
+++ libffado-2.1.0/tests/test-scs.cpp	2012-03-22 22:12:26.287380774 -0400
@@ -477,8 +477,8 @@ main(int argc, char **argv)
         }
         #endif
 
-        BridgeMapIterator it = seqport2bridgemap.find(portNumber);
-        if(it == seqport2bridgemap.end()) {
+        BridgeMapIterator it2 = seqport2bridgemap.find(portNumber);
+        if(it2 == seqport2bridgemap.end()) {
             seqport2bridgemap[portNumber] = bridge;
         } else {
             debugError("BUG: port already present in bridge map, duplicate port.\n");
diff -rupN libffado-2.1.0.old/tests/test-shm.cpp libffado-2.1.0/tests/test-shm.cpp
--- libffado-2.1.0.old/tests/test-shm.cpp	2008-05-15 00:38:31.000000000 -0400
+++ libffado-2.1.0/tests/test-shm.cpp	2012-03-22 22:13:47.973990443 -0400
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <iostream>
 #include <signal.h>
+#include <unistd.h>
 
 using namespace Util;
 
diff -rupN libffado-2.1.0.old/tests/test-streamdump.cpp libffado-2.1.0/tests/test-streamdump.cpp
--- libffado-2.1.0.old/tests/test-streamdump.cpp	2008-05-09 08:02:40.000000000 -0400
+++ libffado-2.1.0/tests/test-streamdump.cpp	2012-03-22 22:14:57.222659592 -0400
@@ -27,6 +27,7 @@
 
 #include <argp.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <iostream>
 
 using namespace std;