Index: Makefile
--- Makefile.orig	2015-12-10 14:20:29.000000000 +0100
+++ Makefile	2015-12-11 19:41:48.338994312 +0100
@@ -253,14 +253,13 @@
 NACL_ARCHES = nacl_ia32 nacl_x64
 
 # List of files that trigger Makefile regeneration:
-GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
+GYPFILES = \
 	   build/shim_headers.gypi build/features.gypi build/standalone.gypi \
 	   build/toolchain.gypi build/all.gyp build/mac/asan.gyp \
 	   test/cctest/cctest.gyp \
 	   test/unittests/unittests.gyp tools/gyp/v8.gyp \
 	   tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
-	   buildtools/third_party/libc++abi/libc++abi.gyp \
-	   buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \
+	   samples/samples.gyp \
 	   src/third_party/vtune/v8vtune.gyp src/d8.gyp
 
 # If vtunejit=on, the v8vtune.gyp will be appended.
Index: build/all.gyp
--- build/all.gyp.orig	2015-12-10 14:20:29.000000000 +0100
+++ build/all.gyp	2015-12-11 19:41:48.338994312 +0100
@@ -8,10 +8,7 @@
       'target_name': 'All',
       'type': 'none',
       'dependencies': [
-        '../samples/samples.gyp:*',
-        '../src/d8.gyp:d8',
-        '../test/cctest/cctest.gyp:*',
-        '../test/unittests/unittests.gyp:*',
+        '../src/d8.gyp:d8'
       ],
       'conditions': [
         ['component!="shared_library"', {
Index: build/standalone.gypi
--- build/standalone.gypi.orig	2015-12-11 19:41:48.338994000 +0100
+++ build/standalone.gypi	2015-12-11 19:42:55.788876211 +0100
@@ -414,7 +414,7 @@
         # (defines are passed via the command line, and build systems rebuild
         # things when their commandline changes). Nothing should ever read this
         # define.
-        'defines': ['CR_CLANG_REVISION=<!(python <(DEPTH)/tools/clang/scripts/update.py --print-revision)'],
+        'defines': ['CR_CLANG_REVISION=0'],
         'conditions': [
           ['host_clang==1', {
             'target_conditions': [
Index: src/base/platform/platform-freebsd.cc
--- src/base/platform/platform-freebsd.cc.orig	2015-12-10 14:20:29.000000000 +0100
+++ src/base/platform/platform-freebsd.cc	2015-12-11 19:41:48.348960244 +0100
@@ -8,6 +8,7 @@
 #include <pthread.h>
 #include <semaphore.h>
 #include <signal.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <sys/resource.h>
 #include <sys/time.h>
Index: src/base/platform/platform-posix.cc
--- src/base/platform/platform-posix.cc.orig	2015-12-10 14:20:29.000000000 +0100
+++ src/base/platform/platform-posix.cc	2015-12-11 19:41:48.348960244 +0100
@@ -26,6 +26,9 @@
     defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/sysctl.h>  // NOLINT, for sysctl
 #endif
+#if defined(__FreeBSD__)
+#include <sys/thr.h>
+#endif
 
 #undef MAP_TYPE
 
@@ -36,6 +39,7 @@
 
 #include <cmath>
 #include <cstdlib>
+#include <cstdio>
 
 #include "src/base/lazy-instance.h"
 #include "src/base/macros.h"
Index: src/log-utils.cc
--- src/log-utils.cc.orig	2015-12-10 14:20:29.000000000 +0100
+++ src/log-utils.cc	2015-12-11 19:41:48.348960244 +0100
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "src/log-utils.h"
 
 #include "src/assert-scope.h"
Index: src/log-utils.h
--- src/log-utils.h.orig	2015-12-10 14:20:29.000000000 +0100
+++ src/log-utils.h	2015-12-11 19:41:48.348960244 +0100
@@ -9,6 +9,7 @@
 
 #include <cstdarg>
 
+#include <stdarg.h>
 #include "src/allocation.h"
 #include "src/base/platform/mutex.h"
 #include "src/flags.h"
Index: tools/gyp/v8.gyp
--- tools/gyp/v8.gyp.orig	2015-12-10 14:20:29.000000000 +0100
+++ tools/gyp/v8.gyp	2015-12-11 19:41:48.348960244 +0100
@@ -373,6 +373,9 @@
         'V8_IMMINENT_DEPRECATION_WARNINGS',
       ],
       'sources': [  ### gcmole(all) ###
+        '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
+        '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
+        '../../src/snapshot/snapshot-empty.cc',
         '../../include/v8-debug.h',
         '../../include/v8-platform.h',
         '../../include/v8-profiler.h',