--- include/share/alloc.h	2008-06-29 21:43:05.000000000 +1000
+++ include/share/alloc.h	2008-08-13 14:38:33.000000000 +1000
@@ -28,7 +28,7 @@
  */
 
 #include <limits.h> /* for SIZE_MAX */
-#if !defined _MSC_VER && !defined __MINGW32__ && !defined __EMX__
+#if HAVE_STDINT_H
 #include <stdint.h> /* for SIZE_MAX in case limits.h didn't get it */
 #endif
 #include <stdlib.h> /* for size_t, malloc(),
--- examples/cpp/encode/file/main.cpp.orig	2007-09-13 09:58:03.000000000 -0600
+++ examples/cpp/encode/file/main.cpp	2007-11-18 12:59:45.000000000 -0600
@@ -30,6 +30,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <cstring>
 #include "FLAC++/metadata.h"
 #include "FLAC++/encoder.h"
 
--- examples/cpp/decode/file/main.cpp.orig	2008-09-14 20:37:05.000000000 +0200
+++ examples/cpp/decode/file/main.cpp	2008-09-14 20:37:19.000000000 +0200
@@ -30,6 +30,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <cstring>
 #include "FLAC++/decoder.h"
 
 static FLAC__uint64 total_samples = 0;