--- libffado-2.0-rc1/src/ffadodevice.h~	2008-11-01 09:40:57.000000000 -0700
+++ libffado-2.0-rc1/src/ffadodevice.h	2009-06-09 17:16:42.545169045 -0700
@@ -25,6 +25,8 @@
 #ifndef FFADODEVICE_H
 #define FFADODEVICE_H
 
+#include <stdint.h>
+
 #include "libutil/OptionContainer.h"
 #include "libutil/PosixMutex.h"
 
--- libffado-2.0-rc1/src/DeviceStringParser.h~	2008-03-12 12:54:46.000000000 -0700
+++ libffado-2.0-rc1/src/DeviceStringParser.h	2009-06-09 17:11:30.584349723 -0700
@@ -28,6 +28,7 @@
 
 #include <vector>
 #include <string>
+#include <stdint.h>
 
 class ConfigRom;
 
--- libffado-2.0-rc1/src/fireworks/efc/efc_cmd.h~	2008-07-11 10:19:52.000000000 -0700
+++ libffado-2.0-rc1/src/fireworks/efc/efc_cmd.h	2009-06-09 17:17:36.657985067 -0700
@@ -24,6 +24,8 @@
 #ifndef FIREWORKS_EFC_CMD_H
 #define FIREWORKS_EFC_CMD_H
 
+#include <stdint.h>
+
 #include "debugmodule/debugmodule.h"
 
 #include "libutil/cmd_serialize.h"
--- libffado-2.0-rc1/src/bebob/bebob_dl_codes.h~	2008-01-20 02:29:17.000000000 -0800
+++ libffado-2.0-rc1/src/bebob/bebob_dl_codes.h	2009-06-09 17:15:23.593109690 -0700
@@ -24,6 +24,7 @@
 #define BEBOB_DL_CODES_H
 
 #include "fbtypes.h"
+#include <stdint.h>
 
 #include "libutil/cmd_serialize.h"
 
--- libffado-2.0-rc1/src/libavc/avc_definitions.h~	2008-10-23 09:00:47.000000000 -0700
+++ libffado-2.0-rc1/src/libavc/avc_definitions.h	2009-06-09 17:14:43.217216107 -0700
@@ -28,6 +28,7 @@
 #include <cstdlib>
 #include <ostream>
 #include <libraw1394/raw1394.h>
+#include <stdint.h>
 
 namespace AVC {
 
--- libffado-2.0-rc1/src/libutil/serialize_libxml.h~	2008-05-10 08:39:39.000000000 -0700
+++ libffado-2.0-rc1/src/libutil/serialize_libxml.h	2009-06-09 17:32:00.628318537 -0700
@@ -30,6 +30,7 @@
 
 #include <iostream>
 #include <string>
+#include <stdio.h>
 
 namespace Util {
 
--- libffado-2.0-rc1/src/libutil/OptionContainer.h~	2008-05-10 08:39:39.000000000 -0700
+++ libffado-2.0-rc1/src/libutil/OptionContainer.h	2009-06-09 17:27:02.539401478 -0700
@@ -29,6 +29,7 @@
 
 #include <vector>
 #include <string>
+#include <stdint.h>
 
 namespace Util {
 
--- libffado-2.0-rc1/src/libutil/Configuration.h~	2008-10-24 02:37:37.000000000 -0700
+++ libffado-2.0-rc1/src/libutil/Configuration.h	2009-06-09 17:24:45.443135870 -0700
@@ -28,6 +28,7 @@
 #include "external/libconfig/libconfigpp.h"
 
 #include <vector>
+#include <stdint.h>
 
 namespace Util {
 /**
--- libffado-2.0-rc1/src/libutil/cmd_serialize.h~	2008-01-20 02:29:17.000000000 -0800
+++ libffado-2.0-rc1/src/libutil/cmd_serialize.h	2009-06-09 17:23:36.706531555 -0700
@@ -28,6 +28,7 @@
 
 #include <libraw1394/raw1394.h> // byte_t and quadlet_t declaration
 #include <string>
+#include <stdint.h>
 
 namespace Util {
 	namespace Cmd {
--- libffado-2.0-rc1/src/libieee1394/ieee1394service.h~	2008-11-22 07:01:20.000000000 -0800
+++ libffado-2.0-rc1/src/libieee1394/ieee1394service.h	2009-06-09 17:21:38.402423800 -0700
@@ -38,6 +38,7 @@
 
 #include <vector>
 #include <string>
+#include <stdint.h>
 
 #define MAX_FCP_BLOCK_SIZE_BYTES (512)
 #define MAX_FCP_BLOCK_SIZE_QUADS (MAX_FCP_BLOCK_SIZE_BYTES / 4)
--- libffado-2.0-rc1/src/libcontrol/ClockSelect.h~	2008-10-27 16:27:56.000000000 -0700
+++ libffado-2.0-rc1/src/libcontrol/ClockSelect.h	2009-06-09 17:20:46.602258027 -0700
@@ -30,6 +30,7 @@
 
 #include <vector>
 #include <string>
+#include <stdio.h>
 
 class FFADODevice;
 
--- libffado-2.0-rc1/src/libcontrol/Element.h~	2008-11-02 02:35:35.000000000 -0800
+++ libffado-2.0-rc1/src/libcontrol/Element.h	2009-06-09 17:12:10.561303651 -0700
@@ -28,6 +28,7 @@
 
 #include <vector>
 #include <string>
+#include <stdint.h>
 
 #include "libutil/Mutex.h"
 #include "libutil/Functors.h"
--- libffado-2.0-rc1/tests/streaming/teststreaming3.cpp~	2008-05-14 21:38:31.000000000 -0700
+++ libffado-2.0-rc1/tests/streaming/teststreaming3.cpp	2009-06-09 17:33:51.852496997 -0700
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 
 #include <signal.h>
 #include <sched.h>
--- libffado-2.0-rc1/src/libavc/audiosubunit/avc_function_block.h~	2008-10-23 09:00:47.000000000 -0700
+++ libffado-2.0-rc1/src/libavc/audiosubunit/avc_function_block.h	2009-06-09 17:52:52.870958753 -0700
@@ -27,6 +27,7 @@
 #include "../general/avc_extended_cmd_generic.h"
 #include "../general/avc_generic.h"
 
+#include <stdio.h>
 #include <vector>
 using namespace std;
 
--- libffado-2.0-rc1/src/libutil/SystemTimeSource.h~	2008-04-25 07:04:52.000000000 -0700
+++ libffado-2.0-rc1/src/libutil/SystemTimeSource.h	2009-06-09 17:55:08.327477501 -0700
@@ -25,6 +25,7 @@
 #define __FFADO_SYSTEMTIMESOURCE__
 
 #include "../debugmodule/debugmodule.h"
+#include <stdint.h>
 
 typedef uint64_t ffado_microsecs_t;