--- media/filters/file_data_source.h.orig	2011-09-14 10:01:06.000000000 +0200
+++ media/filters/file_data_source.h	2011-09-26 19:08:17.000000000 +0200
@@ -5,6 +5,7 @@
 #ifndef MEDIA_FILTERS_FILE_DATA_SOURCE_H_
 #define MEDIA_FILTERS_FILE_DATA_SOURCE_H_
 
+#include <cstdio>
 #include <string>
 
 #include "base/files/file.h"
--- content/public/common/child_process_sandbox_support_linux.h.orig	2013-10-11 19:30:28.000000000 +0200
+++ content/public/common/child_process_sandbox_support_linux.h	2013-10-16 15:29:00.000000000 +0200
@@ -7,6 +7,7 @@
 
 #include <stdint.h>
 #include <string>
+#include <sys/types.h>
 
 #include "content/common/content_export.h"
 
--- third_party/ffmpeg/libavutil/cpu.c.orig	2013-11-16 01:26:14.000000000 +0100
+++ third_party/ffmpeg/libavutil/cpu.c	2013-11-19 00:24:53.000000000 +0100
@@ -24,6 +24,9 @@
 #include "opt.h"
 #include "common.h"
 
+/* TODO(rene) work around a compile error with GCC 4.6.4 on FreeBSD */
+#define __BSD_VISIBLE 1
+
 #if HAVE_SCHED_GETAFFINITY
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE
--- content/browser/browser_shutdown_profile_dumper.cc.orig    2014-02-20 15:28:24.000000000 -0500
+++ content/browser/browser_shutdown_profile_dumper.cc 2014-03-03 15:36:33.000000000 -0500
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdio.h>
+
 #include "content/browser/browser_shutdown_profile_dumper.h"
 
 #include "base/base_switches.h"
--- testing/perf/perf_test.cc	2014-03-03 12:59:30.000000000 -0500
+++ testing/perf/perf_test.cc.orig	2014-02-20 15:28:27.000000000 -0500
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdio.h>
+
 #include "testing/perf/perf_test.h"
 
-#include <stdio.h>
-
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
--- ui/gfx/codec/jpeg_codec.cc.orig	2014-10-02 19:19:03.000000000 +0200
+++ ui/gfx/codec/jpeg_codec.cc	2014-10-05 22:38:28.000000000 +0200
@@ -13,6 +13,7 @@
 
 extern "C" {
 #if defined(USE_SYSTEM_LIBJPEG)
+#include <stdio.h>
 #include <jpeglib.h>
 #elif defined(USE_LIBJPEG_TURBO)
 #include "third_party/libjpeg_turbo/jpeglib.h"
--- third_party/webrtc/common_audio/wav_file.h.orig	2014-10-17 02:57:34.000000000 +0200
+++ third_party/webrtc/common_audio/wav_file.h	2014-10-18 12:04:03.000000000 +0200
@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 
 #include <stdint.h>
+#include <stdio.h>
 #include <cstddef>
 #include <string>
 
--- v8/src/base/platform/platform.h.orig	2015-01-27 03:22:59.000000000 +0100
+++ v8/src/base/platform/platform.h	2015-01-28 18:37:43.268781292 +0100
@@ -22,6 +22,7 @@
 #define V8_BASE_PLATFORM_PLATFORM_H_
 
 #include <cstdarg>
+#include <cstdio>
 #include <string>
 #include <vector>
 
--- v8/src/compiler/graph-visualizer.cc.orig	2015-04-28 22:29:10.000000000 +0200
+++ v8/src/compiler/graph-visualizer.cc	2015-05-02 21:01:32.086593000 +0200
@@ -5,6 +5,7 @@
 #include "src/compiler/graph-visualizer.h"
 
 #include <sstream>
+#include <cstdio>
 #include <string>
 
 #include "src/code-stubs.h"
@@ -25,7 +26,7 @@
 namespace compiler {
 
 
-FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase,
+std::FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase,
                             const char* suffix, const char* mode) {
   EmbeddedVector<char, 256> filename;
   SmartArrayPointer<char> function_name;
--- third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c.orig	2015-07-24 22:27:11.000000000 +0200
+++ third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c	2015-07-26 17:38:40.937606000 +0200
@@ -37,6 +37,7 @@
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
+#define __BSD_VISIBLE 1
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif
--- v8/src/compiler/graph-visualizer.h.orig	2015-07-24 22:28:03.000000000 +0200
+++ v8/src/compiler/graph-visualizer.h	2015-07-26 18:37:45.488253000 +0200
@@ -5,7 +5,7 @@
 #ifndef V8_COMPILER_GRAPH_VISUALIZER_H_
 #define V8_COMPILER_GRAPH_VISUALIZER_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include <iosfwd>
 
 namespace v8 {
@@ -21,7 +21,7 @@
 class Schedule;
 class SourcePositionTable;
 
-FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase,
+std::FILE* OpenVisualizerLogFile(CompilationInfo* info, const char* phase,
                             const char* suffix, const char* mode);
 
 struct AsDOT {
